From da2ced12d8f7736f959b298538eb936d060fd578 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期四, 14 十一月 2024 11:07:27 +0800
Subject: [PATCH] 修改锁定期
---
/dev/null | 20 ----------
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent.def | 14 +------
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pProduct#661.def | 18 ++++----
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pProduct_cbAllProduct_OnChanged.def | 20 ++++++++++
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pProduct_ddlProduct_OnSelectionChanged.def | 4 +-
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def | 11 +++--
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pStockingPoint.def | 2
7 files changed, 41 insertions(+), 48 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent661.def "b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pProduct\043661.def"
similarity index 68%
rename from _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent661.def
rename to "_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pProduct\043661.def"
index cb83f7d..7fc5e05 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent661.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pProduct\043661.def"
@@ -1,27 +1,27 @@
Quintiq file version 2.0
-Component pnlContent661
+Component pProduct
{
#keys: '[414996.1.206961946]'
BaseType: 'WebPanel'
Children:
[
- Component ddlProductInStockingPoint
+ Component ddlProduct
{
#keys: '[414996.1.206961947]'
BaseType: 'WebDropDownList'
- Databinding: 'ProductInStockingPoint_MP'
+ Databinding: 'Product_MP'
Children:
[
- Component deContent404
+ Component deProduct
{
#keys: '[414996.1.206961948]'
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'StockingPoint_MP'
- Source: 'dhSelectStockingPoint'
+ DataType: 'MacroPlan'
+ Source: 'MacroPlan'
Taborder: 0
- Transformation: 'ProductInStockingPoint_MP'
+ Transformation: 'Product_MP'
]
}
]
@@ -33,7 +33,7 @@
Taborder: 0
]
}
- Component cbAllProductInStockingPoint
+ Component cbAllProduct
{
#keys: '[414996.1.206961949]'
BaseType: 'WebCheckbox'
@@ -47,6 +47,6 @@
[
FixedSize: true
Orientation: 'horizontal'
- Taborder: 2
+ Taborder: 1
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pStockingPoint.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pStockingPoint.def
index fabf479..5873a57 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pStockingPoint.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pStockingPoint.def
@@ -12,7 +12,7 @@
Databinding: 'StockingPoint_MP'
Children:
[
- Component deContent
+ Component deStockingPoint
{
#keys: '[414996.1.206961944]'
BaseType: 'WebDataExtractor'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent.def
index 3eaa956..9ad2d3e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent.def
@@ -12,21 +12,11 @@
Properties:
[
Label: '閿佸畾鏈熻嚦锛�'
- Taborder: 3
+ Taborder: 2
]
}
#child: pStockingPoint
- #child: pnlContent661
- Component dhSelectStockingPoint
- {
- #keys: '[414996.1.206961950]'
- BaseType: 'WebDataHolder'
- Databinding: 'StockingPoint_MP'
- Properties:
- [
- Taborder: 1
- ]
- }
+ #child: pProduct
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pProduct_cbAllProduct_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pProduct_cbAllProduct_OnChanged.def
new file mode 100644
index 0000000..5a2ca14
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pProduct_cbAllProduct_OnChanged.def
@@ -0,0 +1,20 @@
+Quintiq file version 2.0
+#parent: pProduct/cbAllProduct
+Response OnChanged () id:Response_pProduct_cbAllProduct_OnChanged
+{
+ #keys: '[414996.1.206961937]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
+ GroupServerCalls: true
+ QuillAction
+ {
+ Body:
+ [*
+ if( this.Checked() ){
+ ddlProduct.Enabled( false,"" );
+ }else{
+ ddlProduct.Enabled( true,"" );
+ }
+ *]
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlContent661_ddlProductInStockingPoint_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pProduct_ddlProduct_OnSelectionChanged.def
similarity index 72%
rename from _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlContent661_ddlProductInStockingPoint_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pProduct_ddlProduct_OnSelectionChanged.def
index 2c3001e..6aa42a8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlContent661_ddlProductInStockingPoint_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pProduct_ddlProduct_OnSelectionChanged.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: pnlContent661/ddlProductInStockingPoint
+#parent: pProduct/ddlProduct
Response OnSelectionChanged (
ProductInStockingPoint_MP selection
-) id:Response_pnlContent661_ddlProductInStockingPoint_OnSelectionChanged
+) id:Response_pProduct_ddlProduct_OnSelectionChanged
{
#keys: '[414996.1.207063206]'
CanBindMultiple: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pStockingPoint_ddlStockingPoint_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pStockingPoint_ddlStockingPoint_OnSelectionChanged.def
deleted file mode 100644
index 660d3f1..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pStockingPoint_ddlStockingPoint_OnSelectionChanged.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: pStockingPoint/ddlStockingPoint
-Response OnSelectionChanged (
- StockingPoint_MP selection
-) id:Response_pStockingPoint_ddlStockingPoint_OnSelectionChanged
-{
- #keys: '[414996.1.206961939]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
- GroupServerCalls: true
- QuillAction
- {
- Body:
- [*
- dhSelectStockingPoint.Data( selection );
- *]
- }
-}
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();
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlContent661_cbAllProductInStockingPoint_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlContent661_cbAllProductInStockingPoint_OnChanged.def
deleted file mode 100644
index b0901ff..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlContent661_cbAllProductInStockingPoint_OnChanged.def
+++ /dev/null
@@ -1,20 +0,0 @@
-Quintiq file version 2.0
-#parent: pnlContent661/cbAllProductInStockingPoint
-Response OnChanged () id:Response_pnlContent661_cbAllProductInStockingPoint_OnChanged
-{
- #keys: '[414996.1.206961937]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
- GroupServerCalls: true
- QuillAction
- {
- Body:
- [*
- if( this.Checked() ){
- ddlProductInStockingPoint.Enabled( false,"" );
- }else{
- ddlProductInStockingPoint.Enabled( true,"" );
- }
- *]
- }
-}
--
Gitblit v1.9.3