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

lazhen

2024-12-05 c0286cc99defaac2e930cf9b7834c015e81fbbe5

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

 _Main/UI/MacroPlannerWebApp/Component_FormSingleShiftConfig/Component_ListSingleShiftConfig.def

@@ -28,7 +28,7 @@
      ]
      Properties:
      [
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Unit.ID","title":"产线","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"Unit.ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftName","title":"班次名称","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"ShiftName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SingleShiftName","title":"单班次名称","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"SingleShiftName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StandardYield","title":"标准产量","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"StandardYield"}}]'
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Unit.ID","title":"产线","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"Unit.ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftName","title":"班次名称","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"ShiftName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FirstSingleShiftQuantity","title":"白班","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"FirstSingleShiftQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SecondSingleShiftQuantity","title":"二班","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"SecondSingleShiftQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ThirdSingleShiftQuantity","title":"三班","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"ThirdSingleShiftQuantity"}}]'
        ContextMenu: 'listContextMenuSingleShiftConfig'
        Taborder: 2
      ]