From d84116e0214c2228d4b4b07ade372c96a15c32f8 Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期五, 13 十月 2023 11:01:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'
---
_Main/UI/MacroPlannerWebApp/Views/对接ERP进行PR释放.vw | 79 ++++++++++++++++++++++-----------------
1 files changed, 44 insertions(+), 35 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Views/\345\257\271\346\216\245ERP\350\277\233\350\241\214PR\351\207\212\346\224\276.vw" "b/_Main/UI/MacroPlannerWebApp/Views/\345\257\271\346\216\245ERP\350\277\233\350\241\214PR\351\207\212\346\224\276.vw"
index 0811978..bc4d12c 100644
--- "a/_Main/UI/MacroPlannerWebApp/Views/\345\257\271\346\216\245ERP\350\277\233\350\241\214PR\351\207\212\346\224\276.vw"
+++ "b/_Main/UI/MacroPlannerWebApp/Views/\345\257\271\346\216\245ERP\350\277\233\350\241\214PR\351\207\212\346\224\276.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
+ }
}
}
}
--
Gitblit v1.9.3