From 07f59782e3dedea060bdfd1669761cb080a9492e Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 13 Mar 2019 14:18:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessingStatusEdit.js                   | 11 ++++
 .../ProcessingStatusEdit/index.vue            | 53 ++++++++++++-------
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
index 26adb5f7..1a2a076c 100644
--- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
@@ -144,3 +144,14 @@ export function getTable8(code) {
     }
   })
 }
+export function isMachining(code) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: 2,
+      name: '车间生产管理工艺_零件撤出待加工库',
+      param: '工艺计划流水号=' + code + '&结果=0=int=output'
+    }
+  })
+}
diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index 4c33cbfe..a735c6fb 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -367,11 +367,13 @@
   </div>
 </template>
 <script>
-import { handlechange3, getTable8, getTree, fn, dialogtablevisible, getNames, getMachines, getGroups, getTable, getTable2, handlechange, handlechange2 } from '@/api/ManufacturingCenter/ProcessingStatusEdit'
+import { isMachining, handlechange3, getTable8, getTree, fn, dialogtablevisible, getNames, getMachines, getGroups, getTable, getTable2, handlechange, handlechange2 } from '@/api/ManufacturingCenter/ProcessingStatusEdit'
 
 export default {
   data() {
     return {
+      Num2: '',
+      gongyijihualiushuihao: [[]],
       midd: 0,
       ssks: '',
       cjscgy: '',
@@ -562,6 +564,7 @@ export default {
       this.result = []
       this.kaoqinbianhao = [[]]
       this.gongxuliushuihao = [[]]
+      this.gongyijihualiushuihao = [[]]
       this.process = [[]]
       this.planDate = [[]]
       this.worker = [[]]
@@ -579,6 +582,7 @@ export default {
             this.投产数量.push(response.data.rows[i].投产数量)
             this.kaoqinbianhao[i] = []
             this.gongxuliushuihao[i] = []
+            this.gongyijihualiushuihao[i] = []
             this.process[i] = []
             this.planDate[i] = []
             this.worker[i] = []
@@ -594,6 +598,7 @@ export default {
                   if (response.data[k].工艺计划流水号 === this.liushuihao) {
                     this.kaoqinbianhao[i][k] = response.data[k].工作者考勤编号
                     this.gongxuliushuihao[i][k] = response.data[k].工序流水号
+                    this.gongyijihualiushuihao[i][k] = response.data[k].工艺计划流水号
                     this.process[i][k] = response.data[k].工艺名称简称
                     this.planDate[i][k] = response.data[k].计划日期_短
                     this.worker[i][k] = response.data[k].员工姓名
@@ -642,42 +647,54 @@ export default {
         }
         this.title = this.process[index][a]
         this.Num = this.gongxuliushuihao[index][a]
+        this.Num2 = this.gongyijihualiushuihao[index][a]
         this.dialogFormVisible = true
       }
     },
     // 编辑确定
     handleChange() {
       if (this.midd === 0) {
-        handlechange2(this.Num, this.form.考勤编号).then(response => {
-          if (response.data[0].result === '1') {
-            handlechange(this.Num, this.form.完成时间).then(response => {
+        isMachining(this.Num2).then(res => {
+          if (res.data.output[0].结果 === '0') {
+            this.$message.error('该零件正在加工，不能手动完成')
+          } else {
+            handlechange2(this.Num, this.form.考勤编号).then(response => {
               if (response.data[0].result === '1') {
-                this.$message.success('信息编辑成功')
+                handlechange(this.Num, this.form.完成时间).then(response => {
+                  if (response.data[0].result === '1') {
+                    this.$message.success('信息编辑成功')
+                  } else {
+                    this.$message.error('信息编辑失败')
+                  }
+                }).then(() => {
+                  this.getTableData()
+                })
               } else {
                 this.$message.error('信息编辑失败')
               }
-            }).then(() => {
-              this.getTableData()
             })
-          } else {
-            this.$message.error('信息编辑失败')
           }
         })
       } else {
-        handlechange3(this.Num, this.form.考勤编号).then(response => {
-          if (response.data[0].result === '1') {
-            handlechange(this.Num, this.form.完成时间).then(response => {
+        isMachining(this.Num2).then(res => {
+          if (res.data.output[0].结果 === '0') {
+            this.$message.error('该零件正在加工，不能手动完成')
+          } else {
+            handlechange3(this.Num, this.form.考勤编号).then(response => {
               if (response.data[0].result === '1') {
-                this.$message.success('信息编辑成功')
-                this.getTableData()
+                handlechange(this.Num, this.form.完成时间).then(response => {
+                  if (response.data[0].result === '1') {
+                    this.$message.success('信息编辑成功')
+                  } else {
+                    this.$message.error('信息编辑失败')
+                  }
+                }).then(() => {
+                  this.getTableData()
+                })
               } else {
                 this.$message.error('信息编辑失败')
               }
-            }).then(() => {
-              this.getTableData()
             })
-          } else {
-            this.$message.error('信息编辑失败')
           }
         })
       }

From c0b541b65b45fd33b26929bdee3fedeba392add1 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 13 Mar 2019 14:47:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ManufacturingCenter/ProcessingStatusEdit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
index 1a2a076c..d75ab8ab 100644
--- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
@@ -151,7 +151,7 @@ export function isMachining(code) {
     data: {
       type: 2,
       name: '车间生产管理工艺_零件撤出待加工库',
-      param: '工艺计划流水号=' + code + '&结果=0=int=output'
+      param: '工艺计划流水号=' + code + '&结果=11111=string=output'
     }
   })
 }

From edca5244d91a3c6a4d9d0d551641eceb28ba64ad Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 13 Mar 2019 14:56:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=E5=BE=AA=E7=8E=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ManufacturingCenter/InitialProduction/index.vue     | 1 -
 src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index e80ac537..1fa02eb3 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -831,7 +831,6 @@ export default {
                 if (this.result === this.multipleSelection.length) {
                   this.$message.success('投产成功')
                   this.total = 0
-                  this.pageSize = 10
                   this.pageList = 1
                   this.getTable()
                   this.checked_baitu = false
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index 60ef6e27..b0fef10b 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -343,12 +343,12 @@ export default {
         if (this.multipleSelection[i].人员编号 === '') {
           this.$message.error('请选择工艺员')
         } else {
+          this.result = 0
           save(this.multipleSelection[i].工艺计划流水号, this.multipleSelection[i].人员编号, this.multipleSelection[i].零件号).then(response => {
             this.result += parseInt(response.data[0].result)
             if (this.result === this.multipleSelection.length) {
               this.$message.success('保存成功')
               this.PageCurrent = 1
-              this.PageSize = 10
               this.getTable()
             } else if (i === this.multipleSelection.length - 1 && this.result !== this.multipleSelection.length) {
               this.$message.error('存在保存失败项')