From 8b28a76dac37e1d5d8447dbc83ec06a83d1585cf Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 24 九月 2024 17:37:59 +0800
Subject: [PATCH] 长春/大连发动机物流报表字段类型调整
---
_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentInCost.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_WerkToDLRentTransCost.qbl | 8
_Main/Sys/Repr/Global/CCEngineLogisticsCostCell.qrp | 32 +-
_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Component_MatrixEditorTable#358.def | 2
_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentOutOfCost.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Import.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl | 10
_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentEnterCost.qbl | 4
_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetRentStorageCost.qbl | 6
_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl | 12
_Main/BL/Type_CCEngineLogisticsCostRow0/Method_Initialize.qbl | 18
_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_AllCost.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl | 54 ++--
_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcEstimateTotalCost.qbl | 14 +
_Main/Sys/Repr/Global/DLEngineLogisticsCostCell.qrp | 52 ++--
_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentInCost.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl | 10
_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Initialize.qbl | 14
_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_WerkToRentTransCost.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentStorCost.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl | 22 +-
_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentQuantity.qbl | 2
_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentOutCost.qbl | 6
_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_AllCost.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostRow/Method_Initialize.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetRentOutCost.qbl | 6
_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentStorCost.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentStorCost.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_EstimateTotalCost.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcAllCost.qbl | 13 +
_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentOutOfCost.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCShorTransCost.qbl | 8
/dev/null | 13 -
_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def | 8
_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl | 18
_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentInCost.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_EstimateTotalCost.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcAllCost.qbl | 13 +
_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcEstimateTotalCost.qbl | 13 +
_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentOutOfCost.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Component_MatrixEditorTable.def | 2
_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentStorageCost.qbl | 6
_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentOutCost.qbl | 4
_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCLongTransCost.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetFactoryToRentTransCost.qbl | 6
_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentEnterCost#517.qbl | 6
_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetFactoryToRentTransCost.qbl | 6
_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Import.qbl | 18
48 files changed, 359 insertions(+), 183 deletions(-)
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_AllCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_AllCost.qbl
new file mode 100644
index 0000000..9fc237e
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_AllCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute AllCost
+{
+ #keys: '3[415136.0.1160240045][415136.0.1160240044][415136.0.1160240046]'
+ Description: '鎬昏垂鐢�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_EstimateTotalCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_EstimateTotalCost.qbl
new file mode 100644
index 0000000..e3bdbe1
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_EstimateTotalCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute EstimateTotalCost
+{
+ #keys: '3[415136.0.1160240037][415136.0.1160240036][415136.0.1160240038]'
+ Description: '棰勮鎬昏垂鐢�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_EstimatedTotalCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_EstimatedTotalCost.qbl
deleted file mode 100644
index 8a9c7d8..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_EstimatedTotalCost.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute EstimatedTotalCost
-{
- #keys: '3[415136.0.986844739][415136.0.986844738][415136.0.986844740]'
- Description: '棰勮鎬昏垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_FactoryToRentTransCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_FactoryToRentTransCost.qbl
deleted file mode 100644
index 8dbddf0..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_FactoryToRentTransCost.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute FactoryToRentTransCost
-{
- #keys: '3[415136.0.986844781][415136.0.986844780][415136.0.986844782]'
- Description: '鍘傚唴鍒板绉熷簱杩愯緭璐圭敤'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentEnterCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentEnterCost.qbl
deleted file mode 100644
index 0343f9f..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentEnterCost.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute RentEnterCost
-{
- #keys: '3[415136.0.986881423][415136.0.986881422][415136.0.986881424]'
- Description: '澶栫搴撳叆搴撹垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentInCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentInCost.qbl
new file mode 100644
index 0000000..7f9da85
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentInCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute RentInCost
+{
+ #keys: '3[415136.0.1160164663][415136.0.1160164662][415136.0.1160164664]'
+ Description: '澶栫搴撳叆搴撹垂鐢�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentOutCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentOutCost.qbl
deleted file mode 100644
index 005fa21..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentOutCost.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute RentOutCost
-{
- #keys: '3[415136.0.986881433][415136.0.986881432][415136.0.986881434]'
- Description: '澶栫搴撳嚭搴撹垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentOutOfCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentOutOfCost.qbl
new file mode 100644
index 0000000..a80c509
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentOutOfCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute RentOutOfCost
+{
+ #keys: '3[415136.0.1160164673][415136.0.1160164672][415136.0.1160164674]'
+ Description: '澶栫搴撳嚭搴撹垂鐢�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentStorCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentStorCost.qbl
new file mode 100644
index 0000000..c5bdd77
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentStorCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute RentStorCost
+{
+ #keys: '3[415136.0.1160164708][415136.0.1160164707][415136.0.1160164709]'
+ Description: '澶栫搴撲粨鍌ㄨ垂鐢�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentStorageCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentStorageCost.qbl
deleted file mode 100644
index c42d3f6..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_RentStorageCost.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute RentStorageCost
-{
- #keys: '3[415136.0.986881446][415136.0.986881445][415136.0.986881447]'
- Description: '澶栫搴撲粨鍌ㄨ垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_TotalCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_TotalCost.qbl
deleted file mode 100644
index e205166..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_TotalCost.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute TotalCost
-{
- #keys: '3[415136.0.986844771][415136.0.986844770][415136.0.986844772]'
- Description: '鎬昏垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_WerkToRentTransCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_WerkToRentTransCost.qbl
new file mode 100644
index 0000000..94a5518
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_WerkToRentTransCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute WerkToRentTransCost
+{
+ #keys: '3[415136.0.1160240025][415136.0.1160240024][415136.0.1160240026]'
+ Description: '鍘傚唴鍒板绉熷簱杩愯緭璐圭敤'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcAllCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcAllCost.qbl
new file mode 100644
index 0000000..105f146
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcAllCost.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcAllCost
+{
+ Description: '璁＄畻鎬昏垂鐢�'
+ TextBody:
+ [*
+ // 鐢勫叞楦� Aug-12-2024 (created)
+ value := this.EstimateTotalCost() * this.Coefficient();
+
+ this.AllCost( value );
+ *]
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcEstimateTotalCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcEstimateTotalCost.qbl
new file mode 100644
index 0000000..f4cd10b
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcEstimateTotalCost.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcEstimateTotalCost
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Sep-24-2024 (created)
+
+ value := this.RentInCost() + this.RentOutOfCost() + this.WerkToRentTransCost() + this.RentStorCost();
+
+ this.EstimateTotalCost( value );
+ *]
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcEstimatedTotalCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcEstimatedTotalCost.qbl
deleted file mode 100644
index 2251974..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcEstimatedTotalCost.qbl
+++ /dev/null
@@ -1,13 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Function CalcEstimatedTotalCost
-{
- TextBody:
- [*
- // 鐢勫叞楦� Aug-12-2024 (created)
-
- value := this.RentEnterCost() + this.RentOutCost() + this.FactoryToRentTransCost() + this.RentStorageCost();
-
- this.EstimatedTotalCost( value );
- *]
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcTotalCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcTotalCost.qbl
deleted file mode 100644
index e2e8080..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcTotalCost.qbl
+++ /dev/null
@@ -1,13 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Function CalcTotalCost
-{
- Description: '璁＄畻鎬昏垂鐢�'
- TextBody:
- [*
- // 鐢勫叞楦� Aug-12-2024 (created)
- value := this.EstimatedTotalCost() * this.Coefficient();
-
- this.TotalCost( value );
- *]
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_AllCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_AllCost.qbl
new file mode 100644
index 0000000..c337067
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_AllCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute AllCost
+{
+ #keys: '3[415136.0.1160164831][415136.0.1160164830][415136.0.1160164832]'
+ Description: '鎬昏垂鐢�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCLongTransCoat.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCLongTransCoat.qbl
deleted file mode 100644
index 1c4d5bf..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCLongTransCoat.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CCLongTransCoat
-{
- #keys: '3[415136.0.992900332][415136.0.992900331][415136.0.992900333]'
- Description: '闀挎槬闀块�旇繍杈撹垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCLongTransCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCLongTransCost.qbl
new file mode 100644
index 0000000..770aa77
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCLongTransCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CCLongTransCost
+{
+ #keys: '3[415136.0.1160164735][415136.0.1160164734][415136.0.1160164736]'
+ Description: '闀挎槬闀块�旇繍杈撹垂鐢�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentEnterCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentEnterCost.qbl
deleted file mode 100644
index 7ad15e3..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentEnterCost.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CCRentEnterCost
-{
- #keys: '3[415136.0.992900045][415136.0.992900044][415136.0.992900046]'
- Description: '闀挎槬澶栫搴撳叆搴撹垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentInCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentInCost.qbl
new file mode 100644
index 0000000..b82c00f
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentInCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CCRentInCost
+{
+ #keys: '3[415136.0.1160164743][415136.0.1160164742][415136.0.1160164744]'
+ Description: '闀挎槬澶栫搴撳叆搴撹垂鐢�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentOutCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentOutCost.qbl
deleted file mode 100644
index 66c4cc5..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentOutCost.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CCRentOutCost
-{
- #keys: '3[415136.0.992900048][415136.0.992900047][415136.0.992900049]'
- Description: '闀挎槬澶栫搴撳嚭搴撹垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentOutOfCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentOutOfCost.qbl
new file mode 100644
index 0000000..ce250fd
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentOutOfCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CCRentOutOfCost
+{
+ #keys: '3[415136.0.1160164751][415136.0.1160164750][415136.0.1160164752]'
+ Description: '闀挎槬澶栫搴撳嚭搴撹垂鐢�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentQuantity.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentQuantity.qbl
index ecf78ff..cfd2692 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentQuantity.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentQuantity.qbl
@@ -2,7 +2,7 @@
#parent: #root
Attribute CCRentQuantity
{
- #keys: '3[415136.0.993115853][415136.0.993115852][415136.0.993115854]'
+ #keys: '3[415136.0.1160164759][415136.0.1160164758][415136.0.1160164760]'
Description: '闀挎槬澶栫搴撴暟閲�'
ValueType: Number
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentStorCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentStorCost.qbl
new file mode 100644
index 0000000..29e9d05
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentStorCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CCRentStorCost
+{
+ #keys: '3[415136.0.1160164772][415136.0.1160164771][415136.0.1160164773]'
+ Description: '闀挎槬澶栫搴撲粨鍌ㄨ垂鐢�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentStorageCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentStorageCost.qbl
deleted file mode 100644
index ac4c891..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCRentStorageCost.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CCRentStorageCost
-{
- #keys: '3[415136.0.992900051][415136.0.992900050][415136.0.992900052]'
- Description: '闀挎槬澶栫搴撲粨鍌ㄨ垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCShorTransCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCShorTransCost.qbl
new file mode 100644
index 0000000..64370a6
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCShorTransCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CCShorTransCost
+{
+ #keys: '3[415136.0.1160164780][415136.0.1160164779][415136.0.1160164781]'
+ Description: '闀挎槬鐭�旇繍杈撹垂鐢�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCShortTransCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCShortTransCost.qbl
deleted file mode 100644
index 572f8e5..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CCShortTransCost.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CCShortTransCost
-{
- #keys: '3[415136.0.992900342][415136.0.992900341][415136.0.992900343]'
- Description: '闀挎槬鐭�旇繍杈撹垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentEnterCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentEnterCost.qbl
deleted file mode 100644
index 2ba6eb9..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentEnterCost.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DLRentEnterCost
-{
- #keys: '3[415136.0.992900242][415136.0.992900241][415136.0.992900243]'
- Description: '澶ц繛澶栫搴撳叆搴撹垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentInCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentInCost.qbl
new file mode 100644
index 0000000..40ed6eb
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentInCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute DLRentInCost
+{
+ #keys: '3[415136.0.1160164788][415136.0.1160164787][415136.0.1160164789]'
+ Description: '澶ц繛澶栫搴撳叆搴撹垂鐢�'
+ ValueType: Real
+}
diff --git "a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentOutCost\0430.qbl" "b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentOutCost\0430.qbl"
deleted file mode 100644
index f95e66f..0000000
--- "a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentOutCost\0430.qbl"
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DLRentOutCost
-{
- #keys: '3[415136.0.992900249][415136.0.992900248][415136.0.992900250]'
- Description: '澶ц繛澶栫搴撳嚭搴撹垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentOutOfCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentOutOfCost.qbl
new file mode 100644
index 0000000..1728adb
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentOutOfCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute DLRentOutOfCost
+{
+ #keys: '3[415136.0.1160164796][415136.0.1160164795][415136.0.1160164797]'
+ Description: '澶ц繛澶栫搴撳嚭搴撹垂鐢�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentStorCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentStorCost.qbl
new file mode 100644
index 0000000..8dba73a
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentStorCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute DLRentStorCost
+{
+ #keys: '3[415136.0.1160164807][415136.0.1160164806][415136.0.1160164808]'
+ Description: '澶ц繛澶栫搴撲粨鍌ㄨ垂鐢�'
+ ValueType: Real
+}
diff --git "a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentStorageCost\0430.qbl" "b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentStorageCost\0430.qbl"
deleted file mode 100644
index c70e451..0000000
--- "a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_DLRentStorageCost\0430.qbl"
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DLRentStorageCost
-{
- #keys: '3[415136.0.992900262][415136.0.992900261][415136.0.992900263]'
- Description: '澶ц繛澶栫搴撲粨鍌ㄨ垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_EstimateTotalCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_EstimateTotalCost.qbl
new file mode 100644
index 0000000..8460102
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_EstimateTotalCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute EstimateTotalCost
+{
+ #keys: '3[415136.0.1160164815][415136.0.1160164814][415136.0.1160164816]'
+ Description: '棰勮鎬昏垂鐢�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_EstimatedTotalCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_EstimatedTotalCost.qbl
deleted file mode 100644
index 9f5a460..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_EstimatedTotalCost.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute EstimatedTotalCost
-{
- #keys: '3[415136.0.992900039][415136.0.992900038][415136.0.992900040]'
- Description: '棰勮鎬昏垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_FactoryToDLRentTransCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_FactoryToDLRentTransCost.qbl
deleted file mode 100644
index d39550c..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_FactoryToDLRentTransCost.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute FactoryToDLRentTransCost
-{
- #keys: '3[415136.0.992900042][415136.0.992900041][415136.0.992900043]'
- Description: '鍘傚唴鍒板ぇ杩炲绉熷簱杩愯緭璐圭敤'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_TotalCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_TotalCost.qbl
deleted file mode 100644
index f2cf46b..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_TotalCost.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute TotalCost
-{
- #keys: '3[415136.0.992900054][415136.0.992900053][415136.0.992900055]'
- Description: '鎬昏垂鐢�'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_WerkToDLRentTransCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_WerkToDLRentTransCost.qbl
new file mode 100644
index 0000000..440aea0
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_WerkToDLRentTransCost.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute WerkToDLRentTransCost
+{
+ #keys: '3[415136.0.1160164823][415136.0.1160164822][415136.0.1160164824]'
+ Description: '鍘傚唴鍒板ぇ杩炲绉熷簱杩愯緭璐圭敤'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcAllCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcAllCost.qbl
new file mode 100644
index 0000000..105f146
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcAllCost.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcAllCost
+{
+ Description: '璁＄畻鎬昏垂鐢�'
+ TextBody:
+ [*
+ // 鐢勫叞楦� Aug-12-2024 (created)
+ value := this.EstimateTotalCost() * this.Coefficient();
+
+ this.AllCost( value );
+ *]
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcEstimateTotalCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcEstimateTotalCost.qbl
new file mode 100644
index 0000000..d9421bb
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcEstimateTotalCost.qbl
@@ -0,0 +1,14 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcEstimateTotalCost
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Aug-12-2024 (created)
+
+ value := this.CCRentInCost() + this.CCRentOutOfCost() + this.CCLongTransCost() + this.CCShorTransCost() + this.CCRentStorCost()
+ + this.DLRentInCost() + this.DLRentOutOfCost() + this.WerkToDLRentTransCost() + this.DLRentStorCost()
+
+ this.EstimateTotalCost( value );
+ *]
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcEstimatedTotalCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcEstimatedTotalCost.qbl
deleted file mode 100644
index c68e1b4..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcEstimatedTotalCost.qbl
+++ /dev/null
@@ -1,14 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Function CalcEstimatedTotalCost
-{
- TextBody:
- [*
- // 鐢勫叞楦� Aug-12-2024 (created)
-
- value := this.CCRentEnterCost() + this.CCRentOutCost() + this.CCLongTransCoat() + this.CCShortTransCost() + this.CCRentStorageCost()
- + this.DLRentEnterCost() + this.DLRentOutCost() + this.FactoryToDLRentTransCost() + this.DLRentStorageCost();
-
- this.EstimatedTotalCost( value );
- *]
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcTotalCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcTotalCost.qbl
deleted file mode 100644
index e2e8080..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcTotalCost.qbl
+++ /dev/null
@@ -1,13 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Function CalcTotalCost
-{
- Description: '璁＄畻鎬昏垂鐢�'
- TextBody:
- [*
- // 鐢勫叞楦� Aug-12-2024 (created)
- value := this.EstimatedTotalCost() * this.Coefficient();
-
- this.TotalCost( value );
- *]
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
index f8cbebb..4ac90f8 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
@@ -29,19 +29,19 @@
sumcell := selectobject( column, Cell, c, c.Row() = sumrow );
if( isnull( sumcell ) ){
- sumcell := sumrow.Cell( relnew, RentEnterCost := 0
- , RentOutCost := 0
- , FactoryToRentTransCost := 0
- , RentStorageCost := 0 );
+ sumcell := sumrow.Cell( relnew, RentInCost := 0
+ , RentOutOfCost := 0
+ , WerkToRentTransCost := 0
+ , RentStorCost := 0 );
column.Cell( relinsert, sumcell );
}
- showcell := showrow.Cell( relnew, RentEnterCost := cell.RentEnterCost(), RentOutCost := cell.RentOutCost(), FactoryToRentTransCost := cell.FactoryToRentTransCost(), RentStorageCost := cell.RentStorageCost() );
+ showcell := showrow.Cell( relnew, RentInCost := cell.RentInCost(), RentOutOfCost := cell.RentOutOfCost(), WerkToRentTransCost := cell.WerkToRentTransCost(), RentStorCost := cell.RentStorCost() );
column.Cell( relinsert, showcell );
- sumcell.RentEnterCost( cell.RentEnterCost() + sumcell.RentEnterCost() );
- sumcell.RentOutCost( cell.RentOutCost() + sumcell.RentOutCost() );
- sumcell.FactoryToRentTransCost( cell.FactoryToRentTransCost() + sumcell.FactoryToRentTransCost() );
- sumcell.RentStorageCost( cell.RentStorageCost() + sumcell.RentStorageCost() );
+ sumcell.RentInCost( cell.RentInCost() + sumcell.RentInCost() );
+ sumcell.RentOutOfCost( cell.RentOutOfCost() + sumcell.RentOutOfCost() );
+ sumcell.WerkToRentTransCost( cell.WerkToRentTransCost() + sumcell.WerkToRentTransCost() );
+ sumcell.RentStorCost( cell.RentStorCost() + sumcell.RentStorCost() );
}
}
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl
index dafddad..8d773b6 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl
@@ -107,23 +107,23 @@
}
//澶栫搴撳叆搴撹垂鐢�
rententercostcellElement := xmlDOM.CreateElement( "cell" );
- rententercostcellElement.SetAttribute( "value", [String]c.RentEnterCost() );
+ rententercostcellElement.SetAttribute( "value", [String]c.RentInCost() );
columnelement.AppendChild( rententercostcellElement );
//澶栫搴撳嚭搴撹垂鐢�
rentoutcostcellElement := xmlDOM.CreateElement( "cell" );
- rentoutcostcellElement.SetAttribute( "value", [String]c.RentOutCost() );
+ rentoutcostcellElement.SetAttribute( "value", [String]c.RentOutOfCost() );
columnelement.AppendChild( rentoutcostcellElement );
//鍘傚唴鍒板绉熷簱杩愯緭璐圭敤
factorytorenttranscostcellElement := xmlDOM.CreateElement( "cell" );
- factorytorenttranscostcellElement.SetAttribute( "value", [String]c.FactoryToRentTransCost() );
+ factorytorenttranscostcellElement.SetAttribute( "value", [String]c.WerkToRentTransCost() );
columnelement.AppendChild( factorytorenttranscostcellElement );
//澶栫搴撲粨鍌ㄨ垂鐢�
rentstoragecostcellElement := xmlDOM.CreateElement( "cell" );
- rentstoragecostcellElement.SetAttribute( "value", [String]c.RentStorageCost() );
+ rentstoragecostcellElement.SetAttribute( "value", [String]c.RentStorCost() );
columnelement.AppendChild( rentstoragecostcellElement );
//棰勮鎬昏垂鐢�
estimatedtotalcostcellElement := xmlDOM.CreateElement( "cell" );
- estimatedtotalcostcellElement.SetAttribute( "value", [String]c.EstimatedTotalCost() );
+ estimatedtotalcostcellElement.SetAttribute( "value", [String]c.EstimateTotalCost() );
columnelement.AppendChild( estimatedtotalcostcellElement );
//绯绘暟
coefficientcellElement := xmlDOM.CreateElement( "cell" );
@@ -131,7 +131,7 @@
columnelement.AppendChild( coefficientcellElement );
//鎬昏垂鐢�
totalcostcellElement := xmlDOM.CreateElement( "cell" );
- totalcostcellElement.SetAttribute( "value", [String]c.TotalCost() );
+ totalcostcellElement.SetAttribute( "value", [String]c.AllCost() );
columnelement.AppendChild( totalcostcellElement );
}
tableElement.AppendChild( columnelement );
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Import.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Import.qbl
index 5a38fd7..3310861 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Import.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Import.qbl
@@ -47,13 +47,13 @@
if( not ( attricell.Value() = '棰勮鎬昏垂鐢�' or attricell.Value() = '鎬昏垂鐢�' ) ){
valuecell := selectobject( samerow, GeneralExcelImportAndExportDataCell, valuecell, valuecell.GeneralExcelImportAndExportDataColumn() = excelcolumn );
if( attricell.Value() = '澶栫搴撳叆搴撹垂鐢�' ){
- cell.RentEnterCost( [Number]valuecell.Value() );
+ cell.RentInCost( [Number]valuecell.Value() );
}else if( attricell.Value() = '澶栫搴撳嚭搴撹垂鐢�' ){
- cell.RentOutCost( [Number]valuecell.Value() );
+ cell.RentOutOfCost( [Number]valuecell.Value() );
}else if( attricell.Value() = '鍘傚唴鍒板绉熷簱杩愯緭璐圭敤' ){
- cell.FactoryToRentTransCost( [Number]valuecell.Value() );
+ cell.WerkToRentTransCost( [Number]valuecell.Value() );
}else if( attricell.Value() = '澶栫搴撲粨鍌ㄨ垂鐢�' ){
- cell.RentStorageCost( [Number]valuecell.Value() );
+ cell.RentStorCost( [Number]valuecell.Value() );
}
// else if( attricell.Value() = '棰勮鎬昏垂鐢�' ){
// cell.EstimatedTotalCost( [Number]valuecell.Value() );
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl
index 5b8daa6..1fadf1f 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl
@@ -47,8 +47,8 @@
//鍏ュ簱閲�/鍖呰瀹归噺*鍏ュ簱鍗曚环锛屽叆搴撻噺绛変簬闀挎槬浜ч噺
quantity := ceil( [Number]cell.Value() / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
column := selectobject( table, Column, column, column.Name() = cell.FinancialProductionColumn().Name() );
- //澶栫搴撳叆搴撹垂鐢�
- // ccrow.SetRentEnterCost( column, quantity );灞炴�х被鍨嬩慨鏀�
+ //澶栫搴撳叆搴撹垂鐢�
+ ccrow.SetRentEnterCost( column, quantity );
}
}
}
@@ -78,7 +78,7 @@
quantity := ceil( [Number]cell.Value() / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
column := selectobject( table, Column, column, column.Name() = cell.FinancialSalesColumn().Name() );
//澶栫搴撳嚭搴撹垂鐢�
- // ccrow.SetRentOutCost( column, quantity );灞炴�х被鍨嬩慨鏀�
+ ccrow.SetRentOutCost( column, quantity );
}
}
}
@@ -121,7 +121,7 @@
//杩愯緭鏁伴噺/鍖呰瀹归噺/瑁呰浇瀹归噺*杩愯緭鍗曚环
quantity := ceil( ceil( [Number]pit.Quantity() / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
- // row.SetFactoryToRentTransCost( column, quantity );灞炴�х被鍨嬩慨鏀�
+ row.SetFactoryToRentTransCost( column, quantity );
}
}
}
@@ -157,7 +157,7 @@
column := selectobject( table, Column, column, column.Name() = periodname and column.StartDate() = periodtime );
- // row.SetRentStorageCost( column, quantity );灞炴�х被鍨嬩慨鏀�
+ row.SetRentStorageCost( column, quantity );
}
}
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl
index 52764b4..ae69bdb 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl
@@ -29,37 +29,37 @@
sumcell := selectobject( column, Cell, c, c.Row() = sumrow );
if( isnull( sumcell ) ){
- sumcell := sumrow.Cell( relnew, CCRentEnterCost := 0
- , CCRentOutCost := 0
- , CCLongTransCoat := 0
- , CCShortTransCost := 0
- , CCRentStorageCost := 0
- , DLRentEnterCost := 0
- , DLRentOutCost := 0
- , FactoryToDLRentTransCost := 0
- , DLRentStorageCost := 0 );
+ sumcell := sumrow.Cell( relnew, CCRentInCost := 0
+ , CCRentOutOfCost := 0
+ , CCLongTransCost := 0
+ , CCShorTransCost := 0
+ , CCRentStorCost := 0
+ , DLRentInCost := 0
+ , DLRentOutOfCost := 0
+ , WerkToDLRentTransCost := 0
+ , DLRentStorCost := 0 );
column.Cell( relinsert, sumcell );
}
- showcell := showrow.Cell( relnew, CCRentEnterCost := cell.CCRentEnterCost()
- , CCRentOutCost := cell.CCRentOutCost()
- , CCLongTransCoat := cell.CCLongTransCoat()
- , CCShortTransCost := cell.CCShortTransCost()
- , CCRentStorageCost := cell.CCRentStorageCost()
- , DLRentEnterCost := cell.DLRentEnterCost()
- , DLRentOutCost := cell.DLRentOutCost()
- , FactoryToDLRentTransCost := cell.FactoryToDLRentTransCost()
- , DLRentStorageCost := cell.DLRentStorageCost() );
+ showcell := showrow.Cell( relnew, CCRentInCost := cell.CCRentInCost()
+ , CCRentOutOfCost := cell.CCRentOutOfCost()
+ , CCLongTransCost := cell.CCLongTransCost()
+ , CCShorTransCost := cell.CCShorTransCost()
+ , CCRentStorCost := cell.CCRentStorCost()
+ , DLRentInCost := cell.DLRentInCost()
+ , DLRentOutOfCost := cell.DLRentOutOfCost()
+ , WerkToDLRentTransCost := cell.WerkToDLRentTransCost()
+ , DLRentStorCost := cell.DLRentStorCost() );
column.Cell( relinsert, showcell );
- sumcell.CCRentEnterCost( cell.CCRentEnterCost() + sumcell.CCRentEnterCost() );
- sumcell.CCRentOutCost( cell.CCRentOutCost() + sumcell.CCRentOutCost() );
- sumcell.CCLongTransCoat( cell.CCLongTransCoat() + sumcell.CCLongTransCoat() );
- sumcell.CCShortTransCost( cell.CCShortTransCost() + sumcell.CCShortTransCost() );
- sumcell.CCRentStorageCost( cell.CCRentStorageCost() + sumcell.CCRentStorageCost() );
- sumcell.DLRentEnterCost( cell.DLRentEnterCost() + sumcell.DLRentEnterCost() );
- sumcell.DLRentOutCost( cell.DLRentOutCost() + sumcell.DLRentOutCost() );
- sumcell.FactoryToDLRentTransCost( cell.FactoryToDLRentTransCost() + sumcell.FactoryToDLRentTransCost() );
- sumcell.DLRentStorageCost( cell.DLRentStorageCost() + sumcell.DLRentStorageCost() );
+ sumcell.CCRentOutOfCost( cell.CCRentOutOfCost() + sumcell.CCRentOutOfCost() );
+ sumcell.CCRentOutOfCost( cell.CCRentOutOfCost() + sumcell.CCRentOutOfCost() );
+ sumcell.CCLongTransCost( cell.CCLongTransCost() + sumcell.CCLongTransCost() );
+ sumcell.CCShorTransCost( cell.CCShorTransCost() + sumcell.CCShorTransCost() );
+ sumcell.CCRentStorCost( cell.CCRentStorCost() + sumcell.CCRentStorCost() );
+ sumcell.DLRentInCost( cell.DLRentInCost() + sumcell.DLRentInCost() );
+ sumcell.DLRentOutOfCost( cell.DLRentOutOfCost() + sumcell.DLRentOutOfCost() );
+ sumcell.WerkToDLRentTransCost( cell.WerkToDLRentTransCost() + sumcell.WerkToDLRentTransCost() );
+ sumcell.DLRentStorCost( cell.DLRentStorCost() + sumcell.DLRentStorCost() );
}
}
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl
index 82e75c8..977a5d1 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl
@@ -147,43 +147,43 @@
}
//闀挎槬澶栫搴撳叆搴撹垂鐢�
ccrententercostcellElement := xmlDOM.CreateElement( "cell" );
- ccrententercostcellElement.SetAttribute( "value", [String]c.CCRentEnterCost() );
+ ccrententercostcellElement.SetAttribute( "value", [String]c.CCRentInCost() );
columnelement.AppendChild( ccrententercostcellElement );
//闀挎槬澶栫搴撳嚭搴撹垂鐢�
ccrentoutcostcellElement := xmlDOM.CreateElement( "cell" );
- ccrentoutcostcellElement.SetAttribute( "value", [String]c.CCRentOutCost() );
+ ccrentoutcostcellElement.SetAttribute( "value", [String]c.CCRentOutOfCost() );
columnelement.AppendChild( ccrentoutcostcellElement );
//闀挎槬闀块�旇繍杈撹垂鐢�
cclongtranscostcellElement := xmlDOM.CreateElement( "cell" );
- cclongtranscostcellElement.SetAttribute( "value", [String]c.CCLongTransCoat() );
+ cclongtranscostcellElement.SetAttribute( "value", [String]c.CCLongTransCost() );
columnelement.AppendChild( cclongtranscostcellElement );
//闀挎槬鐭�旇繍杈撹垂鐢�
ccshorttranscostcellElement := xmlDOM.CreateElement( "cell" );
- ccshorttranscostcellElement.SetAttribute( "value", [String]c.CCShortTransCost() );
+ ccshorttranscostcellElement.SetAttribute( "value", [String]c.CCShorTransCost() );
columnelement.AppendChild( ccshorttranscostcellElement );
//闀挎槬澶栫搴撲粨鍌ㄨ垂鐢�
ccrentstoragecostcellElement := xmlDOM.CreateElement( "cell" );
- ccrentstoragecostcellElement.SetAttribute( "value", [String]c.CCRentStorageCost() );
+ ccrentstoragecostcellElement.SetAttribute( "value", [String]c.CCRentStorCost() );
columnelement.AppendChild( ccrentstoragecostcellElement );
//澶ц繛澶栫搴撳叆搴撹垂鐢�
dlrententercostcellElement := xmlDOM.CreateElement( "cell" );
- dlrententercostcellElement.SetAttribute( "value", [String]c.DLRentEnterCost() );
+ dlrententercostcellElement.SetAttribute( "value", [String]c.DLRentInCost() );
columnelement.AppendChild( dlrententercostcellElement );
//澶ц繛澶栫搴撳嚭搴撹垂鐢�
dlrentoutcostcellElement := xmlDOM.CreateElement( "cell" );
- dlrentoutcostcellElement.SetAttribute( "value", [String]c.DLRentOutCost() );
+ dlrentoutcostcellElement.SetAttribute( "value", [String]c.DLRentOutOfCost() );
columnelement.AppendChild( dlrentoutcostcellElement );
//鍘傚唴鍒板绉熷簱杩愯緭璐圭敤
factorytorenttranscostcellElement := xmlDOM.CreateElement( "cell" );
- factorytorenttranscostcellElement.SetAttribute( "value", [String]c.FactoryToDLRentTransCost() );
+ factorytorenttranscostcellElement.SetAttribute( "value", [String]c.WerkToDLRentTransCost() );
columnelement.AppendChild( factorytorenttranscostcellElement );
//澶ц繛澶栫搴撲粨鍌ㄨ垂鐢�
dlrentstoragecostcellElement := xmlDOM.CreateElement( "cell" );
- dlrentstoragecostcellElement.SetAttribute( "value", [String]c.DLRentStorageCost() );
+ dlrentstoragecostcellElement.SetAttribute( "value", [String]c.DLRentStorCost() );
columnelement.AppendChild( dlrentstoragecostcellElement );
//棰勮鎬昏垂鐢�
estimatedtotalcostcellElement := xmlDOM.CreateElement( "cell" );
- estimatedtotalcostcellElement.SetAttribute( "value", [String]c.EstimatedTotalCost() );
+ estimatedtotalcostcellElement.SetAttribute( "value", [String]c.EstimateTotalCost() );
columnelement.AppendChild( estimatedtotalcostcellElement );
//绯绘暟
coefficientcellElement := xmlDOM.CreateElement( "cell" );
@@ -191,7 +191,7 @@
columnelement.AppendChild( coefficientcellElement );
//鎬昏垂鐢�
totalcostcellElement := xmlDOM.CreateElement( "cell" );
- totalcostcellElement.SetAttribute( "value", [String]c.TotalCost() );
+ totalcostcellElement.SetAttribute( "value", [String]c.AllCost() );
columnelement.AppendChild( totalcostcellElement );
}
tableElement.AppendChild( columnelement );
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Import.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Import.qbl
index 2fc33a4..78e94e9 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Import.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Import.qbl
@@ -47,23 +47,23 @@
if( not ( attricell.Value() = '棰勮鎬昏垂鐢�' or attricell.Value() = '鎬昏垂鐢�' ) ){
valuecell := selectobject( samerow, GeneralExcelImportAndExportDataCell, valuecell, valuecell.GeneralExcelImportAndExportDataColumn() = excelcolumn );
if( attricell.Value() = '闀挎槬澶栫搴撳叆搴撹垂鐢�' ){
- cell.CCRentEnterCost( [Number]valuecell.Value() );
+ cell.CCRentInCost( [Number]valuecell.Value() );
}else if( attricell.Value() = '闀挎槬澶栫搴撳嚭搴撹垂鐢�' ){
- cell.CCRentOutCost( [Number]valuecell.Value() );
+ cell.CCRentOutOfCost( [Number]valuecell.Value() );
}else if( attricell.Value() = '闀挎槬闀块�旇繍杈撹垂鐢�' ){
- cell.CCLongTransCoat( [Number]valuecell.Value() );
+ cell.CCLongTransCost( [Number]valuecell.Value() );
}else if( attricell.Value() = '闀挎槬鐭�旇繍杈撹垂鐢�' ){
- cell.CCShortTransCost( [Number]valuecell.Value() );
+ cell.CCShorTransCost( [Number]valuecell.Value() );
}else if( attricell.Value() = '闀挎槬澶栫搴撲粨鍌ㄨ垂鐢�' ){
- cell.CCRentStorageCost( [Number]valuecell.Value() );
+ cell.CCRentStorCost( [Number]valuecell.Value() );
}else if( attricell.Value() = '澶ц繛澶栫搴撳叆搴撹垂鐢�' ){
- cell.DLRentEnterCost( [Number]valuecell.Value() );
+ cell.DLRentInCost( [Number]valuecell.Value() );
}else if( attricell.Value() = '澶ц繛澶栫搴撳嚭搴撹垂鐢�' ){
- cell.DLRentOutCost( [Number]valuecell.Value() );
+ cell.DLRentOutOfCost( [Number]valuecell.Value() );
}else if( attricell.Value() = '鍘傚唴鍒板绉熷簱杩愯緭璐圭敤' ){
- cell.FactoryToDLRentTransCost( [Number]valuecell.Value() );
+ cell.WerkToDLRentTransCost( [Number]valuecell.Value() );
}else if( attricell.Value() = '澶ц繛澶栫搴撲粨鍌ㄨ垂鐢�' ){
- cell.DLRentStorageCost( [Number]valuecell.Value() );
+ cell.DLRentStorCost( [Number]valuecell.Value() );
}
// else if( attricell.Value() = '棰勮鎬昏垂鐢�' ){
// cell.EstimatedTotalCost( [Number]valuecell.Value() );
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Initialize.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Initialize.qbl
index a9c3735..bb63502 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Initialize.qbl
@@ -67,8 +67,8 @@
entercost := ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
//闀挎槬澶栫搴撳嚭搴撹垂鐢�: 鍑哄簱閲�/鍖呰瀹归噺*鍑哄簱鍗曚环
outcost := ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
- // cell.CCRentEnterCost( cell.CCRentEnterCost() + entercost ); // 灞炴�х被鍨嬩慨鏀�
- // cell.CCRentOutCost( cell.CCRentOutCost() + outcost ); // 灞炴�х被鍨嬩慨鏀�
+ cell.CCRentInCost( cell.CCRentInCost() + entercost );
+ cell.CCRentOutOfCost( cell.CCRentOutOfCost() + outcost );
}
}
if( isdlrent ){//鐩殑鍦版槸澶ц繛澶栫搴�
@@ -85,7 +85,7 @@
cell := selectobject( row, Cell, cell, cell.Column() = column );
//杩愯緭鏁伴噺/鍖呰瀹归噺/瑁呰浇瀹归噺*杩愯緭鍗曚环
cost := ceil( ceil( quantity / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
- // cell.FactoryToDLRentTransCost( cell.FactoryToDLRentTransCost() + cost );灞炴�х被鍨嬩慨鏀�
+ cell.WerkToDLRentTransCost( cell.WerkToDLRentTransCost() + cost );
}
}
}
@@ -183,7 +183,7 @@
cost := ceil( ceil( [Number]tpcell.Value() / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();
cell := selectobject( row, Cell, cell, cell.Column() = column );
- // cell.CCLongTransCoat( cell.CCLongTransCoat() + cost ); 灞炴�х被鍨嬩慨鏀�
+ cell.CCLongTransCost( cell.CCLongTransCost() + cost );
}
}
}
@@ -217,7 +217,7 @@
// info( '-------------------------', column.Name() );
cost := ceil( [Number]psdip.Quantity() / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
cell := selectobject( row, Cell, cell, cell.Column() = column );
- // cell.CCShortTransCost( cell.CCShortTransCost() + cost ); 灞炴�х被鍨嬩慨鏀�
+ cell.CCShorTransCost( cell.CCShorTransCost() + cost );
}
}
}
@@ -255,7 +255,7 @@
and engine.Factory() = ccunit );
if( not isnull( enginecost ) ){
cost := ceil( [Number]pispip.NewSupplyQuantity() / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
- // cell.CCRentStorageCost( cell.CCRentStorageCost() + cost ); 灞炴�х被鍨嬩慨鏀�
+ cell.CCRentStorCost( cell.CCRentStorCost() + cost );
}
} else {
//鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
@@ -263,7 +263,7 @@
and engine.Factory() = dlunit );
if( not isnull( enginecost ) ){
cost := ceil( [Number]pispip.NewSupplyQuantity() / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
- // cell.DLRentStorageCost( cell.DLRentStorageCost() + cost );; 灞炴�х被鍨嬩慨鏀�
+ cell.DLRentStorCost( cell.DLRentStorCost() + cost );
}
}
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl
index 03b9942..c37810c 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl
@@ -64,7 +64,7 @@
cell := selectobject( row, Cell, cell, cell.Column() = column );
//杩愯緭鏁伴噺/鍖呰瀹归噺/瑁呰浇瀹归噺*杩愯緭鍗曚环
cost := ceil( ceil( quantity / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
- // cell.FactoryToDLRentTransCost( cell.FactoryToDLRentTransCost() + cost );灞炴�х被鍨嬩慨鏀�
+ cell.WerkToDLRentTransCost( cell.WerkToDLRentTransCost() + cost );
}
// if( isccrent ){//鐩殑鍦版槸闀挎槬澶栫搴�
// //鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
@@ -178,7 +178,7 @@
cost := ceil( ceil( [Number]tpcell.Value() / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();
cell := selectobject( row, Cell, cell, cell.Column() = column );
- // cell.CCLongTransCoat( cell.CCLongTransCoat() + cost );灞炴�х被鍨嬩慨鏀�
+ cell.CCLongTransCost( cell.CCLongTransCost() + cost );
}
}
}
@@ -212,7 +212,7 @@
// info( '-------------------------', column.Name() );
cost := ceil( [Number]psdip.Quantity() / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
cell := selectobject( row, Cell, cell, cell.Column() = column );
- // cell.CCShortTransCost( cell.CCShortTransCost() + cost );灞炴�х被鍨嬩慨鏀�
+ cell.CCShorTransCost( cell.CCShorTransCost() + cost );
}
}
}
@@ -250,7 +250,7 @@
and engine.Factory() = ccunit );
if( not isnull( enginecost ) ){
cost := ceil( [Number]pispip.NewSupplyQuantity() / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
- // cell.CCRentStorageCost( cell.CCRentStorageCost() + cost );灞炴�х被鍨嬩慨鏀�
+ cell.CCRentStorCost( cell.CCRentStorCost() + cost );
}
} else {
//鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
@@ -258,7 +258,7 @@
and engine.Factory() = dlunit );
if( not isnull( enginecost ) ){
cost := ceil( [Number]pispip.NewSupplyQuantity() / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
- // cell.DLRentStorageCost( cell.DLRentStorageCost() + cost );灞炴�х被鍨嬩慨鏀�
+ cell.DLRentStorCost( cell.DLRentStorCost() + cost );
}
}
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostRow/Method_Initialize.qbl b/_Main/BL/Type_CCEngineLogisticsCostRow/Method_Initialize.qbl
index 3dfa50b..4808e29 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostRow/Method_Initialize.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostRow/Method_Initialize.qbl
@@ -7,10 +7,10 @@
TextBody:
[*
// 鐢勫叞楦� Jun-24-2024 (created)
- cell := this.Cell( relnew, RentEnterCost := 0
- , RentOutCost := 0
- , FactoryToRentTransCost := 0
- , RentStorageCost := 0 );
+ cell := this.Cell( relnew, RentInCost := 0
+ , RentOutOfCost := 0
+ , WerkToRentTransCost := 0
+ , RentStorCost := 0 );
column.Cell( relinsert, cell );
*]
diff --git a/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetFactoryToRentTransCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetFactoryToRentTransCost.qbl
index 5f18e61..c09688d 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetFactoryToRentTransCost.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetFactoryToRentTransCost.qbl
@@ -2,7 +2,7 @@
#parent: #root
Method SetFactoryToRentTransCost (
CCEngineLogisticsCostColumn column,
- Number quantity
+ Real quantity
)
{
TextBody:
@@ -10,7 +10,7 @@
// 鐢勫叞楦� Jun-24-2024 (created)
cell := selectobject( this, Cell, cell, cell.Column() = column );
- value := cell.FactoryToRentTransCost() + quantity;
- cell.FactoryToRentTransCost( value );
+ value := cell.WerkToRentTransCost() + quantity;
+ cell.WerkToRentTransCost( value );
*]
}
diff --git "a/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentEnterCost\043517.qbl" "b/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentEnterCost\043517.qbl"
index 9e1a6db..0a7e890 100644
--- "a/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentEnterCost\043517.qbl"
+++ "b/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentEnterCost\043517.qbl"
@@ -2,7 +2,7 @@
#parent: #root
Method SetRentEnterCost (
CCEngineLogisticsCostColumn column,
- Number quantity
+ Real quantity
)
{
TextBody:
@@ -10,7 +10,7 @@
// 鐢勫叞楦� Jun-24-2024 (created)
cell := selectobject( this, Cell, cell, cell.Column() = column );
- value := cell.RentEnterCost() + quantity;
- cell.RentEnterCost( value );
+ value := cell.RentInCost() + quantity;
+ cell.RentInCost( value );
*]
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentOutCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentOutCost.qbl
index 4bc1338..b17c3fb 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentOutCost.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentOutCost.qbl
@@ -2,7 +2,7 @@
#parent: #root
Method SetRentOutCost (
CCEngineLogisticsCostColumn column,
- Number quantity
+ Real quantity
)
{
TextBody:
@@ -10,7 +10,7 @@
// 鐢勫叞楦� Jun-24-2024 (created)
cell := selectobject( this, Cell, cell, cell.Column() = column );
- value := cell.RentOutCost() + quantity;
- cell.RentOutCost( value );
+ value := cell.RentOutOfCost() + quantity;
+ cell.RentOutOfCost( value );
*]
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentStorageCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentStorageCost.qbl
index ed29d5b..0edcee1 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentStorageCost.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostRow/Method_SetRentStorageCost.qbl
@@ -2,7 +2,7 @@
#parent: #root
Method SetRentStorageCost (
CCEngineLogisticsCostColumn column,
- Number quantity
+ Real quantity
)
{
TextBody:
@@ -10,7 +10,7 @@
// 鐢勫叞楦� Jun-24-2024 (created)
cell := selectobject( this, Cell, cell, cell.Column() = column );
- value := cell.RentStorageCost() + quantity;
- cell.RentStorageCost( value );
+ value := cell.RentStorCost() + quantity;
+ cell.RentStorCost( value );
*]
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_Initialize.qbl b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_Initialize.qbl
index ce80682..4ffa94e 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_Initialize.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_Initialize.qbl
@@ -7,15 +7,15 @@
TextBody:
[*
// 鐢勫叞楦� Jun-24-2024 (created)
- cell := this.Cell( relnew, CCRentEnterCost := 0
- , CCRentOutCost := 0
- , CCLongTransCoat := 0
- , CCShortTransCost := 0
- , CCRentStorageCost := 0
- , DLRentEnterCost := 0
- , DLRentOutCost := 0
- , FactoryToDLRentTransCost := 0
- , DLRentStorageCost := 0 );
+ cell := this.Cell( relnew, CCRentInCost := 0
+ , CCRentOutOfCost := 0
+ , CCLongTransCost := 0
+ , CCShorTransCost := 0
+ , CCRentStorCost := 0
+ , DLRentInCost := 0
+ , DLRentOutOfCost := 0
+ , WerkToDLRentTransCost := 0
+ , DLRentStorCost := 0 );
column.Cell( relinsert, cell );
*]
diff --git a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentEnterCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentEnterCost.qbl
index 7c8235c..691a01c 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentEnterCost.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentEnterCost.qbl
@@ -14,7 +14,7 @@
//鍏ュ簱閲�/鍖呰瀹归噺*鍏ュ簱鍗曚环锛屽叆搴撻噺绛変簬闀挎槬浜ч噺
cost := ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
- value := cell.DLRentEnterCost() + cost;
- cell.DLRentEnterCost( 0 ); // 灞炴�х被鍨嬩慨鏀�
+ value := cell.DLRentInCost() + cost;
+ cell.DLRentInCost( value );
*]
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentOutCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentOutCost.qbl
index 2ab17f3..50f77e6 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentOutCost.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentOutCost.qbl
@@ -14,7 +14,7 @@
//鍏ュ簱閲�/鍖呰瀹归噺*鍏ュ簱鍗曚环锛屽叆搴撻噺绛変簬闀挎槬浜ч噺
cost := ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
- value := cell.DLRentOutCost() + cost;
- cell.DLRentOutCost( 0 ); // 灞炴�х被鍨嬩慨鏀�
+ value := cell.DLRentOutOfCost() + cost;
+ cell.DLRentOutOfCost( value );
*]
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetFactoryToRentTransCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetFactoryToRentTransCost.qbl
index 784e4a2..c6a968b 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetFactoryToRentTransCost.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetFactoryToRentTransCost.qbl
@@ -2,7 +2,7 @@
#parent: #root
Method SetFactoryToRentTransCost (
DLEngineLogisticsCostColumn column,
- Number quantity
+ Real quantity
)
{
TextBody:
@@ -10,7 +10,7 @@
// 鐢勫叞楦� Jun-24-2024 (created)
cell := selectobject( this, Cell, cell, cell.Column() = column );
- value := cell.FactoryToDLRentTransCost() + quantity;
- cell.FactoryToDLRentTransCost( value );
+ value := cell.WerkToDLRentTransCost() + quantity;
+ cell.WerkToDLRentTransCost( value );
*]
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetRentOutCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetRentOutCost.qbl
index 4189c40..414bf22 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetRentOutCost.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetRentOutCost.qbl
@@ -2,7 +2,7 @@
#parent: #root
Method SetRentOutCost (
DLEngineLogisticsCostColumn column,
- Number quantity
+ Real quantity
)
{
TextBody:
@@ -10,7 +10,7 @@
// 鐢勫叞楦� Jun-24-2024 (created)
cell := selectobject( this, Cell, cell, cell.Column() = column );
- value := cell.CCRentOutCost() + quantity;
- cell.CCRentOutCost( value );
+ value := cell.CCRentOutOfCost() + quantity;
+ cell.CCRentOutOfCost( value );
*]
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetRentStorageCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetRentStorageCost.qbl
index 908dae6..11232ac 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetRentStorageCost.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetRentStorageCost.qbl
@@ -2,7 +2,7 @@
#parent: #root
Method SetRentStorageCost (
DLEngineLogisticsCostColumn column,
- Number quantity
+ Real quantity
)
{
TextBody:
@@ -10,7 +10,7 @@
// 鐢勫叞楦� Jun-24-2024 (created)
cell := selectobject( this, Cell, cell, cell.Column() = column );
- value := cell.CCRentStorageCost() + quantity;
- cell.CCRentStorageCost( value );
+ value := cell.CCRentStorCost() + quantity;
+ cell.CCRentStorCost( value );
*]
}
diff --git a/_Main/Sys/Repr/Global/CCEngineLogisticsCostCell.qrp b/_Main/Sys/Repr/Global/CCEngineLogisticsCostCell.qrp
index 55dd648..b9d0d71 100644
--- a/_Main/Sys/Repr/Global/CCEngineLogisticsCostCell.qrp
+++ b/_Main/Sys/Repr/Global/CCEngineLogisticsCostCell.qrp
@@ -2,40 +2,40 @@
#parent: #root
TypeRepresentation CCEngineLogisticsCostCell
{
+ AttributeRepresentation AllCost
+ {
+ AttributeKey: '[415136.0.1160240044]'
+ Synonym: '鎬昏垂鐢�'
+ }
AttributeRepresentation Coefficient
{
AttributeKey: '[415136.0.986844757]'
Synonym: '绯绘暟'
}
- AttributeRepresentation EstimatedTotalCost
+ AttributeRepresentation EstimateTotalCost
{
- AttributeKey: '[415136.0.986844738]'
+ AttributeKey: '[415136.0.1160240036]'
Synonym: '棰勮鎬昏垂鐢�'
}
- AttributeRepresentation FactoryToRentTransCost
+ AttributeRepresentation RentInCost
{
- AttributeKey: '[415136.0.986844780]'
- Synonym: '鍘傚唴鍒板绉熷簱杩愯緭璐圭敤'
- }
- AttributeRepresentation RentEnterCost
- {
- AttributeKey: '[415136.0.986881422]'
+ AttributeKey: '[415136.0.1160164662]'
Synonym: '澶栫搴撳叆搴撹垂鐢�'
}
- AttributeRepresentation RentOutCost
+ AttributeRepresentation RentOutOfCost
{
- AttributeKey: '[415136.0.986881432]'
+ AttributeKey: '[415136.0.1160164672]'
Synonym: '澶栫搴撳嚭搴撹垂鐢�'
}
- AttributeRepresentation RentStorageCost
+ AttributeRepresentation RentStorCost
{
- AttributeKey: '[415136.0.986881445]'
+ AttributeKey: '[415136.0.1160164707]'
Synonym: '澶栫搴撲粨鍌ㄨ垂鐢�'
}
- AttributeRepresentation TotalCost
+ AttributeRepresentation WerkToRentTransCost
{
- AttributeKey: '[415136.0.986844770]'
- Synonym: '鎬昏垂鐢�'
+ AttributeKey: '[415136.0.1160240024]'
+ Synonym: '鍘傚唴鍒板绉熷簱杩愯緭璐圭敤'
}
RelationRepresentation Column { RelationKey: '[415136.0.986881392]' Visibility: 'Normal' }
}
diff --git a/_Main/Sys/Repr/Global/DLEngineLogisticsCostCell.qrp b/_Main/Sys/Repr/Global/DLEngineLogisticsCostCell.qrp
index 6efbdbf..d2bf8d1 100644
--- a/_Main/Sys/Repr/Global/DLEngineLogisticsCostCell.qrp
+++ b/_Main/Sys/Repr/Global/DLEngineLogisticsCostCell.qrp
@@ -2,29 +2,34 @@
#parent: #root
TypeRepresentation DLEngineLogisticsCostCell
{
- AttributeRepresentation CCLongTransCoat
+ AttributeRepresentation AllCost
{
- AttributeKey: '[415136.0.992900331]'
+ AttributeKey: '[415136.0.1160164830]'
+ Synonym: '鎬昏垂鐢�'
+ }
+ AttributeRepresentation CCLongTransCost
+ {
+ AttributeKey: '[415136.0.1160164734]'
Synonym: '闀挎槬闀块�旇繍杈撹垂鐢�'
}
- AttributeRepresentation CCRentEnterCost
+ AttributeRepresentation CCRentInCost
{
- AttributeKey: '[415136.0.992900044]'
+ AttributeKey: '[415136.0.1160164742]'
Synonym: '闀挎槬澶栫搴撳叆搴撹垂鐢�'
}
- AttributeRepresentation CCRentOutCost
+ AttributeRepresentation CCRentOutOfCost
{
- AttributeKey: '[415136.0.992900047]'
+ AttributeKey: '[415136.0.1160164750]'
Synonym: '闀挎槬澶栫搴撳嚭搴撹垂鐢�'
}
- AttributeRepresentation CCRentStorageCost
+ AttributeRepresentation CCRentStorCost
{
- AttributeKey: '[415136.0.992900050]'
+ AttributeKey: '[415136.0.1160164771]'
Synonym: '闀挎槬澶栫搴撲粨鍌ㄨ垂鐢�'
}
- AttributeRepresentation CCShortTransCost
+ AttributeRepresentation CCShorTransCost
{
- AttributeKey: '[415136.0.992900341]'
+ AttributeKey: '[415136.0.1160164779]'
Synonym: '闀挎槬鐭�旇繍杈撹垂鐢�'
}
AttributeRepresentation Coefficient
@@ -32,35 +37,30 @@
AttributeKey: '[415136.0.992900035]'
Synonym: '绯绘暟'
}
- AttributeRepresentation DLRentEnterCost
+ AttributeRepresentation DLRentInCost
{
- AttributeKey: '[415136.0.992900241]'
+ AttributeKey: '[415136.0.1160164787]'
Synonym: '澶ц繛澶栫搴撳叆搴撹垂鐢�'
}
- AttributeRepresentation DLRentOutCost
+ AttributeRepresentation DLRentOutOfCost
{
- AttributeKey: '[415136.0.992900248]'
+ AttributeKey: '[415136.0.1160164795]'
Synonym: '澶ц繛澶栫搴撳嚭搴撹垂鐢�'
}
- AttributeRepresentation DLRentStorageCost
+ AttributeRepresentation DLRentStorCost
{
- AttributeKey: '[415136.0.992900261]'
+ AttributeKey: '[415136.0.1160164806]'
Synonym: '澶ц繛澶栫搴撲粨鍌ㄨ垂鐢�'
}
- AttributeRepresentation EstimatedTotalCost
+ AttributeRepresentation EstimateTotalCost
{
- AttributeKey: '[415136.0.992900038]'
+ AttributeKey: '[415136.0.1160164814]'
Synonym: '棰勮鎬昏垂鐢�'
}
- AttributeRepresentation FactoryToDLRentTransCost
+ AttributeRepresentation WerkToDLRentTransCost
{
- AttributeKey: '[415136.0.992900041]'
- Synonym: '鍘傚唴鍒板ぇ杩炲绉熷簱杩愯緭璐圭敤'
- }
- AttributeRepresentation TotalCost
- {
- AttributeKey: '[415136.0.992900053]'
- Synonym: '鎬昏垂鐢�'
+ AttributeKey: '[415136.0.1160164822]'
+ Synonym: '鍘傚唴鍒板绉熷簱杩愯緭璐圭敤'
}
RelationRepresentation Column { RelationKey: '[415136.0.992900194]' Visibility: 'Normal' }
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Component_MatrixEditorTable\043358.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Component_MatrixEditorTable\043358.def"
index 7474baa..2264baf 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Component_MatrixEditorTable\043358.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Component_MatrixEditorTable\043358.def"
@@ -26,7 +26,7 @@
]
Properties:
[
- Attributes: 'RentEnterCost;RentOutCost;FactoryToRentTransCost;RentStorageCost;EstimatedTotalCost;Coefficient;TotalCost'
+ Attributes: 'RentInCost;RentOutOfCost;WerkToRentTransCost;RentStorCost;EstimateTotalCost;Coefficient;AllCost'
Column: 'Column'
Row: 'Row'
Taborder: 0
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def b/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def
index ef0c204..39a10dd 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def
@@ -19,10 +19,10 @@
cell.Coefficient( value );
traverse( table, Row, trow, trow.Name() = row.Name() ){
traverse( trow, Cell, tcel, tcel.Column().Name() = column.Name() ){
- tcel.RentEnterCost( cell.RentEnterCost() );
- tcel.RentOutCost( cell.RentOutCost() );
- tcel.FactoryToRentTransCost( cell.FactoryToRentTransCost() );
- tcel.RentStorageCost( cell.RentStorageCost() );
+ tcel.RentInCost( cell.RentInCost() );
+ tcel.RentOutOfCost( cell.RentOutOfCost() );
+ tcel.WerkToRentTransCost( cell.WerkToRentTransCost() );
+ tcel.RentStorCost( cell.RentStorCost() );
tcel.Coefficient( cell.Coefficient() );
}
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Component_MatrixEditorTable.def
index eddbd91..8bfb505 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Component_MatrixEditorTable.def
@@ -26,7 +26,7 @@
]
Properties:
[
- Attributes: 'CCRentEnterCost;CCRentOutCost;CCLongTransCoat;CCShortTransCost;CCRentStorageCost;DLRentEnterCost;DLRentOutCost;FactoryToDLRentTransCost;DLRentStorageCost;EstimatedTotalCost;Coefficient;TotalCost'
+ Attributes: 'CCRentInCost;CCRentOutOfCost;CCLongTransCost;CCShorTransCost;CCRentStorCost;DLRentInCost;DLRentOutOfCost;WerkToDLRentTransCost;DLRentStorCost;EstimateTotalCost;Coefficient;AllCost'
Column: 'Column'
Row: 'Row'
Taborder: 0
--
Gitblit v1.9.3