From 23e251ff1d124de2fb13fe195a8b4575bc0676a1 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 09 八月 2024 16:52:39 +0800
Subject: [PATCH] 财务销量报表二维表生成

---
 _Main/BL/Type_FinancialSalesImportData/DefaultValue_Generation.qbl                            |    6 +
 _Main/BL/Type_FinancialSalesImportData/Attribute_Quantity.qbl                                 |    7 +
 _Main/BL/Type_FinancialSalesImportData/_ROOT_Type_FinancialSalesImportData.qbl                |   10 ++
 _Main/BL/Type_FinancialSalesImportData/Attribute_ProductID.qbl                                |    8 ++
 _Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl                                |   12 +-
 _Main/BL/Type_FinancialSalesImportData/Attribute_Generation.qbl                               |    7 +
 _Main/BL/Type_FinancialSalesRow/Method_Initialize.qbl                                         |   13 +++
 _Main/BL/Relations/Relation_FinancialSalesImportData_MacroPlan_MacroPlan_FSImportData.qbl     |   23 +++++
 _Main/BL/Type_FinancialSalesImportData/Attribute_MqbMlb.qbl                                   |    7 +
 _Main/BL/Type_FinancialSalesImportData/Attribute_Power.qbl                                    |    7 +
 _Main/BL/Type_FinancialSalesImportData/DefaultValue_Power.qbl                                 |    6 +
 _Main/BL/Type_FinancialSalesImportData/Function_CalcQuantity.qbl                              |   13 +++
 _Main/BL/Type_FinancialSalesImportData/DefaultValue_ProductID.qbl                             |    6 +
 _Main/BL/Type_FinancialSalesImportData/DefaultValue_MqbMlb.qbl                                |    6 +
 _Main/BL/Type_FinancialSalesImportData/Attribute_Unit.qbl                                     |    8 ++
 _Main/BL/Type_FinancialProductionRow/Method_Initialize#110.qbl                                |    1 
 _Main/BL/Type_FinancialSalesImportData/DefaultValue_Unit.qbl                                  |    6 +
 _Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl                                |   12 +-
 _Main/BL/Type_FinancialSalesReport/Method_GetRow.qbl                                          |    8 +-
 _Main/BL/Type_FinancialSalesRow/Method_InitializeCell.qbl                                     |    5 
 _Main/BL/Relations/Relation_FinancialSalesImportData_Cell_FinancialSalesCell_FSImportData.qbl |   23 +++++
 _Main/BL/Type_FinancialSalesImportData/Attribute_StartDate.qbl                                |    7 +
 _Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl                            |   16 ++--
 23 files changed, 190 insertions(+), 27 deletions(-)

diff --git a/_Main/BL/Relations/Relation_FinancialSalesImportData_Cell_FinancialSalesCell_FSImportData.qbl b/_Main/BL/Relations/Relation_FinancialSalesImportData_Cell_FinancialSalesCell_FSImportData.qbl
new file mode 100644
index 0000000..ca210bd
--- /dev/null
+++ b/_Main/BL/Relations/Relation_FinancialSalesImportData_Cell_FinancialSalesCell_FSImportData.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation FinancialSalesImportData_Cell_FinancialSalesCell_FSImportData
+{
+  #keys: '1[415136.0.984654733]'
+  DefaultRelationStrategy
+  {
+  }
+  RelationSide.LeftSide Cell
+  {
+    #keys: '3[415136.0.984654735][415136.0.984654734][415136.0.984654736]'
+    Cardinality: '0to1'
+    ObjectDefinition: FinancialSalesImportData
+    OwningSide: 'Reference'
+  }
+  RelationSide.RightSide FSImportData
+  {
+    #keys: '3[415136.0.984654738][415136.0.984654737][415136.0.984654739]'
+    Cardinality: '0to1'
+    ObjectDefinition: FinancialSalesCell
+    OwningSide: 'Reference'
+  }
+}
diff --git a/_Main/BL/Relations/Relation_FinancialSalesImportData_MacroPlan_MacroPlan_FSImportData.qbl b/_Main/BL/Relations/Relation_FinancialSalesImportData_MacroPlan_MacroPlan_FSImportData.qbl
new file mode 100644
index 0000000..6b3fb29
--- /dev/null
+++ b/_Main/BL/Relations/Relation_FinancialSalesImportData_MacroPlan_MacroPlan_FSImportData.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation FinancialSalesImportData_MacroPlan_MacroPlan_FSImportData
+{
+  #keys: '1[415136.0.984654720]'
+  DefaultRelationStrategy
+  {
+  }
+  RelationSide.LeftSide MacroPlan
+  {
+    #keys: '3[415136.0.984654722][415136.0.984654721][415136.0.984654723]'
+    Cardinality: '0to1'
+    ObjectDefinition: FinancialSalesImportData
+    OwningSide: 'Reference'
+  }
+  RelationSide.RightSide FSImportData
+  {
+    #keys: '3[415136.0.984654725][415136.0.984654724][415136.0.984654726]'
+    Cardinality: '1toN'
+    ObjectDefinition: MacroPlan
+    OwningSide: 'Owned'
+  }
+}
diff --git a/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl b/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
index 7b09478..727038c 100644
--- a/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
@@ -45,20 +45,20 @@
           daycolumn           := table.GetColumnByUnit( Translations::MP_GlobalParameters_Day(), pispip.Start().Date() );
           //鍛�
           weekcolumn          := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), weekstart );
-          supplyquantity      := [Real]ceil( pispip.NewSupplyQuantity() );//鍚戜笂鍙栨暣
-          inventoryquantity   := [Real]ceil( pispip.PlannedInventoryLevelEnd() );//鍚戜笂鍙栨暣
+          supplyquantity      := [Number]pispip.NewSupplyQuantity();//鍥涜垗浜斿叆
+          inventoryquantity   := [Number]pispip.PlannedInventoryLevelEnd();//鍥涜垗浜斿叆
           //浜ч噺鏄姞鎬�
           if( iscc or isdl ){
-            row.SetCellProductionValue( daycolumn, iscc, supplyquantity );
-            row.SetCellProductionValue( weekcolumn, iscc, supplyquantity );
+            row.SetCellProductionValue( daycolumn, iscc, [Real]supplyquantity );
+            row.SetCellProductionValue( weekcolumn, iscc, [Real]supplyquantity );
           }
           //搴撳瓨闇�瑕佸彇鏈�鍚庝竴澶�
-          row.SetCellInventoryValue( daycolumn, pispip.PlannedInventoryLevelEnd() );
+          row.SetCellInventoryValue( daycolumn, [Real]inventoryquantity );
     
           if( pispip.Start() = weekstart + Duration::Days( 6 ) or pispip.Period_MP() = endperiod ){
             weekstart         := ( weekstart + Duration::Days( 7 ) ).Date();
             
-            row.SetCellInventoryValue( weekcolumn, inventoryquantity );
+            row.SetCellInventoryValue( weekcolumn, [Real]inventoryquantity );
           } 
         }
       }
diff --git "a/_Main/BL/Type_FinancialProductionRow/Method_Initialize\043110.qbl" "b/_Main/BL/Type_FinancialProductionRow/Method_Initialize\043110.qbl"
index f4e5b45..9f6d003 100644
--- "a/_Main/BL/Type_FinancialProductionRow/Method_Initialize\043110.qbl"
+++ "b/_Main/BL/Type_FinancialProductionRow/Method_Initialize\043110.qbl"
@@ -6,6 +6,7 @@
   String unit
 )
 {
+  Description: '鍒濆鍖栧崟鍏冩牸'
   TextBody:
   [*
     // 鐢勫叞楦� Jun-24-2024 (created)
diff --git a/_Main/BL/Type_FinancialSalesImportData/Attribute_Generation.qbl b/_Main/BL/Type_FinancialSalesImportData/Attribute_Generation.qbl
new file mode 100644
index 0000000..9ddab1f
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesImportData/Attribute_Generation.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Generation
+{
+  #keys: '3[415136.0.984654696][415136.0.984654695][415136.0.984654697]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_FinancialSalesImportData/Attribute_MqbMlb.qbl b/_Main/BL/Type_FinancialSalesImportData/Attribute_MqbMlb.qbl
new file mode 100644
index 0000000..904c6ff
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesImportData/Attribute_MqbMlb.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute MqbMlb
+{
+  #keys: '3[415136.0.984654699][415136.0.984654698][415136.0.984654700]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_FinancialSalesImportData/Attribute_Power.qbl b/_Main/BL/Type_FinancialSalesImportData/Attribute_Power.qbl
new file mode 100644
index 0000000..415414c
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesImportData/Attribute_Power.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Power
+{
+  #keys: '3[415136.0.984654702][415136.0.984654701][415136.0.984654703]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_FinancialSalesImportData/Attribute_ProductID.qbl b/_Main/BL/Type_FinancialSalesImportData/Attribute_ProductID.qbl
new file mode 100644
index 0000000..67d9741
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesImportData/Attribute_ProductID.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ProductID
+{
+  #keys: '3[415136.0.984654705][415136.0.984654704][415136.0.984654706]'
+  Description: '浜у搧ID'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_FinancialSalesImportData/Attribute_Quantity.qbl b/_Main/BL/Type_FinancialSalesImportData/Attribute_Quantity.qbl
new file mode 100644
index 0000000..1b2d6cd
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesImportData/Attribute_Quantity.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Quantity
+{
+  #keys: '3[415136.0.984654708][415136.0.984654707][415136.0.984654709]'
+  ValueType: Real
+}
diff --git a/_Main/BL/Type_FinancialSalesImportData/Attribute_StartDate.qbl b/_Main/BL/Type_FinancialSalesImportData/Attribute_StartDate.qbl
new file mode 100644
index 0000000..ae1a6f4
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesImportData/Attribute_StartDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute StartDate
+{
+  #keys: '3[415136.0.984654711][415136.0.984654710][415136.0.984654712]'
+  ValueType: Date
+}
diff --git a/_Main/BL/Type_FinancialSalesImportData/Attribute_Unit.qbl b/_Main/BL/Type_FinancialSalesImportData/Attribute_Unit.qbl
new file mode 100644
index 0000000..900f457
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesImportData/Attribute_Unit.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Unit
+{
+  #keys: '3[415136.0.984654714][415136.0.984654713][415136.0.984654715]'
+  Description: '宸ュ巶鍚嶇О'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_FinancialSalesImportData/DefaultValue_Generation.qbl b/_Main/BL/Type_FinancialSalesImportData/DefaultValue_Generation.qbl
new file mode 100644
index 0000000..9e5b51e
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesImportData/DefaultValue_Generation.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: Generation
+}
diff --git a/_Main/BL/Type_FinancialSalesImportData/DefaultValue_MqbMlb.qbl b/_Main/BL/Type_FinancialSalesImportData/DefaultValue_MqbMlb.qbl
new file mode 100644
index 0000000..78982c5
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesImportData/DefaultValue_MqbMlb.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: MqbMlb
+}
diff --git a/_Main/BL/Type_FinancialSalesImportData/DefaultValue_Power.qbl b/_Main/BL/Type_FinancialSalesImportData/DefaultValue_Power.qbl
new file mode 100644
index 0000000..4922731
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesImportData/DefaultValue_Power.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: Power
+}
diff --git a/_Main/BL/Type_FinancialSalesImportData/DefaultValue_ProductID.qbl b/_Main/BL/Type_FinancialSalesImportData/DefaultValue_ProductID.qbl
new file mode 100644
index 0000000..98649b2
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesImportData/DefaultValue_ProductID.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: ProductID
+}
diff --git a/_Main/BL/Type_FinancialSalesImportData/DefaultValue_Unit.qbl b/_Main/BL/Type_FinancialSalesImportData/DefaultValue_Unit.qbl
new file mode 100644
index 0000000..7e60e2c
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesImportData/DefaultValue_Unit.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: Unit
+}
diff --git a/_Main/BL/Type_FinancialSalesImportData/Function_CalcQuantity.qbl b/_Main/BL/Type_FinancialSalesImportData/Function_CalcQuantity.qbl
new file mode 100644
index 0000000..f8f1de8
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesImportData/Function_CalcQuantity.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcQuantity
+{
+  TextBody:
+  [*
+    // 鐢勫叞楦� Aug-9-2024 (created)
+    
+    value := guard( [Number]this.Cell().Value(), 0 );
+    
+    this.Quantity( value );
+  *]
+}
diff --git a/_Main/BL/Type_FinancialSalesImportData/_ROOT_Type_FinancialSalesImportData.qbl b/_Main/BL/Type_FinancialSalesImportData/_ROOT_Type_FinancialSalesImportData.qbl
new file mode 100644
index 0000000..48b4d84
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesImportData/_ROOT_Type_FinancialSalesImportData.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type FinancialSalesImportData
+{
+  #keys: '5[415136.0.984654693][415136.0.984654691][0.0.0][415136.0.984654692][415136.0.984654694]'
+  BaseType: Object
+  Description: '璐㈠姟閿�鎶ヨ〃浜岀淮琛�'
+  StructuredName: 'FinancialSalesImportDatas'
+}
diff --git a/_Main/BL/Type_FinancialSalesReport/Method_GetRow.qbl b/_Main/BL/Type_FinancialSalesReport/Method_GetRow.qbl
index 6cbc77d..82d945f 100644
--- a/_Main/BL/Type_FinancialSalesReport/Method_GetRow.qbl
+++ b/_Main/BL/Type_FinancialSalesReport/Method_GetRow.qbl
@@ -2,18 +2,18 @@
 #parent: #root
 Method GetRow (
   String salessegment,
-  String product
+  Product_MP product
 ) as FinancialSalesRow
 {
   TextBody:
   [*
     // 鐢勫叞楦� Jun-28-2024 (created)
-    row := selectobject( this, FinancialSalesRow, row, row.Name() = product and row.Unit() = salessegment );
+    row := selectobject( this, FinancialSalesRow, row, row.Name() = product.ID() and row.Unit() = salessegment );
     
     if( isnull( row ) ){
-      row := this.FinancialSalesRow( relnew, Name := product, Unit := salessegment );
+      row := this.FinancialSalesRow( relnew, Name := product.ID(), Unit := salessegment );
       //鍒濆鍖栧崟鍏冩牸
-      row.InitializeCell( this );
+      row.InitializeCell( this, product );
     }
     
     return row;
diff --git a/_Main/BL/Type_FinancialSalesRow/Method_Initialize.qbl b/_Main/BL/Type_FinancialSalesRow/Method_Initialize.qbl
index e262727..658b23c 100644
--- a/_Main/BL/Type_FinancialSalesRow/Method_Initialize.qbl
+++ b/_Main/BL/Type_FinancialSalesRow/Method_Initialize.qbl
@@ -2,14 +2,25 @@
 #parent: #root
 Method Initialize (
   FinancialSalesColumn column,
+  Product_MP product,
   String unit
 )
 {
+  Description: '鍒濆鍖栧崟鍏冩牸'
   TextBody:
   [*
-    // 鐢勫叞楦� Jun-24-2024 (created)
+    // 鐢勫叞楦� Jun-24-2024 (created) 
     cell := column.FinancialSalesCell( relnew, Value := '' );
     
     this.FinancialSalesCell( relinsert, cell );
+    if( unit <> FinancialProductionReport::GetDefaultAllUnit() ){
+      importdata := product.MacroPlan().FSImportData( relnew, Generation := product.Generation()
+                                                      , MqbMlb := product.MQBMLB()
+                                                      , Power := product.Power()
+                                                      , ProductID := product.ID()
+                                                      , StartDate := column.Period()
+                                                      , Unit := unit );
+      importdata.Cell( relset, cell );
+    }
   *]
 }
diff --git a/_Main/BL/Type_FinancialSalesRow/Method_InitializeCell.qbl b/_Main/BL/Type_FinancialSalesRow/Method_InitializeCell.qbl
index 0c6ebc7..a578477 100644
--- a/_Main/BL/Type_FinancialSalesRow/Method_InitializeCell.qbl
+++ b/_Main/BL/Type_FinancialSalesRow/Method_InitializeCell.qbl
@@ -1,14 +1,15 @@
 Quintiq file version 2.0
 #parent: #root
 Method InitializeCell (
-  FinancialSalesReport table
+  FinancialSalesReport table,
+  Product_MP product
 )
 {
   TextBody:
   [*
     // 鐢勫叞楦� Jun-28-2024 (created)
     traverse( table, FinancialSalesColumn, column ){
-      this.Initialize( column, this.Unit() );
+      this.Initialize( column, product, this.Unit() );
     }
   *]
 }
diff --git a/_Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl b/_Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl
index ed05819..e2ac2ed 100644
--- a/_Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl
@@ -46,9 +46,9 @@
       if( ( iscc and forecast.Product_MP().MQBMLB() = 'MLB' ) or isdl ){
         product              := forecast.Product_MP();
         //鑾峰彇鍚堣琛�
-        allrow               := table.GetRow( allunit, product.ID() );
+        allrow               := table.GetRow( allunit, product );
         //鑾峰彇宸ュ巶琛�
-        factoryrow           := table.GetRow( ifexpr( iscc and forecast.Product_MP().MQBMLB() = 'MLB', ccunit, dlunit ), product.ID() );
+        factoryrow           := table.GetRow( ifexpr( iscc and forecast.Product_MP().MQBMLB() = 'MLB', ccunit, dlunit ), product );
       
         if( products.Find( product ) < 0 ){
           products.Add( product );
@@ -74,8 +74,8 @@
     //  iscc                  := unit.ID() = ccspline or exists( parentunits, Elements, punit, punit.ID() = ccspline );
       if( table.IsInUnit( stockingpoint, ccspline ) ){
         traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf() and pisp.Product_MP().MQBMLB() = 'MQB' ){//浜у搧涓篗QB
-          allrow            := table.GetRow( allunit, pisp.ProductID() );
-          ccrow             := table.GetRow( ccunit, pisp.ProductID() );
+          allrow            := table.GetRow( allunit, pisp.Product_MP() );
+          ccrow             := table.GetRow( ccunit, pisp.Product_MP() );
           traverse( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear ){
             periodtime      := pispip.Start().StartOfMonth().Date();
             periodname      := periodtime.Format( "M2/D2/Y" );
@@ -105,10 +105,10 @@
           column            := selectobject( table, FinancialSalesColumn, column, column.Name() = periodname and column.Period() = periodtime );
           traverse( trip, ProductInTrip, pit ){
             quantity        := [Number]pit.Quantity();//鍥涜垗浜斿叆
-            dlrow           := table.GetRow( dlunit, pit.ProductID() );
+            dlrow           := table.GetRow( dlunit, pit.Product_MP() );
             dlrow.Initialize( column, quantity );//姹囨�绘暟閲�
             
-            allrow          := table.GetRow( allunit, pit.ProductID() );
+            allrow          := table.GetRow( allunit, pit.Product_MP() );
             allrow.Initialize( column, quantity );
           }
         }
diff --git a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
index 5776315..1a69f9f 100644
--- a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
@@ -52,26 +52,26 @@
             //鍛�
             weekcolumn          := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), weekstart );
             
-            supplyquantity      := [Real]ceil( pispip.NewSupplyQuantity() );//鍚戜笂鍙栨暣
-            inventoryquantity   := [Real]ceil( pispip.PlannedInventoryLevelEnd() );//鍚戜笂鍙栨暣
+            supplyquantity      := [Number]pispip.NewSupplyQuantity();//鍥涜垗浜斿叆
+            inventoryquantity   := [Number]pispip.PlannedInventoryLevelEnd();//鍥涜垗浜斿叆
             
             //瑁呴厤绾�
             if( isccassemnly or isdlassemnly ){
-              row.SetCellAssemblyValue( daycolumn, isccassemnly, supplyquantity );
-              row.SetCellAssemblyValue( weekcolumn, isccassemnly, supplyquantity );
+              row.SetCellAssemblyValue( daycolumn, isccassemnly, [Real]supplyquantity );
+              row.SetCellAssemblyValue( weekcolumn, isccassemnly, [Real]supplyquantity );
             }
             
             //鏈哄姞绾�
             if( isccproduction or isdlproduction ){
-              row.SetCellProductionValue( daycolumn, isccproduction, supplyquantity );
-              row.SetCellProductionValue( weekcolumn, isccproduction, supplyquantity );
+              row.SetCellProductionValue( daycolumn, isccproduction, [Real]supplyquantity );
+              row.SetCellProductionValue( weekcolumn, isccproduction, [Real]supplyquantity );
             }
             //搴撳瓨
             if( iscc or isdl ){
-              row.SetCellInventoryValue( daycolumn, iscc, inventoryquantity );
+              row.SetCellInventoryValue( daycolumn, iscc, [Real]inventoryquantity );
               if( pispip.Start() = weekstart + Duration::Days( 6 ) or pispip.Period_MP() = endperiod ){
                 weekstart         := ( weekstart + Duration::Days( 7 ) ).Date();
-                row.SetCellInventoryValue( weekcolumn, iscc, inventoryquantity );
+                row.SetCellInventoryValue( weekcolumn, iscc, [Real]inventoryquantity );
               }
             }
           }

--
Gitblit v1.9.3