fix: 1.物料产品选择和刀模具增加物料编码字段;2.齐套检查逻辑修改;3.一些字段的优化

src/api/mes/pro/workorder.js

@@ -128,6 +128,22 @@ export function doCheckToolNum(workorderId){
   })
 }
 
+export function checkTheMaintenanceApi(workorderId){
+  return request({
+    url: '/mes/pro/workorder/checkTheMaintenance',
+    data: {'workorderIds' : workorderId},
+    method: 'post'
+  })
+}
+
+// 修改工单状态
+export function changePublishedApi(workorderIds) {
+  return request({
+    url: '/mes/pro/workorder/published/' + workorderIds,
+    method: 'get'
+  })
+}
+
   //单个完成工单，将草稿->已确认
   export function confirmedWorkorder(workorderId){
     return request({

src/components/TmTool/index.vue

@@ -4,7 +4,7 @@
     v-if="showFlag"
     :visible.sync="showFlag"
     :modal="true"
-    width="900"
+    width="1000px"
     append-to-body
     center
   >
@@ -24,6 +24,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="物料编码" prop="sapItemCode">
+        <el-input
+          v-model="queryParams.sapItemCode"
+          placeholder="请输入物料编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="刀模版具名称" prop="toolName">
         <el-input
           v-model="queryParams.toolName"
@@ -104,6 +112,7 @@
       </el-table-column>
             <el-table-column label="SN编码" align="center" prop="toolCode" >
       </el-table-column>
+      <el-table-column label="物料编码" align="center" prop="sapItemCode" />
       <el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <el-button
@@ -177,6 +186,7 @@ export default {
         toolId: null,
         status: null,
         specification: null,
+        sapItemCode: null,
       },
     };
   },

src/components/itemSelect/single.vue

@@ -41,7 +41,7 @@
           v-show="showSearch"
           label-width="68px"
         >
-          <el-form-item label="物料编码" prop="itemCode">
+          <el-form-item v-if="!isSap" label="物料编码" prop="itemCode">
             <el-input
               v-model="queryParams.itemCode"
               placeholder="请输入物料编码"
@@ -50,6 +50,15 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item v-else label="物料编码" prop="sapItemCode">
+            <el-input
+              v-model="queryParams.sapItemCode"
+              placeholder="请输入物料编码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item label="物料名称" prop="itemName">
             <el-input
               v-model="queryParams.itemName"
@@ -202,6 +211,12 @@ export default {
   name: "MdItemSingle",
   dicts: ["sys_yes_no", "mes_item_product"],
   components: { Treeselect },
+  props: {
+    isSap: {
+      type: Boolean,
+      default: false,
+    }
+  },
   data() {
     return {
       showFlag: false,
@@ -232,6 +247,7 @@ export default {
         pageSize: 10,
         itemCode: undefined,
         itemName: undefined,
+        sapItemCode: undefined,
         itemTypeId: 0,
       },
       // 列信息

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

@@ -276,7 +276,7 @@
     </el-dialog>
 
     <itemType ref="brSelect" v-if="open" @onSelected="onitemTypeed"></itemType>
-    <ItemSelect ref="itemSelect" @onSelected="onItemSelected"> </ItemSelect>
+    <ItemSelect ref="itemSelect" :isSap="true" @onSelected="onItemSelected"> </ItemSelect>
   </div>
 </template>
 

src/views/mes/pro/productionSolution/components/ProogingSpecificationSheet.vue

@@ -69,7 +69,7 @@
           </el-form-item>
         </el-col>
         <el-col :lg="6" :md="8" :sm="12" :xs="12"
-          ><el-form-item label="单重(KG)" prop="singleWeight"
+          ><el-form-item label="单重(g)" prop="singleWeight"
             ><el-input
               v-model="form.singleWeight"
               placeholder
@@ -505,7 +505,18 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :lg="6" :md="8" :sm="12" :xs="12">
+        <el-col :lg="6" :md="8" :sm="12" :xs="12"
+          ><el-form-item label="吹膜厚度" prop="blownFilmThickness"
+            ><el-input
+              v-model="form.blownFilmThickness"
+              placeholder
+              type="number"
+              :precision="2"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
           <el-form-item label="印张宽度" prop="printPaperwidth">
             <el-input
               v-model="form.printPaperwidth"
@@ -514,7 +525,7 @@
               :precision="2"
             ></el-input>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :lg="6" :md="8" :sm="12" :xs="12">
           <el-form-item label="Inlay" prop="inlay">
             <el-input v-model="form.inlay" placeholder />
@@ -550,7 +561,7 @@
               </el-select>
           </el-form-item>
         </el-col>
-        
+
       </el-row>
       <el-row>
         <el-col :lg="6" :md="8" :sm="12" :xs="12">
@@ -561,14 +572,14 @@
               </el-select>
           </el-form-item>
         </el-col>
-        
+
         <el-col :lg="6" :md="8" :sm="12" :xs="12">
           <el-form-item label="排版要求" prop="dtaRemark">
             <el-input v-model="form.dtaRemark" placeholder />
           </el-form-item>
         </el-col>
       </el-row>
-      
+
       <!-- <el-row>
         <el-col :span="23">
           <el-form-item label="备注" prop="remark">
@@ -761,7 +772,7 @@ export default {
 
     /**更新行 */
     updateRow(row, idx) {
-      
+
       Object.assign(this.form, row);
       this.currentRowIndex = idx;
       this.showFlag = true;
@@ -780,7 +791,7 @@ export default {
     },
     getComData() {
       return this.form;
-      
+
     },
     /**重置表单 */
     resetForm() {
@@ -839,7 +850,7 @@ export default {
         dtaRemark: "",
         dta: "",
       };
-      
+
     },
     /**重置组件状态 */
     resetState() {

src/views/mes/pro/workorder/indexApply.vue

@@ -599,10 +599,12 @@ import {
   dofinish,
   printInfo,
   doCheckToolNum,
+  checkTheMaintenanceApi,
   delComWorkorder,
   closeWorkorder,
   closeCheck,
-  updateRequestDateApi
+  updateRequestDateApi,
+  changePublishedApi
 } from "@/api/mes/pro/workorder";
 import { addProtaskList } from "@/api/mes/pro/protask";
 import shiftSelectMixin from '@/utils/shiftSelectMixin'
@@ -1365,16 +1367,53 @@ export default {
         });
 
     },
+    async checkTheMaintenance(ids) {
+      const res = await checkTheMaintenanceApi(ids);
+      if(res.code == 200) {
+        const workorderCodeList = [];
+        const noticeList = [];
+        res.data.forEach((item, index) => {
+          if(item.noticeList.length > 0) {
+            workorderCodeList.push(item.workorderCode);
+            noticeList.push(...item.noticeList);
+          }
+        })
+      if(workorderCodeList.length == 0) {
+        this.getList();
+        this.$modal.msgSuccess("已齐套");
+      } else {
+        const h = this.$createElement;
+        const list = noticeList.map((item, index) => {
+          return h('p', null, item);
+        });
+        this.$msgbox({
+          title: '确认信息',
+          message: h('div', null, [
+            h('p', {}, list)
+          ]),
+          showCancelButton: true,
+          confirmButtonText: '是',
+          cancelButtonText: '否'
+        })
+          .then(() => {
+            const params = workorderCodeList.jion('');
+            changePublishedApi(params).then(() => {
+              this.getList();
+              this.$modal.msgSuccess("已齐套");
+            })
+          })
+          .catch(action => {
+            console.log(action);
+          });
+        }
+      }
+    },
     handleToolNumCheck() {
       this.$modal
         .confirm("是否检查刀具模版齐套？")
         .then(() => {
           const ids = this.selectedRows.map((v) => v.workorderId);
-          return doCheckToolNum(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("已齐套");
+          this.checkTheMaintenance(ids);
         })
         .catch(() => {
         });