From 96db0ffeac62e2ae8ec5933ff863ad54fdb2b170 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 7 Mar 2023 11:07:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E8=89=BA=E8=B7=AF?=
 =?UTF-8?q?=E7=BA=BF=EF=BC=8C=E5=8D=95=E4=BD=8D=E4=BA=A7=E5=87=BA=E9=87=8F?=
 =?UTF-8?q?=E5=A4=A7=E4=BA=8E0=EF=BC=8C=E4=BA=A7=E5=87=BA=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E9=BB=98=E8=AE=A4=E4=B8=BA=20=E5=8D=95=E4=BD=8D/?=
 =?UTF-8?q?=E5=B0=8F=E6=97=B6=EF=BC=8C=20=E6=93=8D=E4=BD=9C=E5=B7=A5?=
 =?UTF-8?q?=E4=BA=BA=E6=95=B0=E9=BB=98=E8=AE=A4=E4=B8=BA1=20=20=202023?=
 =?UTF-8?q?=E5=B9=B43=E6=9C=887=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/maintainProductRouting.vue   | 24 ++++++++++++-------
 .../shopOrder/common/routingAddAndEdit.vue    |  6 ++++-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/base/maintainProductRouting.vue b/src/views/modules/base/maintainProductRouting.vue
index c014963..f9bb225 100644
--- a/src/views/modules/base/maintainProductRouting.vue
+++ b/src/views/modules/base/maintainProductRouting.vue
@@ -222,7 +222,6 @@
         </el-form-item>
         <el-form-item :label="labels.factorUnit">
           <el-select filterable v-model="detailData.factorUnit" style="width: 130px">
-            <el-option label="" value=""></el-option>
             <el-option :label="labels.oneandtime" value="单位/小时"></el-option>
             <el-option :label="labels.time" value="小时"></el-option>
           </el-select>
@@ -232,7 +231,6 @@
         </el-form-item>
         <el-form-item :label="labels.jjgzUnitFactor">
           <el-select filterable v-model="detailData.jjgzUnitFactor" style="width: 130px">
-            <el-option label="" value=""></el-option>
             <el-option :label="labels.time" value="小时"></el-option>
             <el-option :label="labels.one" value="件"></el-option>
           </el-select>
@@ -1595,11 +1593,11 @@ export default {
         workCenterNo: '',
         machSetupTime: '',
         machRunFactor: '',
-        factorUnit: '',
+        factorUnit: '单位/小时',
         jjgzUnitPrice: '',
-        jjgzUnitFactor: '',
+        jjgzUnitFactor: '小时',
         efficiency: '',
-        crewsize: '',
+        crewsize: 1,
         remark: '',
         site: '',
         partNo: '',
@@ -1798,10 +1796,11 @@ export default {
         workCenterNo: '',
         machSetupTime: 0,
         machRunFactor: 0,
-        factorUnit: null,
+        factorUnit: '单位/小时',
+        jjgzUnitFactor: '小时',
         jjgzUnitPrice: 0,
         efficiency: 100,
-        crewsize: 0,
+        crewsize: 1,
         remark: '',
         add: 0,
         partNo: this.mainData.partNo,
@@ -1862,6 +1861,15 @@ export default {
         })
         return false;
       }
+
+      if (this.detailData.machRunFactor<=0) {
+        this.$message.warning('单位产出量不能小于0!')
+        return
+      }
+      if (this.detailData.crewsize<1) {
+        this.$message.warning('操作工人数不能少于1!')
+        return
+      }
       saveRoutingDetailData(this.detailData).then(({data}) => {
         this.currentRow = null;
         if (data && data.code == 200) {
@@ -1991,7 +1999,7 @@ export default {
     },
     getSearchModal() {
       this.searchPartNo = '';
-      this.searchRoutingWithPartNo();
+     // this.searchRoutingWithPartNo();
       this.modelFlag = true;
     },
     editRoutingDetail() {
diff --git a/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue b/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
index 465636d..be26dc5 100644
--- a/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
+++ b/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
@@ -144,7 +144,7 @@
           closedFlag: '',
           crewsize: 1,
           efficiency: 80,
-          factorUnit: '',
+          factorUnit: '单位/小时',
           factorUnit_DB: null,
           itemNo: null,
           machRunFactor: 0,
@@ -299,6 +299,10 @@
           this.$message.warning('操作工人数不能少于1!')
           return
         }
+        if (this.selectRow.machRunFactor<=0) {
+          this.$message.warning('单位产出量不能小于0!')
+          return
+        }
         let centerInfo = {
           workCenterNo: this.selectRow.workCenterNo,
           active: 'Y',