From 642ffe272e766efc3fc23f02b324817a94ed6d92 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 11 十一月 2024 17:46:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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..7fd1b52 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def
@@ -2,26 +2,37 @@
#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 ){
+ if( cbAllStockingPoint.Checked() ){
+ if( cbAllProductInStockingPoint.Checked() ){
+ // 閿佸畾鍏ㄩ儴浜у搧
+ traverse( MacroPlan,Product_MP,product ){
+ traverse( product,ProductInStockingPoint_MP,productInStockingPoint ){
+ LockPeriod::Create( productInStockingPoint,dsLockDate.Date() );
+ }
+ }
+ }else{
+ // 閿佸畾鎸囧畾浜у搧涓嬬殑鍏ㄩ儴搴撳瓨鐐�
+ product := ddlProductInStockingPoint.Data().Product_MP();
+ traverse( product,ProductInStockingPoint_MP,productInStockingPoint){
LockPeriod::Create( productInStockingPoint,dsLockDate.Date() );
}
}
}else{
if( cbAllProductInStockingPoint.Checked() ){
- product := ddlProduct.Data();
- traverse( product,ProductInStockingPoint_MP,productInStockingPoint ){
+ // 閿佸畾鎸囧畾搴撳瓨鐐逛笅鐨勫叏閮ㄤ骇鍝�
+ stockingPoint := ddlStockingPoint.Data();
+ traverse( stockingPoint,ProductInStockingPoint_MP,productInStockingPoint ){
LockPeriod::Create( productInStockingPoint,dsLockDate.Date() );
}
}else{
+ // 閿佸畾鎸囧畾搴撳瓨鐐圭殑鎸囧畾浜у搧
LockPeriod::Create( ddlProductInStockingPoint.Data(),dsLockDate.Date() );
}
}
--
Gitblit v1.9.3