Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
| | |
| | | |
| | | |
| | | while ( needHandleUPTBs.Size() > 0 ) { |
| | | debuginfo( "-------------------------------------------", "正在处理的周开始时间:", indexStartDate.Format( "Y-M2-D2" ), |
| | | " 正在处理的周结束时间:", ( indexStartDate.StartOfNextWeek() - 1 ).Format( "Y-M2-D2" ), " 处理的个数:", needHandleUPTBs.Size() ); |
| | | // debuginfo( "-------------------------------------------", "正在处理的周开始时间:", indexStartDate.Format( "Y-M2-D2" ), |
| | | // " 正在处理的周结束时间:", ( indexStartDate.StartOfNextWeek() - 1 ).Format( "Y-M2-D2" ), " 处理的个数:", needHandleUPTBs.Size() ); |
| | | |
| | | // 需要处理标志 |
| | | needHandleFlag := false; |
| | |
| | | firstAppearCapacityDate1 := Date::MinDate(); |
| | | |
| | | // 识别是否需要连续排产 |
| | | traverse ( needHandleUPTBs, Elements, uptb ) { |
| | | traverse ( needHandleUPTBs, Elements, uptb, not needHandleFlag ) { |
| | | // 给第一次产能赋值 |
| | | if ( firstAppearCapacityDate.IsMinInfinity() and uptb.UsedCapacity().HoursAsReal() > 0.0 ) { |
| | | firstAppearCapacityDate := uptb.StartDate(); |
| | |
| | | // 处理连续排产 |
| | | if ( needHandleFlag ) { |
| | | // 索引开始时间 |
| | | handleIndexStartDate := firstAppearCapacityDate1 + 1; |
| | | handleIndexStartDate := firstAppearCapacityDate + 1; |
| | | // 需要处理的UPTB的最大时间 |
| | | handleIndexEndDate := maxobject( needHandleUPTBs, Elements, tempUPTB, true, tempUPTB.StartDate() ).StartDate(); |
| | | |