From 6a1787efef1cf00dd1ea825b44c3ccd93c7bb814 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 12 十一月 2024 18:31:04 +0800
Subject: [PATCH] 机加管线报表库存数量计算bug

---
 _Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
index 392964d..812c079 100644
--- a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
@@ -81,21 +81,24 @@
     traverse( owner, Unit.Lane.LaneLeg, laneleg ){
       originspid             := laneleg.OriginStockingPointID();
       destinationspid        := laneleg.DestinationStockingPointID();
-      //CC to DL 闀挎槬鍘傚唴搴撳埌澶ц繛澶栫搴�
-      iscctodl               := originspid.EndsWith( '鍘傚唴搴�' ) and ( originspid.StartsWith( '闀挎槬' ) or originspid.StartsWith( 'CC' ) ) and destinationspid = '澶ц繛澶栫搴�';
+      //CC to DL 闀挎槬宸ュ巶鍒板ぇ杩炲伐鍘�
+      iscctodl               := ( originspid.StartsWith( '闀挎槬' ) or originspid.StartsWith( 'CC' ) ) and ( destinationspid.StartsWith( '澶ц繛' ) or destinationspid.StartsWith( 'DL' ) );
       //DL to CC 澶ц繛鍘傚唴搴撳埌澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�
       isdltocc               := originspid.EndsWith( '鍘傚唴搴�' ) and ( originspid.StartsWith( '澶ц繛' ) or originspid.StartsWith( 'DL' ) ) and destinationspid = '澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�';
-      if( iscctodl and isdltocc ){
-        traverse( table, Column, column){//, column.StartDate().Month() = 1 
-          alltrips           := selectset( laneleg, Trip, trip, ( trip.Arrival().Date() < column.StartDate().StartOfNextMonth() and trip.Arrival().Date() >= column.StartDate() )
-                                           or ( trip.Departure().Date() < column.StartDate().StartOfNextMonth() and trip.Departure().Date() >= column.StartDate() ) );
+      if( iscctodl or isdltocc ){
+    //    info( '------iscctodl------', originspid, destinationspid, iscctodl );
+        traverse( table, Column, column  ){//, column.StartDate().Month() = 1
+          alltrips           := selectset( laneleg, Trip, trip, trip.Arrival().Date() = column.StartDate()
+                                           or trip.Departure().Date() = column.StartDate() );
           producttrips      := selectuniquevalues( alltrips, Elements.ProductInTrip, pit, pit.Quantity() <> 0 and exists( pit.Product_MP().GetAllParent(), Elements, e, e.ID() = productparent ), pit.ProductID() );
-          traverse( producttrips, Elements, producttrip ){//, producttrip = '6912'
+    //      info( '---------Column----------', alltrips.Size(), producttrips.Size(), column.StartDate() );
+          traverse( producttrips, Elements, producttrip ){//, producttrip = '06K103011CP'
             row             := table.GetRow( producttrip );
             product         := selectobject( owner, Product_MP, product, product.ID() = producttrip );
             products.Add( product );
-            departureqty    := sum( alltrips, Elements.ProductInTrip, pit, ( pit.Trip().Departure().Date() < column.StartDate().StartOfNextMonth() and pit.Trip().Departure().Date() >= column.StartDate() ) and pit.Product_MP() = product, pit.Quantity() );
-            arrivalqty      := sum( alltrips, Elements.ProductInTrip, pit, ( pit.Trip().Arrival().Date() < column.StartDate().StartOfNextMonth() and pit.Trip().Arrival().Date() >= column.StartDate() ) and pit.Product_MP() = product, pit.Quantity() );
+            departureqty    := sum( alltrips, Elements.ProductInTrip, pit, pit.Trip().Departure().Date() = column.StartDate() and pit.Product_MP() = product, pit.Quantity() );
+            arrivalqty      := sum( alltrips, Elements.ProductInTrip, pit, pit.Trip().Arrival().Date() = column.StartDate() and pit.Product_MP() = product, pit.Quantity() );
+    //        info( '---------***************8---------', departureqty, arrivalqty, column.StartDate() );
             row.SetDepartureAndArrivalValue( column, iscctodl, departureqty, arrivalqty );
           }
         }

--
Gitblit v1.9.3