From 4a3d9ec9b4d11f096fc24cfeee40246492dc08fd Mon Sep 17 00:00:00 2001
From: Administrator <renhui.hao@capgemini.com>
Date: 星期一, 25 九月 2023 22:43:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'

---
 _Main/BL/Type_MacroPlan/Method_MappingOperationData.qbl |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/_Main/BL/Type_MacroPlan/Method_MappingOperationData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingOperationData.qbl
index 07e9838..29e7e21 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingOperationData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingOperationData.qbl
@@ -1,21 +1,22 @@
 Quintiq file version 2.0
 #parent: #root
 Method MappingOperationData (
-  Strings businessTypes
+  Strings businessTypes,
+  GlobalOTDTable globalOTDTable
 )
 {
   TextBody:
   [*
     // yypsybs Aug-18-2023 (created)
     // 鑾峰彇鏈夊簭鐨勫緟澶勭悊璁板綍
-    toDealList := construct( MappingOperations );
+    toDealList := construct( Global_MappingOperations ) ;
     if( not isnull( businessTypes ) and businessTypes.Size() > 0 ) {
-        toDealList := selectsortedset( this, MappingOperation, item, 
+        toDealList := selectsortedset( globalOTDTable, Global_MappingOperation, item, 
                                        businessTypes.Find( item.BusinessType() ) >= 0, 
     //                                   businessTypes.Difference( businessTypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0, 
                                        item.SequenceNumber() );
     } else {
-        toDealList := selectsortedset( this, MappingOperation, item, 
+        toDealList := selectsortedset( globalOTDTable, Global_MappingOperation, item, 
                                        true, 
                                        item.SequenceNumber() );
     }
@@ -76,7 +77,7 @@
                                         0.0, 0.0, false, true );
         }
         
-        ManufactureLTProcessSection::CreateOrUpdate( op );
+    //    ManufactureLTProcessSection::CreateOrUpdate( op );
     }
     info( "========" )
     // 閬嶅巻routing锛岃繘琛宭ink

--
Gitblit v1.9.3