From ab5176a7074144e411c00a409010422a3ee5c98a Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 15 十一月 2024 16:50:55 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost.qbl |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost.qbl
index c7d248a..2b9fa79 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost.qbl
@@ -20,90 +20,90 @@
       fenginecost    := selectobject( enginecosts, Elements, engine, engine.EndDate() > this.StartDate() and engine.EndDate() <= this.EndDate() and engine.StartDate() < this.StartDate() and engine.Factory() = factory );
       if( not isnull( fenginecost ) ){
         fpispips     := selectset( pispips, Elements, pispip, pispip.Start().Date() >= fenginecost.StartDate() and pispip.Start().Date() <= fenginecost.EndDate() );
-        if( entercost.IsMaxInfinity() ){
+        if( not entercost.IsMaxInfinity() ){
           newsqty    := sum( fpispips, Elements, e, e.NewSupplyQuantity() );
           entercost  := entercost + ceil( newsqty / fenginecost.PackagingCapacity() ) * fenginecost.WarehousingPrice();
         }
-        if( othercost.IsMaxInfinity() ){
+        if( not othercost.IsMaxInfinity() ){
           newsqty    := sum( fpispips, Elements, e, e.NewSupplyQuantity() );
           othercost  := othercost + ceil( newsqty / fenginecost.PackagingCapacity() ) * fenginecost.OtherPrice();
         }
-        if( outcost.IsMaxInfinity() ){
+        if( not outcost.IsMaxInfinity() ){
           newsqty    := sum( fpispips, Elements, e, e.NewSupplyQuantity() );
           outcost    := outcost + ceil( newsqty / fenginecost.PackagingCapacity() ) * fenginecost.OutboundPrice();
         }
-        if( storecost.IsMaxInfinity() ){
+        if( not storecost.IsMaxInfinity() ){
           pinvqty    := sum( fpispips, Elements, e, e.PlannedInventoryLevelEnd() );
           storecost  := storecost + ceil( pinvqty / fenginecost.PackagingCapacity() ) * fenginecost.StoragePrice();//鍥涜垗浜斿叆
         }
-        if( transcost.IsMaxInfinity() ){
+        if( not transcost.IsMaxInfinity() ){
           this.CalcTransCost( fpispips, transcosts, fenginecost, transcost );
         }
       }
       menginecost    := selectobject( enginecosts, Elements, engine, engine.StartDate() > this.StartDate() and engine.EndDate() < this.EndDate() and engine.Factory() = factory );
       if( not isnull( menginecost ) ){
         mpispips     := selectset( pispips, Elements, pispip, pispip.Start().Date() >= menginecost.StartDate() and pispip.Start().Date() <= menginecost.EndDate() );
-        if( entercost.IsMaxInfinity() ){
+        if( not entercost.IsMaxInfinity() ){
           newsqty    := sum( mpispips, Elements, e, e.NewSupplyQuantity() );
           entercost  := entercost + ceil( newsqty / menginecost.PackagingCapacity() ) * menginecost.WarehousingPrice();
         }
-        if( othercost.IsMaxInfinity() ){
+        if( not othercost.IsMaxInfinity() ){
           newsqty    := sum( mpispips, Elements, e, e.NewSupplyQuantity() );
           othercost  := othercost + ceil( newsqty / menginecost.PackagingCapacity() ) * menginecost.OtherPrice();
         }
-        if( outcost.IsMaxInfinity() ){
+        if( not outcost.IsMaxInfinity() ){
           newsqty    := sum( mpispips, Elements, e, e.NewSupplyQuantity() );
           outcost    := outcost + ceil( newsqty / menginecost.PackagingCapacity() ) * menginecost.OutboundPrice();
         }
-        if( storecost.IsMaxInfinity() ){
+        if( not storecost.IsMaxInfinity() ){
           pinvqty    := sum( mpispips, Elements, e, e.PlannedInventoryLevelEnd() );
           storecost  := storecost + ceil( pinvqty / menginecost.PackagingCapacity() ) * menginecost.StoragePrice();//鍥涜垗浜斿叆
         }
-        if( transcost.IsMaxInfinity() ){
+        if( not transcost.IsMaxInfinity() ){
           this.CalcTransCost( mpispips, transcosts, menginecost, transcost );
         }
       }
       benginecost    := selectobject( enginecosts, Elements, engine, engine.StartDate() > this.StartDate() and engine.StartDate() <= this.EndDate() and engine.EndDate() > this.EndDate() and engine.Factory() = factory );
       if( not isnull( benginecost ) ){
         bpispips     := selectset( pispips, Elements, pispip, pispip.Start().Date() >= benginecost.StartDate() and pispip.Start().Date() <= benginecost.EndDate() )
-        if( entercost.IsMaxInfinity() ){
+        if( not entercost.IsMaxInfinity() ){
           newsqty    := sum( bpispips, Elements, e, e.NewSupplyQuantity() );
           entercost  := entercost + ceil( newsqty / benginecost.PackagingCapacity() ) * benginecost.WarehousingPrice();
         }
-        if( othercost.IsMaxInfinity() ){
+        if( not othercost.IsMaxInfinity() ){
           newsqty    := sum( bpispips, Elements, e, e.NewSupplyQuantity() );
           othercost  := othercost + ceil( newsqty / benginecost.PackagingCapacity() ) * benginecost.OtherPrice();
         }
-        if( outcost.IsMaxInfinity() ){
+        if( not outcost.IsMaxInfinity() ){
           newsqty    := sum( bpispips, Elements, e, e.NewSupplyQuantity() );
           outcost    := outcost + ceil( newsqty / benginecost.PackagingCapacity() ) * benginecost.OutboundPrice();
         }
-        if( storecost.IsMaxInfinity() ){
+        if( not storecost.IsMaxInfinity() ){
           pinvqty    := sum( bpispips, Elements, e, e.PlannedInventoryLevelEnd() );
           storecost  := storecost + ceil( pinvqty / benginecost.PackagingCapacity() ) * benginecost.StoragePrice();//鍥涜垗浜斿叆
         }
-        if( transcost.IsMaxInfinity() ){
+        if( not transcost.IsMaxInfinity() ){
           this.CalcTransCost( bpispips, transcosts, benginecost, transcost );
         }
       }
     }else{
-      if( entercost.IsMaxInfinity() ){
+      if( not entercost.IsMaxInfinity() ){
         newsqty      := sum( pispips, Elements, pispip, pispip.NewSupplyQuantity() );
         entercost    := entercost + ceil( newsqty / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
       }
-      if( othercost.IsMaxInfinity() ){
+      if( not othercost.IsMaxInfinity() ){
         newsqty      := sum( pispips, Elements, pispip, pispip.NewSupplyQuantity() );
         othercost    := othercost + ceil( newsqty / enginecost.PackagingCapacity() ) * enginecost.OtherPrice();
       }
-      if( outcost.IsMaxInfinity() ){
+      if( not outcost.IsMaxInfinity() ){
         newsqty      := sum( pispips, Elements, pispip, pispip.NewSupplyQuantity() );
         outcost      := outcost + ceil( newsqty / enginecost.PackagingCapacity() ) * enginecost.OutboundPrice();
       }
-      if( storecost.IsMaxInfinity() ){
+      if( not storecost.IsMaxInfinity() ){
         pinvqty      := sum( pispips, Elements, pispip, pispip.PlannedInventoryLevelEnd() );
         storecost    := storecost + ceil( pinvqty / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
       }
-      if( transcost.IsMaxInfinity() ){
+      if( not transcost.IsMaxInfinity() ){
         this.CalcTransCost( pispips, transcosts, enginecost, transcost );
       }
     }

--
Gitblit v1.9.3