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