From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def
index f131cc6..36d0cba 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def
@@ -2,27 +2,41 @@
 #parent: pnlActions/btnOk
 Response OnClick () id:Response_pnlActions_btnOk_OnClick
 {
-  #keys: '[412672.0.1039310295]'
+  #keys: '[414996.1.206961980]'
   DefinitionID: 'Responsedef_WebButton_OnClick'
   GroupServerCalls: true
   QuillAction
   {
     Body:
     [*
-      if( cbAllProduct.Checked() ){
-        traverse( MacroPlan,Product_MP,product ){
-          traverse( product,ProductInStockingPoint_MP,productInStockingPoint ){
-            LockPeriod::Create( productInStockingPoint,dsLockDate.Date() );
+      if( cbAllStockingPoint.Checked() ){
+        if( cbAllProduct.Checked() ){
+          // 閿佸畾鍏ㄩ儴浜у搧
+          traverse( MacroPlan,Product_MP,product ){
+            traverse( product,ProductInStockingPoint_MP,productInStockingPoint ){
+              LockPeriod::Create( productInStockingPoint,dsLockDate.Date(),InterfaceDataset );
+            }
+          }
+        }else{
+          // 閿佸畾鎸囧畾浜у搧涓嬬殑鍏ㄩ儴搴撳瓨鐐�
+          product := ddlProduct.Data();
+          traverse( product,ProductInStockingPoint_MP,productInStockingPoint){
+            LockPeriod::Create( productInStockingPoint,dsLockDate.Date(), InterfaceDataset );
           }
         }
       }else{
-        if( cbAllProductInStockingPoint.Checked() ){
-          product := ddlProduct.Data();
-          traverse( product,ProductInStockingPoint_MP,productInStockingPoint ){
-            LockPeriod::Create( productInStockingPoint,dsLockDate.Date() );
+        if( cbAllProduct.Checked() ){
+          // 閿佸畾鎸囧畾搴撳瓨鐐逛笅鐨勫叏閮ㄤ骇鍝�
+          stockingPoint := ddlStockingPoint.Data();
+          traverse( stockingPoint,ProductInStockingPoint_MP,productInStockingPoint ){
+            LockPeriod::Create( productInStockingPoint,dsLockDate.Date(), InterfaceDataset );
           }
         }else{
-          LockPeriod::Create( ddlProductInStockingPoint.Data(),dsLockDate.Date() );
+          // 閿佸畾鎸囧畾搴撳瓨鐐圭殑鎸囧畾浜у搧
+          productInStockingPoint := select( ddlProduct.Data(),ProductInStockingPoint_MP,pisp,pisp.StockingPoint_MP() = ddlStockingPoint.Data() );
+          if( not isnull( productInStockingPoint )){
+            LockPeriod::Create( productInStockingPoint,dsLockDate.Date(),InterfaceDataset );
+          }
         } 
       }
       Form.Close();

--
Gitblit v1.9.3