2.4.5

MES:Web生产派工，计划生产的数量可以不等于派工的数量（目前只针对4楼折弯工序）

hw-ui/src/views/mes/productOrder/index.vue

@@ -96,7 +96,7 @@
         <!--        >修改工单-->
         <!--        </el-button>-->
       </el-col>
-      <el-col :span="1.5">
+      <!--el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -107,7 +107,7 @@
           v-hasPermi="['mes:productOrder:remove']"
         >删除
         </el-button>
-      </el-col>
+      </el-col-->
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->
       <!--          type="warning"-->
@@ -187,11 +187,6 @@
           <span>{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="库存锁定标识" align="center" prop="stockLockFlag" v-if="columns[20].visible" width="100">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.active_flag" :value="scope.row.stockLockFlag"/>
-        </template>
-      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" v-if="columns[21].visible"/>
       <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[22].visible"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[23].visible">
@@ -219,9 +214,18 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-lock"
+            icon="el-icon-video-pause"
-            @click="handleLockInventory(scope.row)"
+            v-if="scope.row.status===MES_ORDER_STATUS.STARTED"
-          >锁库存
+            @click="handlePause(scope.row)"
+          >暂停
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-caret-right"
+            v-if="scope.row.status===MES_ORDER_STATUS.PAUSE"
+            @click="handleContinue(scope.row)"
+          >继续
           </el-button>
           <el-button
             size="mini"
@@ -280,7 +284,8 @@
         <!--          <el-input v-model="form.saleOrderId" placeholder="请输入销售订单ID" />-->
         <!--        </el-form-item>-->
         <el-form-item label="销售订单编号" prop="saleorderCode">
-          <el-input v-model="form.saleorderCode" placeholder="请点击右侧检索销售订单编号"  :disabled="saleOrderDisabled" readonly>
+          <el-input v-model="form.saleorderCode" placeholder="请点击右侧检索销售订单编号" :disabled="saleOrderDisabled"
+                    readonly>
             <el-button slot="append" icon="el-icon-search" @click="handleSaleOrderAdd"></el-button>
           </el-input>
         </el-form-item>
@@ -292,7 +297,7 @@
         <!--        </el-form-item>-->
 
         <el-form-item label="物料名称" prop="materialName">
-          <el-input v-model="form.materialName" placeholder="请点击右侧检索物料"  :disabled="materialDisabled" readonly>
+          <el-input v-model="form.materialName" placeholder="请点击右侧检索物料" :disabled="materialDisabled" readonly>
             <el-button slot="append" icon="el-icon-search" @click="handleMaterialAdd"></el-button>
           </el-input>
         </el-form-item>
@@ -633,6 +638,11 @@ export default {
       MES_SALE_TYPE: {
         MES_SALE_TYPE_EXTERNAL: '1',//外部销售
         MES_SALE_TYPE_INTERNAL: '2',//对内生产
+      },
+
+      MES_ORDER_STATUS: {
+        STARTED: "3",//已开始
+        PAUSE: "4", //暂停
       }
     };
   },
@@ -708,7 +718,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleSaleOrderAdd() {
-      if(this.form.saleType===null || this.form.saleType===undefined || this.form.saleType===''){
+      if (this.form.saleType === null || this.form.saleType === undefined || this.form.saleType === '') {
         this.$modal.msgWarning("请先选择销售类型！");
         return;
       }
@@ -770,7 +780,7 @@ export default {
     },
 
     changeSaleType(value) {
-      this.form.saleOrderId =null;
+      this.form.saleOrderId = null;
       this.form.saleorderCode = null;
       this.form.saleorderLinenumber = null;
       this.form.materialId = null;
@@ -953,7 +963,37 @@ export default {
       this.download('mes/productOrder/export', {
         ...this.queryParams
       }, `productOrder_${new Date().getTime()}.xlsx`)
-    }
+    },
+
+
+    /** 暂停 */
+    handlePause(row){
+
+    },
+
+    handleContinue(row){
+
+    },
+
+    // handlePublish(row) {
+    //   this.form.productOrderId = row.productOrderId;
+    //   this.form.orderStatus = row.orderStatus;
+    //   this.$modal.confirm('是否确认发布生产工单编号为"' + row.orderCode + '"的数据项？').then(function () {
+    //     return true;
+    //   }).then(() => {
+    //     productOrderPublish(this.form).then(response => {
+    //       this.$modal.msgSuccess("发布成功");
+    //
+    //       const productOrderId = row.productOrderId || this.ids[0];
+    //       const orderCode = row.orderCode;
+    //       const params = {queryParams: this.queryParams};
+    //       this.$tab.closeOpenPage(router.currentRoute);
+    //       this.$tab.openPage("工单[" + orderCode + "]生产派工", '/mes/product-plan/index/' + productOrderId, params);
+    //     });
+    //   }).catch(() => {
+    //   });
+    // },
+
   }
 };
 </script>