Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
| | |
| | | traverse ( allProductionLines, Elements, pl ) { |
| | | oprs := selectset( newOPT, OfflinePlanRow, tempORT, tempORT.ProductionLine() = pl and ( tempORT.Type() = "1" or tempORT.Type() = "2" ) ); |
| | | |
| | | traverse ( newOPT, OfflinePlanColumn, opc, opc.ColumnDate() = macroPlan.StartOfPlanning().Date() ) { |
| | | traverse ( newOPT, OfflinePlanColumn, opc, |
| | | opc.ColumnDate() >= macroPlan.StartOfPlanning().Date() |
| | | // opc.ColumnDate() >= macroPlan.StartOfPlanning().Date() and opc.ColumnDate() <= Date::Construct( 2024, 4, 17 ) // 测试时可以过滤时间 |
| | | ) { |
| | | for ( i := 1; i < 10; i++ ) { |
| | | firstOrderCell := select( oprs, Elements.OfflinePlanCell, tempOPC, tempOPC.OfflinePlanColumn() = opc and tempOPC.Value() = ( "#" + i.Format( "N(LPad0(2))" ) ) ); |
| | | secondOrderCell := select( oprs, Elements.OfflinePlanCell, tempOPC, tempOPC.OfflinePlanColumn() = opc and tempOPC.Value() = ( "#" + ( i + 1 ).Format( "N(LPad0(2))" ) ) ); |
| | |
| | | tempOPC.OfflinePlanRow().ProductID() = firstOrderCell.OfflinePlanRow().ProductID() |
| | | ); |
| | | firstQuantityCell.Value( [String] ( [Number]firstQuantityCell.Value() - cls.ChangeLossNr() ) ); |
| | | // info( "当前序号:", i, " 单元格的值:", firstCell.Value(), " 产品名:", firstCell.OfflinePlanRow().ProductID(), |
| | | // "下一个序号:", i + 1, " 单元格的值:", secondCell.Value(), " 产品名:", secondCell.OfflinePlanRow().ProductID() ); |
| | | // info( "当前列时间:", opc.ColumnDate().Format( "Y-M2-D2" ), " 当前序号:", i, " 单元格的值:", firstOrderCell.Value(), " 产品名:", firstOrderCell.OfflinePlanRow().ProductID(), |
| | | // "下一个序号:", i + 1, " 单元格的值:", secondOrderCell.Value(), " 产品名:", secondOrderCell.OfflinePlanRow().ProductID() ); |
| | | } |
| | | } |
| | | } |
| | |
| | | |
| | | // 生成下线计划表 |
| | | traverse ( macroPlan, Unit, u, u.HasCapacityTypeTime() |
| | | and u.Name() = "eMotor Assy (France)" // 测试时可以过滤 |
| | | // and u.Name() = "eMotor Assy (France)" // 测试本地场景时可以过滤 |
| | | // and u.Name() = "CC-MoMo" // 测试实际场景时可以过滤 |
| | | ) { |
| | | // 创建产线行 |
| | | opt.OfflinePlanRow( relnew, ProductionLine := u.ID(), ProductID := "", Type := "0" ); |
| | |
| | | Properties: |
| | | [ |
| | | DataBinding: 'DataHolderDialogData.Data.LoadingCapacity' |
| | | Label: '装载容量' |
| | | Label: '装载容量(托/车)' |
| | | Taborder: 5 |
| | | ] |
| | | } |
| | |
| | | Properties: |
| | | [ |
| | | DataBinding: 'DataHolderDialogData.Data.TransportPrice' |
| | | Label: '运输单位 (RMB/车)' |
| | | Label: '运输价格 (RMB/车)' |
| | | Taborder: 6 |
| | | ] |
| | | } |