From 6de538755c454717e3bbed02bc7f7734f604c643 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 28 十月 2024 11:36:42 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityZKMCC.qbl | 8 +
_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityZKGCC.qbl | 8 +
_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityPLCC.qbl | 8 +
_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def | 58 -----------
_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlCCFactory.def | 74 ++++++++++++++
_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityKWCC.qbl | 8 +
_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityAGWCC.qbl | 8 +
_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlDLFactory.def | 74 ++++++++++++++
8 files changed, 191 insertions(+), 55 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityAGWCC.qbl b/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityAGWCC.qbl
new file mode 100644
index 0000000..9ac23a6
--- /dev/null
+++ b/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityAGWCC.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute UpperLimitOfTransferCapacityAGWCC
+{
+ #keys: '3[413988.1.30434943][413988.1.30434942][413988.1.30434944]'
+ Description: '闀挎槬宸ュ巶'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityKWCC.qbl b/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityKWCC.qbl
new file mode 100644
index 0000000..32b71c6
--- /dev/null
+++ b/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityKWCC.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute UpperLimitOfTransferCapacityKWCC
+{
+ #keys: '3[413988.1.30444717][413988.1.30444716][413988.1.30444718]'
+ Description: '闀挎槬宸ュ巶'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityPLCC.qbl b/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityPLCC.qbl
new file mode 100644
index 0000000..dce1bb7
--- /dev/null
+++ b/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityPLCC.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute UpperLimitOfTransferCapacityPLCC
+{
+ #keys: '3[413988.1.30444724][413988.1.30444723][413988.1.30444725]'
+ Description: '闀挎槬宸ュ巶'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityZKGCC.qbl b/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityZKGCC.qbl
new file mode 100644
index 0000000..8c2fce9
--- /dev/null
+++ b/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityZKGCC.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute UpperLimitOfTransferCapacityZKGCC
+{
+ #keys: '3[413988.1.30444731][413988.1.30444730][413988.1.30444732]'
+ Description: '闀挎槬宸ュ巶'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityZKMCC.qbl b/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityZKMCC.qbl
new file mode 100644
index 0000000..b2009bb
--- /dev/null
+++ b/_Main/BL/Type_MacroPlan/Attribute_UpperLimitOfTransferCapacityZKMCC.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute UpperLimitOfTransferCapacityZKMCC
+{
+ #keys: '3[413988.1.30444738][413988.1.30444737][413988.1.30444739]'
+ Description: '闀挎槬宸ュ巶'
+ ValueType: Number
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlCCFactory.def b/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlCCFactory.def
new file mode 100644
index 0000000..026faf2
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlCCFactory.def
@@ -0,0 +1,74 @@
+Quintiq file version 2.0
+Component pnlCCFactory
+{
+ #keys: '[413988.1.30911852]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component npUpperLimitOfTransferCapacityZKGCC
+ {
+ #keys: '[413988.1.30912074]'
+ BaseType: 'WebNumberPicker'
+ Properties:
+ [
+ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityZKGCC'
+ Label: 'ZKG(pcs)'
+ Min: '0'
+ Taborder: 0
+ ]
+ }
+ Component npUpperLimitOfTransferCapacityZKMCC
+ {
+ #keys: '[413988.1.30912108]'
+ BaseType: 'WebNumberPicker'
+ Properties:
+ [
+ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityZKMCC'
+ Label: 'ZKM(pcs)'
+ Min: '0'
+ Taborder: 1
+ ]
+ }
+ Component npUpperLimitOfTransferCapacityPLCC
+ {
+ #keys: '[413988.1.30912136]'
+ BaseType: 'WebNumberPicker'
+ Properties:
+ [
+ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityPLCC'
+ Label: 'PL(pcs)'
+ Min: '0'
+ Taborder: 2
+ ]
+ }
+ Component npUpperLimitOfTransferCapacityKWCC
+ {
+ #keys: '[413988.1.30912164]'
+ BaseType: 'WebNumberPicker'
+ Properties:
+ [
+ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityKWCC'
+ Label: 'KW(pcs)'
+ Min: '0'
+ Taborder: 3
+ ]
+ }
+ Component npUpperLimitOfTransferCapacityAGWCC
+ {
+ #keys: '[413988.1.30912192]'
+ BaseType: 'WebNumberPicker'
+ Properties:
+ [
+ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityAGWCC'
+ Label: 'AGW(pcs)'
+ Min: '0'
+ Taborder: 4
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 1
+ Title: '闀挎槬宸ュ巶'
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def
index 258cfb2..4a9e2cb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def
@@ -5,64 +5,12 @@
BaseType: 'WebPanel'
Children:
[
- Component npUpperLimitOfTransferCapacityZKG
- {
- #keys: '[413988.0.1292313261]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityZKG'
- Label: 'ZKG(pcs)'
- Taborder: 0
- ]
- }
- Component npUpperLimitOfTransferCapacityZKM
- {
- #keys: '[413988.0.1292313339]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityZKM'
- Label: 'ZKM(pcs)'
- Taborder: 1
- ]
- }
- Component npUpperLimitOfTransferCapacityPL
- {
- #keys: '[413988.0.1292313341]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityPL'
- Label: 'PL(pcs)'
- Taborder: 2
- ]
- }
- Component npUpperLimitOfTransferCapacityKW
- {
- #keys: '[413988.0.1292313343]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityKW'
- Label: 'KW(pcs)'
- Taborder: 3
- ]
- }
- Component npUpperLimitOfTransferCapacityAGW
- {
- #keys: '[413988.0.1292313345]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityAGW'
- Label: 'AGW(pcs)'
- Taborder: 4
- ]
- }
+ #child: pnlDLFactory
+ #child: pnlCCFactory
]
Properties:
[
+ Orientation: 'tab'
Padding: 'true'
Taborder: 0
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlDLFactory.def b/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlDLFactory.def
new file mode 100644
index 0000000..4cae144
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlDLFactory.def
@@ -0,0 +1,74 @@
+Quintiq file version 2.0
+Component pnlDLFactory
+{
+ #keys: '[413988.1.30911840]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component npUpperLimitOfTransferCapacityZKG id:npUpperLimitOfTransferCapacityZKG_715
+ {
+ #keys: '[413988.1.30911967]'
+ BaseType: 'WebNumberPicker'
+ Properties:
+ [
+ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityZKG'
+ Label: 'ZKG(pcs)'
+ Min: '0'
+ Taborder: 0
+ ]
+ }
+ Component npUpperLimitOfTransferCapacityZKM id:npUpperLimitOfTransferCapacityZKM_844
+ {
+ #keys: '[413988.1.30911990]'
+ BaseType: 'WebNumberPicker'
+ Properties:
+ [
+ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityZKM'
+ Label: 'ZKM(pcs)'
+ Min: '0'
+ Taborder: 1
+ ]
+ }
+ Component npUpperLimitOfTransferCapacityPL id:npUpperLimitOfTransferCapacityPL_603
+ {
+ #keys: '[413988.1.30912013]'
+ BaseType: 'WebNumberPicker'
+ Properties:
+ [
+ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityPL'
+ Label: 'PL(pcs)'
+ Min: '0'
+ Taborder: 2
+ ]
+ }
+ Component npUpperLimitOfTransferCapacityKW id:npUpperLimitOfTransferCapacityKW_858
+ {
+ #keys: '[413988.1.30912036]'
+ BaseType: 'WebNumberPicker'
+ Properties:
+ [
+ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityKW'
+ Label: 'KW(pcs)'
+ Min: '0'
+ Taborder: 3
+ ]
+ }
+ Component npUpperLimitOfTransferCapacityAGW id:npUpperLimitOfTransferCapacityAGW_545
+ {
+ #keys: '[413988.1.30912059]'
+ BaseType: 'WebNumberPicker'
+ Properties:
+ [
+ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityAGW'
+ Label: 'AGW(pcs)'
+ Min: '0'
+ Taborder: 4
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ Title: '澶ц繛宸ュ巶'
+ ]
+}
--
Gitblit v1.9.3