From 7dcc1a44431ff8f08a28359c1bc62a29229e87b4 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 11 九月 2024 12:08:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
/dev/null | 13 ----
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Response_pnlContent_ddslGeneration_OnCreated.def | 18 ++++++
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Component_pnlContent.def | 22 +++---
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Response_pnlContent_ddslProduct_OnCreated.def | 18 ++++++
_Main/UI/MacroPlannerWebApp/Views/Labor_Costs.vw | 24 +-------
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def | 44 +++++++-------
_Main/BL/Type_ProductInStockingPointInPeriod#228/Attribute_Notes.qbl | 3
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Response_pnlContent_ddslMLB_MQB_OnCreated.def | 18 ++++++
8 files changed, 92 insertions(+), 68 deletions(-)
diff --git "a/_Main/BL/Type_ProductInStockingPointInPeriod\043228/Attribute_Notes.qbl" "b/_Main/BL/Type_ProductInStockingPointInPeriod\043228/Attribute_Notes.qbl"
index 6a7a00d..a213f0f 100644
--- "a/_Main/BL/Type_ProductInStockingPointInPeriod\043228/Attribute_Notes.qbl"
+++ "b/_Main/BL/Type_ProductInStockingPointInPeriod\043228/Attribute_Notes.qbl"
@@ -2,6 +2,7 @@
#parent: #root
Attribute Notes
{
- #keys: '3[415754.0.163308688][415754.0.163308687][415754.0.163308689]'
+ #keys: '3[415754.0.230714680][415754.0.230714679][415754.0.230714681]'
+ Description: '澶囨敞'
ValueType: String
}
diff --git "a/_Main/BL/Type_ProductInStockingPointInPeriod\043228/Function_CalcNotes.qbl" "b/_Main/BL/Type_ProductInStockingPointInPeriod\043228/Function_CalcNotes.qbl"
deleted file mode 100644
index dce9e84..0000000
--- "a/_Main/BL/Type_ProductInStockingPointInPeriod\043228/Function_CalcNotes.qbl"
+++ /dev/null
@@ -1,13 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Function CalcNotes
-{
- TextBody:
- [*
- // vwedadmin Aug-27-2024 (created)
-
- value := guard( this.ProductInStockingPoint_MP().Product_MP().Notes(), "" );
-
- this.Notes( value );
- *]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def
index 69737c7..f2c3faa 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def
@@ -5,28 +5,6 @@
BaseType: 'WebPanel'
Children:
[
- Component efGeneration
- {
- #keys: '[413988.0.1457133350]'
- BaseType: 'WebEditField'
- Properties:
- [
- DataBinding: 'DataHolderDialogData.Data.Generation'
- Label: 'Generation'
- Taborder: 1
- ]
- }
- Component efMLB_MQB
- {
- #keys: '[413988.0.1457133352]'
- BaseType: 'WebEditField'
- Properties:
- [
- DataBinding: 'DataHolderDialogData.Data.MLB_MQB'
- Label: 'MLB/MQB'
- Taborder: 2
- ]
- }
Component npPackagingCapacity id:npPackagingCapacity_758
{
#keys: '[413988.0.1457544780]'
@@ -94,6 +72,28 @@
Taborder: 0
]
}
+ Component ddslGeneration
+ {
+ #keys: '[415754.0.233210686]'
+ BaseType: 'WebDropDownStringList'
+ Properties:
+ [
+ DataBinding: 'DataHolderDialogData.Data.Generation'
+ Label: 'Generation'
+ Taborder: 1
+ ]
+ }
+ Component ddslMLB_MQB
+ {
+ #keys: '[415754.0.233210698]'
+ BaseType: 'WebDropDownStringList'
+ Properties:
+ [
+ DataBinding: 'DataHolderDialogData.Data.MLB_MQB'
+ Label: 'MLB/MQB'
+ Taborder: 2
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Response_pnlContent_ddslGeneration_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Response_pnlContent_ddslGeneration_OnCreated.def
new file mode 100644
index 0000000..adf0e6c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Response_pnlContent_ddslGeneration_OnCreated.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: pnlContent/ddslGeneration
+Response OnCreated () id:Response_pnlContent_ddslGeneration_OnCreated
+{
+ #keys: '[415754.0.233250871]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnCreated'
+ QuillAction
+ {
+ Body:
+ [*
+ values := selectuniquevalues( MacroPlan, Product_MP, tempPMP, true, tempPMP.Generation() );
+
+ this.Strings( values.Concatenate( ";" ) );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Response_pnlContent_ddslMLB_MQB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Response_pnlContent_ddslMLB_MQB_OnCreated.def
new file mode 100644
index 0000000..4dee56d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Response_pnlContent_ddslMLB_MQB_OnCreated.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: pnlContent/ddslMLB_MQB
+Response OnCreated () id:Response_pnlContent_ddslMLB_MQB_OnCreated
+{
+ #keys: '[415754.0.233261089]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnCreated'
+ QuillAction
+ {
+ Body:
+ [*
+ values := selectuniquevalues( MacroPlan, Product_MP, tempPMP, true, tempPMP.MQBMLB() );
+
+ this.Strings( values.Concatenate( ";" ) );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Component_pnlContent.def
index b6ae3cb..83117c6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Component_pnlContent.def
@@ -5,17 +5,6 @@
BaseType: 'WebPanel'
Children:
[
- Component efProduct
- {
- #keys: '[413988.0.1457092665]'
- BaseType: 'WebEditField'
- Properties:
- [
- DataBinding: 'DataHolderDialogData.Data.Product'
- Label: '浜у搧'
- Taborder: 1
- ]
- }
Component npPackagePrice
{
#keys: '[413988.0.1457167071]'
@@ -116,6 +105,17 @@
Taborder: 0
]
}
+ Component ddslProduct
+ {
+ #keys: '[415754.0.234419580]'
+ BaseType: 'WebDropDownStringList'
+ Properties:
+ [
+ DataBinding: 'DataHolderDialogData.Data.Product'
+ Label: '浜у搧'
+ Taborder: 1
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Response_pnlContent_ddslProduct_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Response_pnlContent_ddslProduct_OnCreated.def
new file mode 100644
index 0000000..a05c28a
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Response_pnlContent_ddslProduct_OnCreated.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: pnlContent/ddslProduct
+Response OnCreated () id:Response_pnlContent_ddslProduct_OnCreated
+{
+ #keys: '[415754.0.233261627]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnCreated'
+ QuillAction
+ {
+ Body:
+ [*
+ values := selectuniquevalues( MacroPlan, Product_MP, tempPMP, tempPMP.ParentID() = "鏈哄姞浠�", tempPMP.ID() );
+
+ this.Strings( values.Concatenate( ";" ) );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Views/Labor_Costs.vw b/_Main/UI/MacroPlannerWebApp/Views/Labor_Costs.vw
index 4fc1f6f..a637501 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/Labor_Costs.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/Labor_Costs.vw
@@ -13,7 +13,7 @@
{
mode: 'open'
rowPosition: 1
- rowSpan: 25
+ rowSpan: 21
columnPosition: 1
columnSpan: 10
}
@@ -64,30 +64,12 @@
subtotals: ''
width: 150
}
- column_StartDate
- {
- columnId: 'StartDate'
- dataPath: 'StartDate'
- dataType: 'date'
- index: 3
- subtotals: ''
- width: 150
- }
- column_TimeUnit
- {
- columnId: 'TimeUnit'
- dataPath: 'TimeUnit'
- dataType: 'string'
- index: 4
- subtotals: ''
- width: 150
- }
column_BaseSalary
{
columnId: 'BaseSalary'
dataPath: 'BaseSalary'
dataType: 'real'
- index: 5
+ index: 3
subtotals: ''
width: 150
}
@@ -175,10 +157,10 @@
userconfigurableinformation
{
}
+ image: 'MONEY_BILL_FIRE'
page: ''
group: ''
index: 0
- image: 'MONEY_BILL_FIRE'
description: ''
}
formatversion: 2
--
Gitblit v1.9.3