admin
2024-10-17 f8c73b21d8c6ceb3a2eed55ec9859aeb12772228
上线计划优化
已修改3个文件
29 ■■■■■ 文件已修改
_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Views/NewAssemblyOnlinePlan.vw 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Views/NewOfflinePlan.vw 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl
@@ -61,7 +61,7 @@
                               );
      
      u           := select( macroPlan, Unit, tempU, tempU.ID() = pl );
      drainPs     := selectset( u, UnitCalendar.Participation, tempP, guard( tempP.Event().Subject().Regex( "拉空" ), false ) );
      drainPs     := selectset( u, UnitCalendar.Participation, tempP, guard( tempP.Event().Subject().Regex( "拉空" ) or tempP.Event().Subject().Regex( "排空" ), false ) );
      lineLyingPs := selectset( u, UnitCalendar.Participation, tempP, guard( tempP.Event().Subject().Regex( "铺线" ), false ) );
      
      // 处理拉空
@@ -69,13 +69,24 @@
      traverse ( drainPs, Elements, p ) {
        traverse ( p, ExplicitTimeInterval, eti ) {
    //      info( "开始时间:", eti.Start().Format( "Y-M2-D2" ), "    结束时间:", eti.End().Format( "Y-M2-D2" ) );
          naopc := select( macroPlan, NewAssemblyOnlinePlanColumn, tempNAOPC, tempNAOPC.StartDate() = ( eti.Start().Date() - 1 ) );
          
          cell  := maxselect( macroPlan, NewAssemblyOnlinePlanRow.NewAssemblyOnlinePlanCell, tempNAOPCell, 
                              tempNAOPCell.NewAssemblyOnlinePlanRow().ProductionLine() = pl                         and
                              tempNAOPCell.NewAssemblyOnlinePlanColumn().StartDate()   = ( eti.Start().Date() - 1 ) and
                              tempNAOPCell.NewAssemblyOnlinePlanRow().Type()           = "1",
                              tempNAOPCell.NewAssemblyOnlinePlanRow().ProductionLine() = pl    and
                              tempNAOPCell.NewAssemblyOnlinePlanColumn()               = naopc and
                              tempNAOPCell.NewAssemblyOnlinePlanRow().Type()           = "1"   and
                              tempNAOPCell.Quantity()                                  > 0,
                              tempNAOPCell.OrderNr() ); 
          while ( isnull( cell ) and not isnull( naopc ) ){
            naopc := naopc.PreviousNAOPColumn();
            cell  := maxselect( macroPlan, NewAssemblyOnlinePlanRow.NewAssemblyOnlinePlanCell, tempNAOPCell,
                              tempNAOPCell.NewAssemblyOnlinePlanRow().ProductionLine() = pl    and
                              tempNAOPCell.NewAssemblyOnlinePlanColumn()               = naopc and
                              tempNAOPCell.NewAssemblyOnlinePlanRow().Type()           = "1"   and
                              tempNAOPCell.Quantity()                                  > 0,
                              tempNAOPCell.OrderNr() );
          }
          if ( not isnull( cell ) ) {
            cell.Quantity( cell.Quantity() - targetQuantity );
          }
_Main/UI/MacroPlannerWebApp/Views/NewAssemblyOnlinePlan.vw
@@ -30,7 +30,7 @@
          FormNewAssemblyOnlinePlan_MatrixEditor515
          {
            gridColor: '#c4c4c4'
            totalHeaderWidth: 530
            totalHeaderWidth: 335
            attributeHeaderWidthRatio: 0.6
            nameHeaderWidthRatio: 0.4
            columnWidth: 100
@@ -87,7 +87,7 @@
          FormNewAssemblyOnlinePlan_MatrixEditor583
          {
            gridColor: '#c4c4c4'
            totalHeaderWidth: 532
            totalHeaderWidth: 340
            attributeHeaderWidthRatio: 0.6
            nameHeaderWidthRatio: 0.4
            columnWidth: 100
_Main/UI/MacroPlannerWebApp/Views/NewOfflinePlan.vw
@@ -30,7 +30,7 @@
          FormNewOfflinePlan_MatrixEditor515
          {
            gridColor: '#c4c4c4'
            totalHeaderWidth: 507
            totalHeaderWidth: 342
            attributeHeaderWidthRatio: 0.6
            nameHeaderWidthRatio: 0.4
            columnWidth: 100
@@ -87,7 +87,7 @@
          FormNewOfflinePlan_MatrixEditor583
          {
            gridColor: '#c4c4c4'
            totalHeaderWidth: 509
            totalHeaderWidth: 342
            attributeHeaderWidthRatio: 0.6
            nameHeaderWidthRatio: 0.4
            columnWidth: 100