Merge remote-tracking branch 'origin/master'

src/views/modules/yieldReport/produce_order.vue

@@ -288,10 +288,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5302,
-          serialNumber: '5302ProduceCostRollUpFlag',
+          serialNumber: '5302ProduceMatIssueFlag',
           tableId: "5302Produce",
           tableName: "待生产工单",
-          columnProp: "costRollUpFlag",
+          columnProp: "matIssueFlag",
           headerAlign: "center",
           align: "center",
           columnLabel: "已排料",
@@ -306,10 +306,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5302,
-          serialNumber: '5302ProduceManualFlag',
+          serialNumber: '5302ProduceToolIssueFlag',
           tableId: "5302Produce",
           tableName: "待生产工单",
-          columnProp: "manualFlag",
+          columnProp: "toolIssueFlag",
           headerAlign: "center",
           align: "center",
           columnLabel: "刀模已发",
@@ -324,10 +324,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5302,
-          serialNumber: '5302ProduceRepairSOFlag',
+          serialNumber: '5302ProducePlateIssueFlag',
           tableId: "5302Produce",
           tableName: "待生产工单",
-          columnProp: "repairSOFlag",
+          columnProp: "plateIssueFlag",
           headerAlign: "center",
           align: "center",
           columnLabel: "印版已发",
@@ -1240,7 +1240,7 @@ export default {
             this.menuButton.openReverseButton = true
           }
           //  生产排料
-          if (currentRow.costRollUpFlag == 'N') {
+          if (currentRow.matIssueFlag == 'N') {
             // 获取特殊权限
             let data = {
               userSpecialSecurityNo: 238,
@@ -1257,7 +1257,7 @@ export default {
             this.menuButton.costRollUpFlagButton = true
           }
           //  取消生产排料
-          if (currentRow.costRollUpFlag == 'Y') {
+          if (currentRow.matIssueFlag == 'Y') {
             // 获取特殊权限
             let data = {
               userSpecialSecurityNo: 238,
@@ -1274,7 +1274,7 @@ export default {
             this.menuButton.canceledCostRollUpFlagButton = true
           }
           // 刀模已发 确认
-          if (currentRow.manualFlag == 'N') {
+          if (currentRow.toolIssueFlag == 'N') {
             // 获取特殊权限
             let data = {
               userSpecialSecurityNo: 258,
@@ -1291,7 +1291,7 @@ export default {
             this.menuButton.manualFlagButton = true
           }
           // 刀模已发 取消
-          if (currentRow.manualFlag == 'Y') {
+          if (currentRow.toolIssueFlag == 'Y') {
             // 获取特殊权限
             let canceledAllPrdData = {
               userSpecialSecurityNo: 259,
@@ -1308,7 +1308,7 @@ export default {
             this.menuButton.canceledManualFlagButton = true
           }
           // 印版已发 确认
-          if (currentRow.repairSOFlag == 'N') {
+          if (currentRow.plateIssueFlag == 'N') {
             // 获取特殊权限
             let data = {
               userSpecialSecurityNo: 259,
@@ -1325,7 +1325,7 @@ export default {
             this.menuButton.repairSOFlagButton = true
           }
           // 印版已发 取消
-          if (currentRow.repairSOFlag == 'Y') {
+          if (currentRow.plateIssueFlag == 'Y') {
             // 获取特殊权限
             let data = {
               userSpecialSecurityNo: 259,
@@ -1520,10 +1520,12 @@ export default {
           type: 'warning'
         }).then(() => {
           let data = {
-            username: this.$store.state.user.name,
-            orderNo: this.currentRow.orderNo,
-            costRollUpFlag: 'Y',
             site: this.currentRow.site,
+            orderNo: this.currentRow.orderNo,
+            itemNo: this.currentRow.itemNo,
+            seqNo: this.currentRow.seqNo,
+            username: this.$store.state.user.name,
+            matIssueFlag: 'Y',
             orderChangeStatus: "订单已排料",
           }
           costRollUpProduceOrder(data).then(({data}) => {
@@ -1545,10 +1547,11 @@ export default {
           type: 'warning'
         }).then(() => {
           let data = {
-            username: this.$store.state.user.name,
-            orderNo: this.currentRow.orderNo,
-            costRollUpFlag: 'N',
             site: this.currentRow.site,
+            orderNo: this.currentRow.orderNo,
+            itemNo: this.currentRow.itemNo,
+            seqNo: this.currentRow.seqNo,
+            matIssueFlag: 'N',
             orderChangeStatus: "撤销订单排料",
           }
           costRollUpProduceOrder(data).then(({data}) => {
@@ -1569,10 +1572,11 @@ export default {
           type: 'warning'
         }).then(() => {
           let data = {
-            username: this.$store.state.user.name,
-            orderNo: this.currentRow.orderNo,
-            manualFlag: 'Y',
             site: this.currentRow.site,
+            orderNo: this.currentRow.orderNo,
+            itemNo: this.currentRow.itemNo,
+            seqNo: this.currentRow.seqNo,
+            toolIssueFlag: 'Y',
             orderChangeStatus: "订单刀模已发",
           }
           manualProduceOrder(data).then(({data}) => {
@@ -1593,10 +1597,11 @@ export default {
           type: 'warning'
         }).then(() => {
           let data = {
-            username: this.$store.state.user.name,
-            orderNo: this.currentRow.orderNo,
-            manualFlag: 'N',
             site: this.currentRow.site,
+            orderNo: this.currentRow.orderNo,
+            itemNo: this.currentRow.itemNo,
+            seqNo: this.currentRow.seqNo,
+            toolIssueFlag: 'N',
             orderChangeStatus: "撤销订单刀模已发",
           }
           manualProduceOrder(data).then(({data}) => {
@@ -1617,10 +1622,11 @@ export default {
           type: 'warning'
         }).then(() => {
           let data = {
-            username: this.$store.state.user.name,
-            orderNo: this.currentRow.orderNo,
-            repairSOFlag: 'Y',
             site: this.currentRow.site,
+            orderNo: this.currentRow.orderNo,
+            itemNo: this.currentRow.itemNo,
+            seqNo: this.currentRow.seqNo,
+            plateIssueFlag: 'Y',
             orderChangeStatus: "订单印版已发",
           }
           repairSOFlagProduceOrder(data).then(({data}) => {
@@ -1641,10 +1647,11 @@ export default {
           type: 'warning'
         }).then(() => {
           let data = {
-            username: this.$store.state.user.name,
-            orderNo: this.currentRow.orderNo,
-            repairSOFlag: 'N',
             site: this.currentRow.site,
+            orderNo: this.currentRow.orderNo,
+            itemNo: this.currentRow.itemNo,
+            seqNo: this.currentRow.seqNo,
+            plateIssueFlag: 'N',
             orderChangeStatus: "订单印版已发",
           }
           repairSOFlagProduceOrder(data).then(({data}) => {