From 0f01fa217f4ac573df4ff126e020fe3de25e0738 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期一, 14 十月 2024 10:46:13 +0800
Subject: [PATCH] 发动机物流报表系数不显示

---
 _Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl             |    3 ++-
 _Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl              |    2 +-
 _Main/BL/Type_MachineStockData/StaticMethod_GenerateData.qbl               |    6 +++---
 _Main/BL/Type_EnginePipelineReport/Method_Generate.qbl                     |    2 +-
 _Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory.qbl |    4 +++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
index f5a173d..0d48222 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
@@ -36,7 +36,7 @@
             sumcell  := sumrow.Initialize( column );
           }
           //鏄剧ず鏈堝崟鍏冩牸
-          showcell   := showrow.Cell( relnew, RentInCost := cell.RentInCost(), RentOutOfCost := cell.RentOutOfCost(), WerkToRentTransCost := cell.WerkToRentTransCost(), RentStorCost := cell.RentStorCost() );
+          showcell   := showrow.Cell( relnew, RentInCost := cell.RentInCost(), RentOutOfCost := cell.RentOutOfCost(), WerkToRentTransCost := cell.WerkToRentTransCost(), RentStorCost := cell.RentStorCost(), CoefficientValue := cell.CoefficientValue() );
           column.Cell( relinsert, showcell );
           //鏄剧ず骞村崟鍏冩牸
           yearcell.RentInCost( cell.RentInCost() + yearcell.RentInCost() );
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl
index b6b3d79..8ed89f7 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl
@@ -44,7 +44,8 @@
                                       , DLRentInCost                 := cell.DLRentInCost()
                                       , DLRentOutOfCost              := cell.DLRentOutOfCost()
                                       , WerkToDLRentTransCost        := cell.WerkToDLRentTransCost()
-                                      , DLRentStorCost            := cell.DLRentStorCost() );
+                                      , DLRentStorCost               := cell.DLRentStorCost()
+                                      , CoefficientValue             := cell.CoefficientValue() );
           column.Cell( relinsert, showcell );
           //鏄剧ず骞村崟鍏冩牸
           yearcell.CCRentInCost( cell.CCRentInCost() + yearcell.CCRentInCost() );
diff --git a/_Main/BL/Type_EnginePipelineReport/Method_Generate.qbl b/_Main/BL/Type_EnginePipelineReport/Method_Generate.qbl
index 4b5cc53..5dfe598 100644
--- a/_Main/BL/Type_EnginePipelineReport/Method_Generate.qbl
+++ b/_Main/BL/Type_EnginePipelineReport/Method_Generate.qbl
@@ -114,7 +114,7 @@
           
           traverse( cell, Demand, demand, exists( models, Elements, model, model = demand.Model() ) ){
             demandrow              := selectobject( this, Row, r, r.Product() = row.Name() and r.Demand() = demand.Model() );
-            sumdemandrow           := selectobject( this, Row, r, r.Name() = sumname and r.Demand() = demand.Model() );
+            sumdemandrow           := selectobject( this, Row, r, r.Product() = sumname and r.Demand() = demand.Model() );
     
             if( not isnull( demandrow ) ){
               demandcell             := column.CellValue( relnew, Value := [String]demand.Quantity() );
diff --git a/_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory.qbl b/_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory.qbl
index 2879dd7..9d17067 100644
--- a/_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory.qbl
+++ b/_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory.qbl
@@ -27,7 +27,9 @@
       //鍙戝姩鏈烘垚鍝佸簱瀛�
       traverse( loginfo, FinishedEngineInventory, inventory ){
         product    := select( macroPlan, Product_MP, product, product.Notes() = inventory.FourCode() );
-        InventoryInterfaceData::Generate( interfaceDataset, inventory.DDay(), product.ID(), inventory.BIPlace(), [Number]inventory.Total() );
+        if( not isnull( product ) ){
+          InventoryInterfaceData::Generate( interfaceDataset, inventory.DDay(), product.ID(), inventory.BIPlace(), [Number]inventory.Total() );
+        }
       }
     }
   *]
diff --git a/_Main/BL/Type_MachineStockData/StaticMethod_GenerateData.qbl b/_Main/BL/Type_MachineStockData/StaticMethod_GenerateData.qbl
index 421cab2..7e06552 100644
--- a/_Main/BL/Type_MachineStockData/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_MachineStockData/StaticMethod_GenerateData.qbl
@@ -9,14 +9,14 @@
   TextBody:
   [*
     // 鐢勫叞楦� Jul-17-2024 (created)
-    material_no       := guard( item.Get( "material_no").GetString(),"");
+    material_no       := guard( item.Get( "matnr").GetString(),"");
     material_name     := guard( item.Get( "material_name").GetString(),"");
     fac_name          := guard( item.Get( "fac_name").GetString(),"");
     fac               := guard( item.Get( "fac").GetString(),"");
-    total             := guard( item.Get( "total").GetReal(), 0 );
+    total             := guard( item.Get( "qty").GetReal(), 0 );
     all_total         := guard( item.Get( "all_total").GetReal(), 0 );
     dday              := guard( item.Get( "dday").GetString(),"");
-    line_type         := guard( item.Get( "fac").GetString(),"");
+    line_type         := guard( item.Get( "line_type").GetString(),"");
     lgort             := guard( item.Get( "lgort").GetString(),"");
     
     msdata           := owner.MachineStockData( relnew, MaterialNo := material_no

--
Gitblit v1.9.3