From a6d4789248cb5aff8627f200e40b32be57c28e51 Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期五, 25 十月 2024 12:08:49 +0800
Subject: [PATCH] 料架总数量优化

---
 _Main/BL/Type_MaterialRackProportionCell/StaticMethod_CreateDate.qbl                                      |   25 ++++++++++++-------------
 _Main/Sys/Repr/Global/MaterialRackProportionCell.qrp                                                      |   18 ++++++++++++++++++
 _Main/UI/MacroPlannerWebApp/Component_FormMaterialRackProportion/Response_pHeader_791_bExport_OnClick.def |    2 +-
 _Main/UI/MacroPlannerWebApp/Component_FormMaterialRackCustom/Response_pHeader_bExport_OnClick.def         |    2 +-
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/_Main/BL/Type_MaterialRackProportionCell/StaticMethod_CreateDate.qbl b/_Main/BL/Type_MaterialRackProportionCell/StaticMethod_CreateDate.qbl
index fc05b40..610dd08 100644
--- a/_Main/BL/Type_MaterialRackProportionCell/StaticMethod_CreateDate.qbl
+++ b/_Main/BL/Type_MaterialRackProportionCell/StaticMethod_CreateDate.qbl
@@ -6,19 +6,18 @@
 {
   TextBody:
   [*
-    genrations   := selectuniquevalues( macroPlan, Product_MP, tempPMP, tempPMP.Generation().TrimBoth() <> "", tempPMP.Generation() );
-    mqbmlbs      := selectuniquevalues( macroPlan, Product_MP, tempPMP, tempPMP.MQBMLB().TrimBoth() <> "", tempPMP.MQBMLB() );
-    traverse ( genrations, Elements, g ) {
-      traverse ( mqbmlbs, Elements, m ) {
-        mrpr     := select( macroPlan, MaterialRackProportionRow, tempMRPR, tempMRPR.Generation() = g and tempMRPR.MLB_MQB() = m );
-        if ( isnull( mrpr ) ) {
-          mrpr   := macroPlan.MaterialRackProportionRow( relnew, Generation := g, MLB_MQB := m );
-          traverse ( macroPlan, MaterialRackColumn, mrc ) {
-            cell := mrpr.MaterialRackProportionCell( relnew, Quantity := 0 );
-            cell.MaterialRackColumn( relset, mrc );
-          }
-        }
-      }
+    macroPlan.MaterialRackProportionRow( relflush );
+    
+    mrpr   := macroPlan.MaterialRackProportionRow( relnew, Generation := "澶ц繛澶栫搴�", MLB_MQB := "" );
+    traverse ( macroPlan, MaterialRackColumn, mrc ) {
+      cell := mrpr.MaterialRackProportionCell( relnew, Quantity := 0 );
+      cell.MaterialRackColumn( relset, mrc );
+    }
+    
+    mrpr   := macroPlan.MaterialRackProportionRow( relnew, Generation := "闀挎槬澶栫搴�", MLB_MQB := "" );
+    traverse ( macroPlan, MaterialRackColumn, mrc ) {
+      cell := mrpr.MaterialRackProportionCell( relnew, Quantity := 0 );
+      cell.MaterialRackColumn( relset, mrc );
     }
   *]
 }
diff --git a/_Main/Sys/Repr/Global/MaterialRackProportionCell.qrp b/_Main/Sys/Repr/Global/MaterialRackProportionCell.qrp
new file mode 100644
index 0000000..239f620
--- /dev/null
+++ b/_Main/Sys/Repr/Global/MaterialRackProportionCell.qrp
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: #root
+TypeRepresentation MaterialRackProportionCell
+{
+  AttributeRepresentation Quantity
+  {
+    AttributeKey: '[413988.1.14567041]'
+    Conditional:
+    [
+    ]
+    DataRepresentation.Default
+    {
+      FormatString: 'N(Dec(1))'
+      InheritFormatting: false
+    }
+  }
+  RelationRepresentation MaterialRackColumn { RelationKey: '[413988.1.14566952]' Visibility: 'Normal' }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormMaterialRackCustom/Response_pHeader_bExport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormMaterialRackCustom/Response_pHeader_bExport_OnClick.def
index 9f36fbd..517ccf2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormMaterialRackCustom/Response_pHeader_bExport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormMaterialRackCustom/Response_pHeader_bExport_OnClick.def
@@ -15,7 +15,7 @@
     [*
       binaryValue := MaterialRackCustomCell::Export( MacroPlan );
       
-      Application.Download( "鏂欐灦鎬绘暟閲�.xlsx", binaryValue.AsBinaryData() );
+      Application.Download( "瀹㈡埛搴撴枡鏋舵暟閲�.xlsx", binaryValue.AsBinaryData() );
     *]
     GroupServerCalls: false
   }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormMaterialRackProportion/Response_pHeader_791_bExport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormMaterialRackProportion/Response_pHeader_791_bExport_OnClick.def
index 1cc8a31..96702f1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormMaterialRackProportion/Response_pHeader_791_bExport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormMaterialRackProportion/Response_pHeader_791_bExport_OnClick.def
@@ -15,7 +15,7 @@
     [*
       binaryValue := MaterialRackProportionCell::Export( MacroPlan );
       
-      Application.Download( "鏂欐灦鎬绘暟閲�.xlsx", binaryValue.AsBinaryData() );
+      Application.Download( "绌烘枡鏋舵瘮渚�.xlsx", binaryValue.AsBinaryData() );
     *]
     GroupServerCalls: false
   }

--
Gitblit v1.9.3