Merge branch 'dev'

renhao

2023-10-13 462215553c754d26acde8edab81b4a73f774e21e

 _Main/UI/MacroPlannerWebApp/Views/对接ERP进行PR释放.vw

@@ -75,21 +75,12 @@
          FormIssueWorkOrder_DataSetLevelIssueWorkOrder
          {
            groupDepth: -1
            column_ProductionWorkOrderNumber
            column_EndDate
            {
              columnId: 'ProductionWorkOrderNumber'
              dataPath: 'ProductionWorkOrderNumber'
              dataType: 'string'
              columnId: 'EndDate'
              dataPath: 'EndDate'
              dataType: 'date'
              index: 0
              subtotals: ''
              width: 150
            }
            column_ProductModel
            {
              columnId: 'ProductModel'
              dataPath: 'ProductModel'
              dataType: 'string'
              index: 1
              subtotals: ''
              width: 150
            }
@@ -98,25 +89,16 @@
              columnId: 'MaterialDescription'
              dataPath: 'MaterialDescription'
              dataType: 'string'
              index: 1
              subtotals: ''
              width: 150
            }
            column_OrganizationInfomation
            {
              columnId: 'OrganizationInfomation'
              dataPath: 'OrganizationInfomation'
              dataType: 'string'
              index: 2
              subtotals: ''
              width: 150
            }
            column_StartDate
            {
              columnId: 'StartDate'
              dataPath: 'StartDate'
              dataType: 'date'
              index: 3
              subtotals: ''
              width: 150
            }
            column_EndDate
            {
              columnId: 'EndDate'
              dataPath: 'EndDate'
              dataType: 'date'
              index: 4
              subtotals: ''
              width: 150
            }
@@ -125,15 +107,33 @@
              columnId: 'PlannedQuantity'
              dataPath: 'PlannedQuantity'
              dataType: 'real'
              index: 3
              subtotals: ''
              width: 150
            }
            column_ProductionWorkOrderNumber
            {
              columnId: 'ProductionWorkOrderNumber'
              dataPath: 'ProductionWorkOrderNumber'
              dataType: 'string'
              index: 4
              subtotals: ''
              width: 150
            }
            column_ProductModel
            {
              columnId: 'ProductModel'
              dataPath: 'ProductModel'
              dataType: 'string'
              index: 5
              subtotals: ''
              width: 150
            }
            column_WorkOrderType
            column_StartDate
            {
              columnId: 'WorkOrderType'
              dataPath: 'WorkOrderType'
              dataType: 'string'
              columnId: 'StartDate'
              dataPath: 'StartDate'
              dataType: 'date'
              index: 6
              subtotals: ''
              width: 150
@@ -147,6 +147,15 @@
              subtotals: ''
              width: 150
            }
            column_WorkOrderType
            {
              columnId: 'WorkOrderType'
              dataPath: 'WorkOrderType'
              dataType: 'string'
              index: 8
              subtotals: ''
              width: 150
            }
          }
        }
      }