From 7da84821eb07cfa1370adfe4144e41416cf1cefa Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期四, 07 十一月 2024 11:46:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 _Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl
index 8876fdd..a9c3acf 100644
--- a/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl
@@ -25,10 +25,6 @@
                                                                  , InterfaceDateTime         := nowdate
                                                                  , Message                   := '瀹㈡埛闇�姹傦紙PPA+IDS锛夋暟鎹帹閫�'
                                                                  , Last                      := true
-                                                                 , IsShow                    := false
-                                                                 , ReturnSuccess             := true
-                                                                 , ReturnMsg                 := 'Success'
-                                                                 , Success                   := true
                                                                   );
     traverse( interfaceDataset, CustomerDemandIDS.Row, row ){
       traverse( row, Cell, cell ){
@@ -37,11 +33,14 @@
                                                                      , DemandQty               := [Number]cell.Value()
                                                                      , VersionName             := macroplan.ScenarioName()
                                                                      , InterfaceTime           := nowdate
+                                                                     , FactoryName             := row.Factory()
+                                                                     , Fac                     := ifexpr( row.Factory() = FinancialProductionReport::GetDefaultCCUnit(), 'CC', 'DL' )  
     //                                                                 , VersionFlag             := versionflag
                                                                      );
         loginfo.CustomerDemandPPAIDS( relinsert, cd );
       }
     }
     loginfo.TotalRow( loginfo.CustomerDemandPPAIDS( relsize ) );
+    CustomerDemandPPAIDS::Publish( interfaceDataset, loginfo );
   *]
 }

--
Gitblit v1.9.3