From b99e22c06c023b82d5062fee06e2f8a29ce04977 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期四, 24 十月 2024 17:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_Dispatch.qbl | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_Dispatch.qbl b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_Dispatch.qbl
index 2f98a27..b61bf36 100644
--- a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_Dispatch.qbl
+++ b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_Dispatch.qbl
@@ -3,7 +3,7 @@
StaticMethod Dispatch (
Date startDate,
Date endDate,
- const OfflinePlanTable offlinePlan,
+ const NewOfflinePlanTable offlinePlan,
RecycleBin owner
)
{
@@ -30,7 +30,7 @@
unitIndexTree.Root().AddChild( unitHandle,i );
}
- traverse( offlinePlan,OfflinePlanRow,row ){
+ traverse( offlinePlan,NewOfflinePlanRow,row ){
productID := row.ProductID();
productLine := row.ProductionLine();
factory := constnull( Unit );
@@ -48,9 +48,9 @@
factory := temp2;
}
}
- traverse( row,OfflinePlanCell,cell ,startDate <= cell.OfflinePlanColumn().ColumnDate() and endDate > cell.OfflinePlanColumn().ColumnDate()){
- shiftDate := cell.OfflinePlanColumn().ColumnDate();
- shiftName := cell.Shift();
+ traverse( row,NewOfflinePlanCell,cell ,startDate <= cell.NewOfflinePlanColumn().StartDate() and endDate >= cell.NewOfflinePlanColumn().EndDate()){
+ shiftDate := cell.NewOfflinePlanColumn().StartDate();
+ shiftName := cell.ShiftPatternName();
shiftVolume := cell.Quantity();
shiftDayTime := constnull( ShiftDayTime );
{
--
Gitblit v1.9.3