Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

xiaoding721

2024-10-15 7468dd6ef0f026415460ee1d327a696876946449

Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

 _Main/BL/Type_TransferPlanCell/StaticMethod_GenerateReport.qbl

@@ -29,7 +29,8 @@
                                              RowNr                   := rowNr,
                                              SourceStockpoingPointID := TransferPlanRow::IdentifyTheFactory( t.LaneLeg().AsOriginStockingPointLeg().StockingPoint_MP() ),
                                              TargetStockpoingPointID := TransferPlanRow::IdentifyTheFactory( t.LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP() ),
                                              ProductID               := pit.Product_MP().ID() );     
                                              ProductID               := pit.Product_MP().ID(),
                                              Category                := pit.Product_MP().ParentID() );     
          }
          
          // 找列
@@ -77,7 +78,7 @@
    minDateTPC := macroPlan.TransferPlanColumn( relnew,
                                                ColumnDate := Date::MinDate() );
    traverse ( macroPlan, TransferPlanRow, tpr ) {
      productCell := minDateTPC.TransferPlanCell( relnew, Value := tpr.ProductID() );
      productCell := minDateTPC.TransferPlanCell( relnew, Value := tpr.Category() + "_" + tpr.ProductID() );
      productCell.TransferPlanRow( relset, tpr );
    }
    

 _Main/UI/MacroPlannerWebApp/Views/TransferPlan.vw

@@ -17,7 +17,62 @@
          columnPosition: 1
          columnSpan: 12
        }
        components: null
        components
        {
          FormTransferPlan_pHeader
          {
            sizeRatio: 1
          }
          FormTransferPlan_pContent
          {
            sizeRatio: 1
          }
          FormTransferPlan_MatrixEditor872
          {
            gridColor: '#c4c4c4'
            totalHeaderWidth: 200
            attributeHeaderWidthRatio: 0.6
            nameHeaderWidthRatio: 0.4
            columnWidth: 144
            horizontalGrid: true
            verticalGrid: true
            backendState
            {
              componentId: 'QMacroPlanner::FormTransferPlan.MatrixEditor872'
              state
              {
                cells
                {
                  attributes
                  {
                    attribute_Value
                    {
                      type: 'MatrixEditorWebApiCellDataModelInterest'
                      index: 0
                      rowsubtotal: ''
                      columnsubtotal: ''
                      attribute: 'Value'
                    }
                  }
                }
                columns
                {
                  sorting
                  {
                    criteria: "datamember:'ColumnDate'"
                  }
                }
                rows
                {
                  sorting
                  {
                    criteria: "datamember:'SourceStockpoingPointID';datamember:'TargetStockpoingPointID';datamember:'ProductID'"
                  }
                }
              }
            }
          }
        }
      }
      form_FormOptimizerPuzzles
      {