From 7c445b476a69ee8083a0e5733565e13dc8c0d109 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 14 十一月 2024 14:19:07 +0800
Subject: [PATCH] 计划下发界面区分工厂
---
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContentDL.def | 20 +++
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def | 73 ++++++++---
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAll_cbAll_OnChanged.def | 6
_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl | 29 ++--
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAllCC.def | 12 +-
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlan.def | 8
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlanCC.def | 12 +-
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan.def | 8
_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl | 5
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlanCC.def | 12 +-
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemand.def | 8
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAll.def | 8
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContentCC.def | 20 +++
_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl | 28 ++--
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemandCC.def | 12 +-
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContent.def | 9 -
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAllCC_cbAllCC_OnChanged.def | 28 ++++
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan.def | 8
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlanCC.def | 12 +-
_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Method_OnOK.def | 4
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlan.def | 8
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnOk_OnClick.def | 6
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlanCC.def | 12 +-
23 files changed, 229 insertions(+), 119 deletions(-)
diff --git a/_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl
index 85cac89..f2d8561 100644
--- a/_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl
@@ -3,6 +3,8 @@
StaticMethod GenerateData (
InterfaceDataset interfaceDataset,
const MacroPlan macroplan,
+ Boolean iscc,
+ Boolean isdl,
String executor
)
{
@@ -30,18 +32,20 @@
traverse( verison, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() ){
traverse( column, Cell, cell ){
row := cell.Row();
- cd :=interfaceDataset.AssemblyOnlinePlanPPPSPush( relnew, Product := row.ProductID()
- , PlanningDate := column.StartDate()
- , PlanningQty := [Number]cell.Quantity()
- , Sequence := cell.Order()
- , VersionName := macroplan.ScenarioName()
- , InterfaceTime := nowdate
- , FactoryName := row.Unit()
- , Fac := ifexpr( row.Unit() = FinancialProductionReport::GetDefaultCCUnit(), 'CC', 'DL' )
- // , VersionFlag := versionflag
- , ProductFourCode := ifexpr( row.ProductID() = row.Name(), '', row.Name() )
- );
- loginfo.AssemblyOnlinePlanPPPSPush( relinsert, cd );
+ if( ( iscc and row.Unit() = FinancialProductionReport::GetDefaultCCUnit() ) or ( isdl and row.Unit() = FinancialProductionReport::GetDefaultDLUnit() ) ){
+ cd :=interfaceDataset.AssemblyOnlinePlanPPPSPush( relnew, Product := row.ProductID()
+ , PlanningDate := column.StartDate()
+ , PlanningQty := [Number]cell.Quantity()
+ , Sequence := cell.Order()
+ , VersionName := macroplan.ScenarioName()
+ , InterfaceTime := nowdate
+ , FactoryName := row.Unit()
+ , Fac := ifexpr( row.Unit() = FinancialProductionReport::GetDefaultCCUnit(), 'CC', 'DL' )
+ // , VersionFlag := versionflag
+ , ProductFourCode := ifexpr( row.ProductID() = row.Name(), '', row.Name() )
+ );
+ loginfo.AssemblyOnlinePlanPPPSPush( relinsert, cd );
+ }
}
}
}
diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl
index a9c3acf..80e6b42 100644
--- a/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl
@@ -3,6 +3,8 @@
StaticMethod GenerateData (
InterfaceDataset interfaceDataset,
const MacroPlan macroplan,
+ Boolean iscc,
+ Boolean isdl,
String executor
)
{
@@ -26,7 +28,8 @@
, Message := '瀹㈡埛闇�姹傦紙PPA+IDS锛夋暟鎹帹閫�'
, Last := true
);
- traverse( interfaceDataset, CustomerDemandIDS.Row, row ){
+ traverse( interfaceDataset, CustomerDemandIDS.Row, row, ( iscc and row.Factory() = FinancialProductionReport::GetDefaultCCUnit() )
+ or ( isdl and row.Factory() = FinancialProductionReport::GetDefaultDLUnit() ) ){
traverse( row, Cell, cell ){
cd :=interfaceDataset.CustomerDemandPPAIDS( relnew, Product := row.Name()
, DemandDate := cell.Column().StartDate()
diff --git a/_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl b/_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl
index a1bbc96..aeeb3ca 100644
--- a/_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl
+++ b/_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl
@@ -2,11 +2,16 @@
#parent: #root
Method PublishPlanReportData (
const MacroPlan macroplan,
- Boolean iscustomdemand,
- Boolean isofflineplan,
- Boolean isshiftplan,
- Boolean isassembleonlineplan,
- Boolean isinventoryplan,
+ Boolean iscustomdemanddl,
+ Boolean iscustomdemandcc,
+ Boolean isofflineplandl,
+ Boolean isofflineplancc,
+ Boolean isshiftplandl,
+ Boolean isshiftplancc,
+ Boolean isassembleonlineplandl,
+ Boolean isassembleonlineplancc,
+ Boolean isinventoryplandl,
+ Boolean isinventoryplancc,
String executor
)
{
@@ -14,20 +19,20 @@
TextBody:
[*
// 鐢勫叞楦� Oct-30-2024 (created)
- if( iscustomdemand ){//鍏ㄥ勾鏃ュ害闇�姹�/瀹㈡埛闇�姹�
- CustomerDemandPPAIDS::GenerateData( this, macroplan, executor );
+ if( iscustomdemanddl or iscustomdemandcc ){//鍏ㄥ勾鏃ュ害闇�姹�/瀹㈡埛闇�姹�
+ CustomerDemandPPAIDS::GenerateData( this, macroplan, iscustomdemandcc, iscustomdemanddl, executor );
}
- if ( isofflineplan ) { // 鍚勪骇绾夸笅绾胯鍒�
+ if ( isofflineplandl or isofflineplancc ) { // 鍚勪骇绾夸笅绾胯鍒�
InterfaceDataset::PushOfflinePlanData( macroplan, this, executor );
}
- if( isshiftplan ){//鐝璁″垝
+ if( isshiftplandl or isshiftplancc ){//鐝璁″垝
DispatchShiftPlan::Dispatch(this, macroplan,executor );
// CustomerDemandIDS::GenerateData( this, recyclebin, archive );
}
- if( isassembleonlineplan ){//瑁呴厤涓婄嚎璁″垝
- AssemblyOnlinePlanPPPSPush::GenerateData( this, macroplan, executor );
+ if( isassembleonlineplandl or isassembleonlineplancc ){//瑁呴厤涓婄嚎璁″垝
+ AssemblyOnlinePlanPPPSPush::GenerateData( this, macroplan, isassembleonlineplancc, isassembleonlineplandl, executor );
}
- if ( isinventoryplan ) { // 璁″垝搴撳瓨鏁版嵁
+ if ( isinventoryplandl or isinventoryplancc ) { // 璁″垝搴撳瓨鏁版嵁
InterfaceDataset::PushPlanInventoryData( macroplan, this, executor );
}
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Method_OnOK.def
index e76af1c..b395887 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Method_OnOK.def
@@ -11,10 +11,10 @@
currentuser := QuintiqUser::CurrentUser().DisplayName();
isactive := ifexpr( rbgVersionFlag.BoundValue() = "true", true, false );
if( efInterfacename.Text() = Translations::InterfaceDataset_CustomerDemandPPAIDS_Name() ){//瀹㈡埛闇�姹�
- CustomerDemandPPAIDS::GenerateData( InterfaceDataset, MacroPlan, currentuser );
+ // CustomerDemandPPAIDS::GenerateData( InterfaceDataset, MacroPlan, currentuser );
}
if( efInterfacename.Text() = Translations::InterfaceDataset_AssemblyOnlinePlanPPPsPush_Name()){//瑁呴厤涓婄嚎
- AssemblyOnlinePlanPPPSPush::GenerateData( InterfaceDataset, MacroPlan, currentuser );
+ // AssemblyOnlinePlanPPPSPush::GenerateData( InterfaceDataset, MacroPlan, currentuser );
}
WebMessageBox::Success( "鎺ㄩ�佹垚鍔燂紒" );
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAll\043720.def" b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAll.def
similarity index 73%
rename from "_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAll\043720.def"
rename to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAll.def
index 38e1838..4177c3c 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAll\043720.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAll.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component pnlAll id:pnlAll_720
+Component pnlAll
{
- #keys: '[415136.0.1255982465]'
+ #keys: '[415136.0.1302693096]'
BaseType: 'WebPanel'
Children:
[
Component lblAll
{
- #keys: '[415136.0.1255982466]'
+ #keys: '[415136.0.1302693097]'
BaseType: 'WebLabel'
Properties:
[
@@ -17,7 +17,7 @@
}
Component cbAll
{
- #keys: '[415136.0.1255982467]'
+ #keys: '[415136.0.1302693098]'
BaseType: 'WebCheckbox'
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAll\043720.def" b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAllCC.def
similarity index 66%
copy from "_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAll\043720.def"
copy to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAllCC.def
index 38e1838..b18a006 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAll\043720.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAllCC.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component pnlAll id:pnlAll_720
+Component pnlAllCC
{
- #keys: '[415136.0.1255982465]'
+ #keys: '[415136.0.1303133156]'
BaseType: 'WebPanel'
Children:
[
- Component lblAll
+ Component lblAllCC
{
- #keys: '[415136.0.1255982466]'
+ #keys: '[415136.0.1303133157]'
BaseType: 'WebLabel'
Properties:
[
@@ -15,9 +15,9 @@
Taborder: 0
]
}
- Component cbAll
+ Component cbAllCC
{
- #keys: '[415136.0.1255982467]'
+ #keys: '[415136.0.1303133158]'
BaseType: 'WebCheckbox'
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan\043679.def" b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan.def
similarity index 72%
rename from "_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan\043679.def"
rename to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan.def
index 738092a..30de5f2 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan\043679.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component pnlAssembleOnlinePlan id:pnlAssembleOnlinePlan_679
+Component pnlAssembleOnlinePlan
{
- #keys: '[415136.0.1255982426]'
+ #keys: '[415136.0.1302693049]'
BaseType: 'WebPanel'
Children:
[
Component lblAssembleOnlinePlan
{
- #keys: '[415136.0.1255982427]'
+ #keys: '[415136.0.1302693050]'
BaseType: 'WebLabel'
Properties:
[
@@ -17,7 +17,7 @@
}
Component cbAssembleOnlinePlan
{
- #keys: '[415136.0.1255982428]'
+ #keys: '[415136.0.1302693051]'
BaseType: 'WebCheckbox'
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan\043679.def" b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlanCC.def
similarity index 60%
copy from "_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan\043679.def"
copy to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlanCC.def
index 738092a..86cb94d 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan\043679.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlanCC.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component pnlAssembleOnlinePlan id:pnlAssembleOnlinePlan_679
+Component pnlAssembleOnlinePlanCC
{
- #keys: '[415136.0.1255982426]'
+ #keys: '[415136.0.1303133150]'
BaseType: 'WebPanel'
Children:
[
- Component lblAssembleOnlinePlan
+ Component lblAssembleOnlinePlanCC
{
- #keys: '[415136.0.1255982427]'
+ #keys: '[415136.0.1303133151]'
BaseType: 'WebLabel'
Properties:
[
@@ -15,9 +15,9 @@
Taborder: 0
]
}
- Component cbAssembleOnlinePlan
+ Component cbAssembleOnlinePlanCC
{
- #keys: '[415136.0.1255982428]'
+ #keys: '[415136.0.1303133152]'
BaseType: 'WebCheckbox'
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContent.def
index ab5e221..f73928e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContent.def
@@ -5,15 +5,12 @@
BaseType: 'WebPanel'
Children:
[
- #child: pnlCustomDemand_462
- #child: pnlOfflinePlan_520
- #child: pnlAssembleOnlinePlan_679
- #child: pnlInventoryPlan_119
- #child: pnlAll_720
- #child: pnlShiftPlan_780
+ #child: pnlContentDL
+ #child: pnlContentCC
]
Properties:
[
+ Orientation: 'tab'
Padding: 'true'
Taborder: 0
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContentCC.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContentCC.def
new file mode 100644
index 0000000..e26ea92
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContentCC.def
@@ -0,0 +1,20 @@
+Quintiq file version 2.0
+Component pnlContentCC
+{
+ #keys: '[415136.0.1303133140]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: pnlCustomDemandCC
+ #child: pnlOfflinePlanCC
+ #child: pnlShiftPlanCC
+ #child: pnlAssembleOnlinePlanCC
+ #child: pnlInventoryPlanCC
+ #child: pnlAllCC
+ ]
+ Properties:
+ [
+ Taborder: 1
+ Title: '闀挎槬宸ュ巶'
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContentDL.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContentDL.def
new file mode 100644
index 0000000..e4136d0
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContentDL.def
@@ -0,0 +1,20 @@
+Quintiq file version 2.0
+Component pnlContentDL
+{
+ #keys: '[415136.0.1302530440]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: pnlCustomDemand
+ #child: pnlOfflinePlan
+ #child: pnlShiftPlan
+ #child: pnlAssembleOnlinePlan
+ #child: pnlInventoryPlan
+ #child: pnlAll
+ ]
+ Properties:
+ [
+ Taborder: 0
+ Title: '澶ц繛宸ュ巶'
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemand\043462.def" b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemand.def
similarity index 72%
rename from "_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemand\043462.def"
rename to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemand.def
index 4255081..dcfc7e3 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemand\043462.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemand.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component pnlCustomDemand id:pnlCustomDemand_462
+Component pnlCustomDemand
{
- #keys: '[415136.0.1255981813]'
+ #keys: '[415136.0.1302692983]'
BaseType: 'WebPanel'
Children:
[
Component lblCustomDemand
{
- #keys: '[415136.0.1255981814]'
+ #keys: '[415136.0.1302692984]'
BaseType: 'WebLabel'
Properties:
[
@@ -17,7 +17,7 @@
}
Component cbCustomDemand
{
- #keys: '[415136.0.1255981815]'
+ #keys: '[415136.0.1302692985]'
BaseType: 'WebCheckbox'
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemand\043462.def" b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemandCC.def
similarity index 62%
copy from "_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemand\043462.def"
copy to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemandCC.def
index 4255081..99f61ba 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemand\043462.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemandCC.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component pnlCustomDemand id:pnlCustomDemand_462
+Component pnlCustomDemandCC
{
- #keys: '[415136.0.1255981813]'
+ #keys: '[415136.0.1303133141]'
BaseType: 'WebPanel'
Children:
[
- Component lblCustomDemand
+ Component lblCustomDemandCC
{
- #keys: '[415136.0.1255981814]'
+ #keys: '[415136.0.1303133142]'
BaseType: 'WebLabel'
Properties:
[
@@ -15,9 +15,9 @@
Taborder: 0
]
}
- Component cbCustomDemand
+ Component cbCustomDemandCC
{
- #keys: '[415136.0.1255981815]'
+ #keys: '[415136.0.1303133143]'
BaseType: 'WebCheckbox'
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlan\043119.def" b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlan.def
similarity index 72%
rename from "_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlan\043119.def"
rename to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlan.def
index fde59fb..35d3866 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlan\043119.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlan.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component pnlInventoryPlan id:pnlInventoryPlan_119
+Component pnlInventoryPlan
{
- #keys: '[415136.0.1255982447]'
+ #keys: '[415136.0.1302693071]'
BaseType: 'WebPanel'
Children:
[
Component lblInventoryPlan
{
- #keys: '[415136.0.1255982448]'
+ #keys: '[415136.0.1302693072]'
BaseType: 'WebLabel'
Properties:
[
@@ -17,7 +17,7 @@
}
Component cbInventoryPlan
{
- #keys: '[415136.0.1255982449]'
+ #keys: '[415136.0.1302693073]'
BaseType: 'WebCheckbox'
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlan\043119.def" b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlanCC.def
similarity index 62%
copy from "_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlan\043119.def"
copy to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlanCC.def
index fde59fb..0ae8b90 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlan\043119.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlanCC.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component pnlInventoryPlan id:pnlInventoryPlan_119
+Component pnlInventoryPlanCC
{
- #keys: '[415136.0.1255982447]'
+ #keys: '[415136.0.1303133153]'
BaseType: 'WebPanel'
Children:
[
- Component lblInventoryPlan
+ Component lblInventoryPlanCC
{
- #keys: '[415136.0.1255982448]'
+ #keys: '[415136.0.1303133154]'
BaseType: 'WebLabel'
Properties:
[
@@ -15,9 +15,9 @@
Taborder: 0
]
}
- Component cbInventoryPlan
+ Component cbInventoryPlanCC
{
- #keys: '[415136.0.1255982449]'
+ #keys: '[415136.0.1303133155]'
BaseType: 'WebCheckbox'
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlan\043520.def" b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlan.def
similarity index 72%
rename from "_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlan\043520.def"
rename to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlan.def
index c14d76e..fd102cf 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlan\043520.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlan.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component pnlOfflinePlan id:pnlOfflinePlan_520
+Component pnlOfflinePlan
{
- #keys: '[415136.0.1255981829]'
+ #keys: '[415136.0.1302693005]'
BaseType: 'WebPanel'
Children:
[
Component lblOfflinePlan
{
- #keys: '[415136.0.1255981830]'
+ #keys: '[415136.0.1302693006]'
BaseType: 'WebLabel'
Properties:
[
@@ -17,7 +17,7 @@
}
Component cbOfflinePlan
{
- #keys: '[415136.0.1255981831]'
+ #keys: '[415136.0.1302693007]'
BaseType: 'WebCheckbox'
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlan\043520.def" b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlanCC.def
similarity index 62%
copy from "_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlan\043520.def"
copy to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlanCC.def
index c14d76e..0f7da5f 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlan\043520.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlanCC.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component pnlOfflinePlan id:pnlOfflinePlan_520
+Component pnlOfflinePlanCC
{
- #keys: '[415136.0.1255981829]'
+ #keys: '[415136.0.1303133144]'
BaseType: 'WebPanel'
Children:
[
- Component lblOfflinePlan
+ Component lblOfflinePlanCC
{
- #keys: '[415136.0.1255981830]'
+ #keys: '[415136.0.1303133145]'
BaseType: 'WebLabel'
Properties:
[
@@ -15,9 +15,9 @@
Taborder: 0
]
}
- Component cbOfflinePlan
+ Component cbOfflinePlanCC
{
- #keys: '[415136.0.1255981831]'
+ #keys: '[415136.0.1303133146]'
BaseType: 'WebCheckbox'
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan\043780.def" b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan.def
similarity index 73%
rename from "_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan\043780.def"
rename to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan.def
index ff7f552..c145222 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan\043780.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component pnlShiftPlan id:pnlShiftPlan_780
+Component pnlShiftPlan
{
- #keys: '[415136.0.1255982410]'
+ #keys: '[415136.0.1302693027]'
BaseType: 'WebPanel'
Children:
[
Component lblShiftPlan
{
- #keys: '[415136.0.1255982411]'
+ #keys: '[415136.0.1302693028]'
BaseType: 'WebLabel'
Properties:
[
@@ -17,7 +17,7 @@
}
Component cbShiftPlan
{
- #keys: '[415136.0.1255982412]'
+ #keys: '[415136.0.1302693029]'
BaseType: 'WebCheckbox'
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan\043780.def" b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlanCC.def
similarity index 63%
copy from "_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan\043780.def"
copy to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlanCC.def
index ff7f552..54a20a0 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan\043780.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlanCC.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component pnlShiftPlan id:pnlShiftPlan_780
+Component pnlShiftPlanCC
{
- #keys: '[415136.0.1255982410]'
+ #keys: '[415136.0.1303133147]'
BaseType: 'WebPanel'
Children:
[
- Component lblShiftPlan
+ Component lblShiftPlanCC
{
- #keys: '[415136.0.1255982411]'
+ #keys: '[415136.0.1303133148]'
BaseType: 'WebLabel'
Properties:
[
@@ -15,9 +15,9 @@
Taborder: 0
]
}
- Component cbShiftPlan
+ Component cbShiftPlanCC
{
- #keys: '[415136.0.1255982412]'
+ #keys: '[415136.0.1303133149]'
BaseType: 'WebCheckbox'
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def
index e0d5650..2e5f44c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def
@@ -7,34 +7,63 @@
[*
this.ApplyChanges();
- showlabel := '鏄惁鍙戦��';
- plannames := construct( Strings );
- if( cbCustomDemand.Checked() ){
- plannames.Add( lblCustomDemand.Label() );
- }
- if( cbOfflinePlan.Checked() ){
- plannames.Add( lblOfflinePlan.Label() );
- }
- if( cbShiftPlan.Checked() ){
- plannames.Add( lblShiftPlan.Label() );
- }
- if( cbAssembleOnlinePlan.Checked() ){
- plannames.Add( lblAssembleOnlinePlan.Label() );
- }
- if( cbInventoryPlan.Checked() ){
- plannames.Add( lblInventoryPlan.Label() );
- }
+ showlabel := '鏄惁鍙戦��';
+ dlplannames := construct( Strings );
+ ccplannames := construct( Strings );
+ if( cbCustomDemand.Checked() ){
+ dlplannames.Add( lblCustomDemand.Label() );
+ }
+ if( cbCustomDemandCC.Checked() ){
+ ccplannames.Add( lblCustomDemandCC.Label() );
+ }
+ if( cbOfflinePlan.Checked() ){
+ dlplannames.Add( lblOfflinePlan.Label() );
+ }
+ if( cbOfflinePlanCC.Checked() ){
+ ccplannames.Add( lblOfflinePlanCC.Label() );
+ }
+ if( cbShiftPlan.Checked() ){
+ dlplannames.Add( lblShiftPlan.Label() );
+ }
+ if( cbShiftPlanCC.Checked() ){
+ ccplannames.Add( lblShiftPlanCC.Label() );
+ }
+ if( cbAssembleOnlinePlan.Checked() ){
+ dlplannames.Add( lblAssembleOnlinePlan.Label() );
+ }
+ if( cbAssembleOnlinePlanCC.Checked() ){
+ ccplannames.Add( lblAssembleOnlinePlanCC.Label() );
+ }
+ if( cbInventoryPlan.Checked() ){
+ dlplannames.Add( lblInventoryPlan.Label() );
+ }
+ if( cbInventoryPlanCC.Checked() ){
+ ccplannames.Add( lblInventoryPlanCC.Label() );
+ }
- showlabel := showlabel.Concat( plannames.Concatenate( "銆�" ) ).Concat( '锛�' );
- currentuser := QuintiqUser::CurrentUser().DisplayName();
- if( WebMessageBox::Question( this, showlabel, 'OK|Cancel' ) = 0 ){
- InterfaceDataset.PublishPlanReportData( MacroPlan, cbCustomDemand.Checked()
+ dlshowname := '澶ц繛宸ュ巶鐨�';
+ if( dlplannames.Size() > 0 ){
+ showlabel := showlabel.Concat( dlshowname.Concat( dlplannames.Concatenate( "銆�" ) ) ).Concat( "锛�");
+ }
+ ccshowname := '闀挎槬宸ュ巶鐨�';
+ if( ccplannames.Size() > 0 ){
+ showlabel := showlabel.Concat( ccshowname.Concat( ccplannames.Concatenate( "銆�" ) ) ).Concat( "锛�");
+ }
+ showlabel := showlabel.Concat( '銆�' );
+ currentuser := QuintiqUser::CurrentUser().DisplayName();
+ if( WebMessageBox::Question( this, showlabel, 'OK|Cancel' ) = 0 ){
+ InterfaceDataset.PublishPlanReportData( MacroPlan, cbCustomDemand.Checked()
+ , cbCustomDemandCC.Checked()
, cbOfflinePlan.Checked()
+ , cbOfflinePlanCC.Checked()
, cbShiftPlan.Checked()
+ , cbShiftPlanCC.Checked()
, cbAssembleOnlinePlan.Checked()
+ , cbAssembleOnlinePlanCC.Checked()
, cbInventoryPlan.Checked()
+ , cbInventoryPlanCC.Checked()
, currentuser );
- }
+ }
this.Close();
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnOk_OnClick.def
index 18496fa..3a13905 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnOk_OnClick.def
@@ -6,7 +6,11 @@
DefinitionID: 'Responsedef_WebButton_OnClick'
Precondition:
[*
- return not ( not cbCustomDemand.Checked() and not cbOfflinePlan.Checked() and not cbShiftPlan.Checked() and not cbAssembleOnlinePlan.Checked() and not cbInventoryPlan.Checked() );
+ return not ( not cbCustomDemand.Checked() and not cbCustomDemandCC.Checked()
+ and not cbOfflinePlan.Checked() and not cbOfflinePlanCC.Checked()
+ and not cbShiftPlan.Checked() and not cbShiftPlanCC.Checked()
+ and not cbAssembleOnlinePlan.Checked() and not cbAssembleOnlinePlanCC.Checked()
+ and not cbInventoryPlan.Checked() and not cbInventoryPlanCC.Checked() );
*]
QuillAction
{
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAllCC_cbAllCC_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAllCC_cbAllCC_OnChanged.def
new file mode 100644
index 0000000..4fbf347
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAllCC_cbAllCC_OnChanged.def
@@ -0,0 +1,28 @@
+Quintiq file version 2.0
+#parent: pnlAllCC/cbAllCC
+Response OnChanged () id:Response_pnlAllCC_cbAllCC_OnChanged
+{
+ #keys: '[415136.0.1303133139]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ if( this.Checked() ){
+ cbCustomDemandCC.Checked( true );
+ cbOfflinePlanCC.Checked( true );
+ cbShiftPlanCC.Checked( true );
+ cbAssembleOnlinePlanCC.Checked( true );
+ cbInventoryPlanCC.Checked( true );
+ }else{
+ cbCustomDemandCC.Checked( false );
+ cbOfflinePlanCC.Checked( false );
+ cbShiftPlanCC.Checked( false );
+ cbAssembleOnlinePlanCC.Checked( false );
+ cbInventoryPlanCC.Checked( false );
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAll_720_cbAll_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAll_cbAll_OnChanged.def
similarity index 84%
rename from _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAll_720_cbAll_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAll_cbAll_OnChanged.def
index 6b953b1..ae7a4ec 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAll_720_cbAll_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAll_cbAll_OnChanged.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: pnlAll_720/cbAll
-Response OnChanged () id:Response_pnlAll_720_cbAll_OnChanged
+#parent: pnlAll/cbAll
+Response OnChanged () id:Response_pnlAll_cbAll_OnChanged
{
- #keys: '[415136.0.1255982464]'
+ #keys: '[415136.0.1302693095]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
QuillAction
--
Gitblit v1.9.3