From 1ddbedb7289804d678f537b9f24f648961acd7ec Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期日, 25 八月 2024 18:19:58 +0800
Subject: [PATCH] 车道优化

---
 _Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl                 |   11 ++++++++---
 _Main/BL/Type_AssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl           |    2 +-
 _Main/BL/Type_CC_EngineRackCell/Attribute_UnitPriceOfEmptyShelfStorage.qbl  |   12 ++++++++++++
 _Main/BL/Type_CC_EngineRackCell/Function_CalcRentalWarehouseStorageFees.qbl |   13 +++++++++++++
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/_Main/BL/Type_AssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl b/_Main/BL/Type_AssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl
index 733d439..457a74f 100644
--- a/_Main/BL/Type_AssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl
+++ b/_Main/BL/Type_AssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl
@@ -11,7 +11,7 @@
     macroPlan.AssemblyOnlinePlanColumn( relflush );
     
     // 鎵捐閰嶇嚎琛�
-    oprs := selectsortedset( opt, OfflinePlanRow, tempOPR, tempOPR.ProductionLine() = "Spider Assy Line 1", tempOPR.ProductionLine(), tempOPR.ProductID(), tempOPR.Type() );
+    oprs := selectsortedset( opt, OfflinePlanRow, tempOPR, tempOPR.ProductionLine() = "DL-MoMo" or tempOPR.ProductionLine() = "CC-MoMo", tempOPR.ProductionLine(), tempOPR.ProductID(), tempOPR.Type() );
     opcs := selectsortedset( opt, OfflinePlanColumn, tempOPC, true, tempOPC.ColumnDate() );
     
     // 鐢熸垚琛ㄦ牸
diff --git a/_Main/BL/Type_CC_EngineRackCell/Attribute_UnitPriceOfEmptyShelfStorage.qbl b/_Main/BL/Type_CC_EngineRackCell/Attribute_UnitPriceOfEmptyShelfStorage.qbl
new file mode 100644
index 0000000..74fcfc7
--- /dev/null
+++ b/_Main/BL/Type_CC_EngineRackCell/Attribute_UnitPriceOfEmptyShelfStorage.qbl
@@ -0,0 +1,12 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute UnitPriceOfEmptyShelfStorage
+{
+  #keys: '3[415754.0.135368204][415754.0.135368203][415754.0.135368205]'
+  Description:
+  [*
+    
+    绌烘枡鏋朵粨鍌ㄥ崟浠�
+  *]
+  ValueType: Number
+}
diff --git a/_Main/BL/Type_CC_EngineRackCell/Function_CalcRentalWarehouseStorageFees.qbl b/_Main/BL/Type_CC_EngineRackCell/Function_CalcRentalWarehouseStorageFees.qbl
new file mode 100644
index 0000000..12e3b4c
--- /dev/null
+++ b/_Main/BL/Type_CC_EngineRackCell/Function_CalcRentalWarehouseStorageFees.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcRentalWarehouseStorageFees
+{
+  TextBody:
+  [*
+    // vwedadmin Aug-25-2024 (created)
+    
+    value := guard( ( this.TotalQuantityOfMaterialRacks() - [Number]( this.PlannedInventory() / this.PackagingCapacity() ) ) * this.UnitPriceOfEmptyShelfStorage(), 0 );
+    
+    this.RentalWarehouseStorageFees( value );
+  *]
+}
diff --git a/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl b/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
index 63f3ec1..f05cadc 100644
--- a/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
+++ b/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
@@ -70,9 +70,14 @@
                                   tempFPID.Quantity() );
         cell.OutboundExpensesForRentedWarehouses( guard( [Number] ( engineProductions / guard( lce.PackagingCapacity(), 0 ) ) * guard( lcmr.OutboundPrice(), 0 ), 0 ) );
         
-        // 澶栫搴撹繍杈撹垂鐢細鍙戝姩鏈鸿繍杈撻噺/鍖呰瀹归噺/瑁呰浇瀹归噺锛堝悜涓婂彇鏁达級*鏂欐灦杩愯緭鍗曚环
-        // 澶栫搴撲粨鍌ㄨ垂鐢細鏂欐灦鎬绘暟閲�-鍙戝姩鏈哄簱瀛�/鍖呰瀹归噺锛堝悜涓婂彇鏁达級锛屽啀涔樹互绌烘枡鏋朵粨鍌ㄥ崟浠峰緱鍒扮┖鏂欐灦浠撳偍璐圭敤銆傚彂鍔ㄦ満搴撳瓨鍙朅ctual inventories閲屽彇鍒伴暱鏄ュ绉熷簱璇ュ彂鍔ㄦ満鐨勪粨鍌ㄩ噺锛屾枡鏋舵�绘暟閲忛渶瑕佹墜鍔ㄧ淮鎶ゃ��
-        // 娓呮礂璐圭敤锛氬彂鍔ㄦ満鍏ュ簱閲�/鍖呰瀹归噺*鏂欐灦娓呮礂鍗曚环銆傚彂鍔ㄦ満鍏ュ簱閲忓彇鍙戝姩鏈洪攢閲忥紝鍖呰瀹归噺鍙栬嚜鍙戝姩鏈烘垚鏈〃銆傛枡鏋舵竻娲楀崟浠峰彇鏂欐灦鎴愭湰琛ㄣ��
+        // 澶栫搴撹繍杈撹垂鐢細鍙戝姩鏈鸿繍杈撻噺 / 鍖呰瀹归噺 / 瑁呰浇瀹归噺锛堝悜涓婂彇鏁达級 * 鏂欐灦杩愯緭鍗曚环
+        
+        
+        // 澶栫搴撲粨鍌ㄨ垂鐢細鏂欐灦鎬绘暟閲� - 鍙戝姩鏈哄簱瀛� / 鍖呰瀹归噺锛堝悜涓婂彇鏁达級锛屽啀涔樹互绌烘枡鏋朵粨鍌ㄥ崟浠峰緱鍒扮┖鏂欐灦浠撳偍璐圭敤銆傚彂鍔ㄦ満搴撳瓨鍙朅ctual inventories閲屽彇鍒伴暱鏄ュ绉熷簱璇ュ彂鍔ㄦ満鐨勪粨鍌ㄩ噺锛屾枡鏋舵�绘暟閲忛渶瑕佹墜鍔ㄧ淮鎶ゃ��
+        cell.UnitPriceOfEmptyShelfStorage( lcmr.StoragePrice() );
+        
+        // 娓呮礂璐圭敤锛氬彂鍔ㄦ満鍏ュ簱閲� / 鍖呰瀹归噺 * 鏂欐灦娓呮礂鍗曚环銆傚彂鍔ㄦ満鍏ュ簱閲忓彇鍙戝姩鏈洪攢閲忥紝鍖呰瀹归噺鍙栬嚜鍙戝姩鏈烘垚鏈〃銆傛枡鏋舵竻娲楀崟浠峰彇鏂欐灦鎴愭湰琛ㄣ��
+        cell.CleaningCost( guard( engineSales / guard( lce.PackagingCapacity(), 0 ) * lcmr.CleanPrice(), 0 ) );
         
         cell.CC_EngineRackColumn( relset, ccerc );
       }

--
Gitblit v1.9.3