From d47b2a6610c16b6db7fa991f6064d990085b65f3 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 22 十一月 2024 17:14:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl b/_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl
index a05e213..7b8a0a8 100644
--- a/_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl
+++ b/_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl
@@ -21,13 +21,14 @@
   [*
     // 鐢勫叞楦� Oct-30-2024 (created)
     if( iscustomdemanddl or iscustomdemandcc ){//鍏ㄥ勾鏃ュ害闇�姹�/瀹㈡埛闇�姹� 
-      CustomerDemandPPAIDS::GenerateData( this, macroplan, iscustomdemandcc, iscustomdemanddl, executor );
+      CustomerDemandPPAIDS::GenerateDataNew( this, macroplan, iscustomdemandcc, iscustomdemanddl, executor );
+    //  CustomerDemandPPAIDS::GenerateData( this, macroplan, iscustomdemandcc, iscustomdemanddl, executor );
     }
     if ( isofflineplandl or isofflineplancc ) { // 鍚勪骇绾夸笅绾胯鍒�
       InterfaceDataset::PushOfflinePlanData( macroplan, this, executor );
     }
     if( isshiftplandl or isshiftplancc ){//鐝璁″垝
-      DispatchShiftPlan::Dispatch(this, macroplan,executor );
+      DispatchShiftPlan::Dispatch(this, archive,executor );
     //  CustomerDemandIDS::GenerateData( this, recyclebin, archive );
     }
     if( isassembleonlineplandl or isassembleonlineplancc ){//瑁呴厤涓婄嚎璁″垝

--
Gitblit v1.9.3