From e365ab19f5ec303d3701a2ab2d961c9ca0a5dbc6 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期日, 28 七月 2024 12:56:03 +0800
Subject: [PATCH] 需求计划BUG修改
---
_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pCurve_bCurve_OnClick.def | 4 +++-
_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pIDS_bIDS_OnClick.def | 4 +++-
_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Component_pPPAEnable.def | 2 ++
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def | 14 +++++++-------
_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Component_pPPA.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pPPA_bPPA_OnClick.def | 4 +++-
6 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
index 7221e9b..a33bc23 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
@@ -22,9 +22,7 @@
BaseType: 'WebButton'
Properties:
[
- Image: 'SIXPACK_BEER'
- Label: 'Packaging plan'
- Taborder: 3
+ Taborder: 5
]
}
Component bOfflinePlan
@@ -50,13 +48,15 @@
Taborder: 2
]
}
- Component btnSecondDevelopmentPlan
+ Component bPackagingPlan
{
- #keys: '[413988.0.1400700646]'
+ #keys: '[413988.0.1291640400]'
BaseType: 'WebButton'
Properties:
[
- Taborder: 4
+ Image: 'SIXPACK_BEER'
+ Label: 'Packaging plan'
+ Taborder: 3
]
}
Component bShippingActualData
@@ -67,7 +67,7 @@
[
Image: 'TABLE_CONNECTION'
Label: 'Shipping data'
- Taborder: 5
+ Taborder: 4
]
}
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Component_pPPA.def b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Component_pPPA.def
index 2f45a39..e7150b6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Component_pPPA.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Component_pPPA.def
@@ -11,7 +11,6 @@
BaseType: 'WebEditField'
Properties:
[
- Enabled: false
NumberOfColumns: 60
Taborder: 1
]
@@ -44,6 +43,7 @@
BaseType: 'WebLabel'
Properties:
[
+ Label: 'PPA'
NumberOfColumns: 0
Taborder: 0
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Component_pPPAEnable.def b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Component_pPPAEnable.def
index 5ee2a87..914e317 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Component_pPPAEnable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Component_pPPAEnable.def
@@ -11,6 +11,7 @@
BaseType: 'WebCheckbox'
Properties:
[
+ Checked: true
Label: '涓婁紶PPA'
Taborder: 1
]
@@ -32,5 +33,6 @@
FixedSize: true
Orientation: 'horizontal'
Taborder: 3
+ Visible: false
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pCurve_bCurve_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pCurve_bCurve_OnClick.def
index d597890..72eaf70 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pCurve_bCurve_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pCurve_bCurve_OnClick.def
@@ -15,7 +15,9 @@
[*
try {
uploadJsonString := Application.GetFile();
- if ( uploadJsonString <> "" ) {
+ if ( uploadJsonString <> "" and not uploadJsonString.Regex( "Curve" ) ) {
+ WebMessageBox::Error( "鏂囦欢鍚嶄笉鍖归厤" );
+ } else if ( uploadJsonString <> "" ) {
uploadJson := JSON::Parse( uploadJsonString );
Archive::VerifyTheFileName( uploadJson );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pIDS_bIDS_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pIDS_bIDS_OnClick.def
index c442aaa..2a69a85 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pIDS_bIDS_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pIDS_bIDS_OnClick.def
@@ -11,7 +11,9 @@
[*
try {
uploadJsonString := Application.GetFile();
- if ( uploadJsonString <> "" ) {
+ if ( uploadJsonString <> "" and not uploadJsonString.Regex( "IDS" ) ) {
+ WebMessageBox::Error( "鏂囦欢鍚嶄笉鍖归厤" );
+ } else if ( uploadJsonString <> "" ) {
uploadJson := JSON::Parse( uploadJsonString );
Archive::VerifyTheFileName( uploadJson );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pPPA_bPPA_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pPPA_bPPA_OnClick.def
index 339afee..0110168 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pPPA_bPPA_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pPPA_bPPA_OnClick.def
@@ -15,7 +15,9 @@
[*
try {
uploadJsonString := Application.GetFile();
- if ( uploadJsonString <> "" ) {
+ if ( uploadJsonString <> "" and not uploadJsonString.Regex( "PPA" ) ) {
+ WebMessageBox::Error( "鏂囦欢鍚嶄笉鍖归厤" );
+ } else if ( uploadJsonString <> "" ) {
uploadJson := JSON::Parse( uploadJsonString );
Archive::VerifyTheFileName( uploadJson );
--
Gitblit v1.9.3