From 9fa1722ee249e570b82183107cdc643428fb067b Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 15 十一月 2024 17:39:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_PackagingPlanCell/Method_UpdateValue.qbl | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/_Main/BL/Type_PackagingPlanCell/Method_UpdateValue.qbl b/_Main/BL/Type_PackagingPlanCell/Method_UpdateValue.qbl
index ef3037a..5de77d9 100644
--- a/_Main/BL/Type_PackagingPlanCell/Method_UpdateValue.qbl
+++ b/_Main/BL/Type_PackagingPlanCell/Method_UpdateValue.qbl
@@ -15,22 +15,36 @@
this.Unpacking( value );
}
- if ( attrName = "Out" ) { // 璋冨嚭
- unitID := ifexpr( this.PackagingPlanRow().Factory() = "澶ц繛宸ュ巶", "DL to CC", "CC to DL" ) + " " + this.PackagingPlanRow().Category() + " Transport";
+ if ( this.PackagingPlanRow().Factory() = "闀挎槬宸ュ巶" and ( attrName = "Package" or attrName = "Unpacking" ) ) {
+ u := select( this.PackagingPlanRow().MacroPlan(), Unit, tempU, tempU.ID() = "CC " + this.PackagingPlanRow().Category() + " 绾胯竟鍜屽绉熷簱闂�" );
- pit := select( this.PackagingPlanRow().MacroPlan(), Unit.Lane.LaneLeg.Trip.ProductInTrip, tempPIT,
- tempPIT.Trip().LaneLeg().Lane().UnitID() = unitID and
- tempPIT.Trip().Departure().Date() = this.PackagingPlanColumn().StartDate() and
- tempPIT.ProductID() = this.PackagingPlanRow().ProductID() );
-
+ t := select( u, Lane.LaneLeg.Trip, tempT, tempT.Departure().Date() = this.PackagingPlanColumn().StartDate() and
+ ifexpr( attrName = "Package",
+ tempT.LaneLeg().AsOriginStockingPointLeg().StockingPoint_MP().ID().Regex( "绾胯竟搴�" ) and tempT.LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP().ID().Regex( "澶栫搴�" ),
+ tempT.LaneLeg().AsOriginStockingPointLeg().StockingPoint_MP().ID().Regex( "澶栫搴�" ) and tempT.LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP().ID().Regex( "绾胯竟搴�" ) )
+ );
+
+ pit := select( t, ProductInTrip, tempPIT, tempPIT.ProductID() = this.PackagingPlanRow().ProductID() );
+
pit.Update( value, true );
- this.Out( value );
-
- cell := select( this.PackagingPlanRow().MacroPlan(), PackagingPlanRow.PackagingPlanCell, tempPPCell,
- tempPPCell.PackagingPlanRow().Factory() = ifexpr( this.PackagingPlanRow().Factory() = "澶ц繛宸ュ巶", "闀挎槬宸ュ巶", "澶ц繛宸ュ巶" ) and
- tempPPCell.PackagingPlanRow().ProductID() = this.PackagingPlanRow().ProductID() and
- tempPPCell.PackagingPlanColumn().StartDate() = pit.Trip().Arrival().Date() );
- cell.TransferIn( value );
}
+
+ //if ( attrName = "Out" ) { // 璋冨嚭
+ // unitID := ifexpr( this.PackagingPlanRow().Factory() = "澶ц繛宸ュ巶", "DL to CC", "CC to DL" ) + " " + this.PackagingPlanRow().Category() + " Transport";
+ //
+ // pit := select( this.PackagingPlanRow().MacroPlan(), Unit.Lane.LaneLeg.Trip.ProductInTrip, tempPIT,
+ // tempPIT.Trip().LaneLeg().Lane().UnitID() = unitID and
+ // tempPIT.Trip().Departure().Date() = this.PackagingPlanColumn().StartDate() and
+ // tempPIT.ProductID() = this.PackagingPlanRow().ProductID() );
+ //
+ // pit.Update( value, true );
+ // this.Out( value );
+ //
+ // cell := select( this.PackagingPlanRow().MacroPlan(), PackagingPlanRow.PackagingPlanCell, tempPPCell,
+ // tempPPCell.PackagingPlanRow().Factory() = ifexpr( this.PackagingPlanRow().Factory() = "澶ц繛宸ュ巶", "闀挎槬宸ュ巶", "澶ц繛宸ュ巶" ) and
+ // tempPPCell.PackagingPlanRow().ProductID() = this.PackagingPlanRow().ProductID() and
+ // tempPPCell.PackagingPlanColumn().StartDate() = pit.Trip().Arrival().Date() );
+ // cell.TransferIn( value );
+ //}
*]
}
--
Gitblit v1.9.3