报工修改

src/views/mes/pro/feedback/index.vue

@@ -228,7 +228,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row v-if="form.isCheck == 'N'">
           <el-col :span="8">
             <el-form-item label="报工数量" prop="quantityFeedback">
               <el-input readonly="readonly" v-model="form.quantityFeedback" />
@@ -245,6 +245,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row v-else>
+          <el-col :span="8">
+            <el-form-item label="报工数量" prop="quantityFeedback">
+              <el-input readonly="readonly" v-model="form.quantityFeedback" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="待检测数量" prop="quantityUncheck">
+              <el-input-number :min="0" @change="handleQuantityChanged" v-model="form.quantityUncheck" placeholder="请输入待检测数量" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="报工人" prop="nickName">
@@ -367,12 +379,6 @@ export default {
         workorderCode: [
           { required: true, message: "生产工单不能为空", trigger: "blur" }
         ],
-        quantityQualified: [
-          { required: true, message: "请输入合格品数量", trigger: "blur"}
-        ],
-        quantityUnquanlified: [
-          { required: true, message: "请输入不合格品数量", trigger: "blur"}
-        ],
         nickName: [
           { required: true, message: "请选择报工人", trigger: "blur"}
         ],
@@ -444,7 +450,7 @@ export default {
       this.resetForm("form");
     },
     handleQuantityChanged(){
-      this.form.quantityFeedback = this.form.quantityQualified + this.form.quantityUnquanlified;
+      this.form.quantityFeedback = this.form.quantityQualified + this.form.quantityUnquanlified + this.form.quantityUncheck;
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -559,7 +565,6 @@ export default {
     },
     onWorkorderSelected(row){
       if(row != undefined && row != null){
-        debugger;
         this.form.workorderId = row.workorderId;
         this.form.workorderCode = row.workorderCode;
         this.form.workorderName = row.workorderName;
@@ -575,6 +580,7 @@ export default {
       this.$refs.taskSelect.getList();
     },
     onTaskSelected(row){
+      debugger;
       if(row != undefined && row != null){
         this.form.taskId = row.taskId;
         this.form.taskCode = row.taskCode;
@@ -585,6 +591,7 @@ export default {
         this.form.processId = row.processId;
         this.form.processCode = row.processCode;
         this.form.processName = row.processName;
+        this.form.isCheck = row.isCheck;
       }
     },
     //点击人员选择按钮

src/views/mes/pro/proroute/index.vue

@@ -125,7 +125,7 @@
     />
 
     <!-- 添加或修改工艺路线对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1080px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="8">

src/views/mes/pro/proroute/routeprocess.vue

@@ -52,6 +52,11 @@
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.keyFlag"/>
         </template>
       </el-table-column>
+      <el-table-column label="质检确认" width="100px" align="center" prop="isCheck">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isCheck"/>
+        </template>
+      </el-table-column>
       <el-table-column label="准备时间" align="center" prop="defaultPreTime" />
       <el-table-column label="等待时间" align="center" prop="defaultSufTime" />
       <el-table-column label="甘特图显示颜色" align="center" prop="colorCode" >
@@ -158,6 +163,26 @@
                     </el-tooltip>
                 </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="是否需要质检确认" prop="isCheck">
+                    <el-tooltip effect="dark" placement="right">
+                    <div slot="content">
+                        是：当前工序报工时需要进行质检确认</br>
+                        质检合格数量作为最终生产数量                                            
+                    </div>
+                    <el-select v-model="form.isCheck">
+                        <el-option
+                        v-for="dict in dict.type.sys_yes_no"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                        ></el-option>
+                    </el-select>
+                    </el-tooltip>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
                 <el-form-item label="准备时间" prop="defaultPreTime">
                     <el-tooltip effect="dark" content="当前系统支持的最小时间粒度为1小时" placement="right">
@@ -248,6 +273,9 @@ export default {
         ],
         keyFlag: [
         { required: true, message: "请指定当前工序是否关键工序", trigger: "blur" }
+        ],
+        isCheck: [
+        { required: true, message: "请指定当前工序是否需要质检确认", trigger: "blur" }
         ]
       }
     };
@@ -289,6 +317,7 @@ export default {
         processId: null,
         processCode: null,
         processName: null,
+        isCheck: 'N',
         orderNum: 1,
         nextProcessId: null,
         nextProcessCode: null,

src/views/mes/pro/schedule/index.vue

@@ -261,7 +261,7 @@
         </el-step>
       </el-steps>
       <el-card v-for=" (item,index) in processOptions " :key="index" v-if="activeProcess == index && form.workorderId !=null">
-        <ProTask :workorderId="form.workorderId" :processId="item.processId" :colorCode="item.colorCode" :optType="optType"></ProTask>
+        <ProTask :workorderId="form.workorderId" :routeId="item.routeId" :processId="item.processId" :colorCode="item.colorCode" :optType="optType"></ProTask>
       </el-card>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
@@ -368,13 +368,13 @@ export default {
     },
     getGanttTasks(){
       listGanttTaskList(this.queryParams).then(response =>{
-        debugger;
         this.tasks.data = response.data.data;
         this.tasks.links = response.data.links;
         this.$refs.ganttChar.reload();
       });
     },
 
+    //获取当前产品对应的生产工序
     getProcess(){
         listProductprocess(this.form.productId).then(response =>{
             this.processOptions = response.data;
@@ -458,7 +458,6 @@ export default {
     },
     //从BOM行中直接新增
     handleSubAdd(row){
-      debugger;
       this.open = false;
       this.reset();
       this.getTreeselect();
@@ -513,11 +512,10 @@ export default {
         this.form.parentId = row.workorderId;
       }
       getWorkorder(row.workorderId).then(response => {
-        debugger;
         this.form = response.data;
         this.getProcess();
         this.open = true;
-        this.title = "修改生产工单";
+        this.title = "生产排产";
         this.optType="edit";
       });
     },
@@ -573,7 +571,6 @@ export default {
     },
     //物料选择弹出框
     onItemSelected(obj){
-        debugger;
         if(obj != undefined && obj != null){
           this.form.productId = obj.itemId;
           this.form.productCode = obj.itemCode;
@@ -592,7 +589,6 @@ export default {
     },
     //自动生成编码
     handleAutoGenChange(autoGenFlag){
-      debugger;
       if(autoGenFlag){
         genCode('WORKORDER_CODE').then(response =>{
           this.form.workorderCode = response;

src/views/mes/pro/schedule/proTask.vue

@@ -199,6 +199,7 @@ export default {
         workstationId: null,
         workstationCode: null,
         workstationName: null,
+        routeId: this.routeId,
         processId: this.processId,
         processCode: null,
         processName: null,
@@ -242,6 +243,7 @@ export default {
   props:{
       workorderId: null,
       colorCode: null,
+      routeId: null,
       processId: null,
       optType: null
   },
@@ -301,6 +303,7 @@ export default {
         workstationId: null,
         workstationCode: null,
         workstationName: null,
+        routeId: this.routeId,
         processId: this.processId,
         processCode: null,
         processName: null,