From 8a722a921a4704b7b0385bef0bfc874d3447e963 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Fri, 26 Aug 2022 16:22:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InitformulaServiceImpl.java  |  1 +
 mes/qd/src/views/wms/pf/formula/DivDialog.vue | 26 ++++++++++++++++++-
 .../src/views/wms/pf/formula/ViewDialog.vue   | 23 ++++++++++++++++
 .../views/wms/pf/initformula/DivDialog.vue    | 25 +++++++++++++++++-
 4 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java
index a8abd529..87fb798d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java
@@ -889,6 +889,7 @@ public class InitformulaServiceImpl implements InitformulaService {
             workorder.put("formula_id","");
             workorder.put("material_code",mater.getString("material_code"));
             workorder.put("net_rate",material.getString("net_rate"));
+            workorder.put("product_series_id",material.getString("product_series"));
             result.put("material",workorder);
             result.put("tabledis",new JSONArray());
             result.put("tableDtl",new JSONArray());
diff --git a/mes/qd/src/views/wms/pf/formula/DivDialog.vue b/mes/qd/src/views/wms/pf/formula/DivDialog.vue
index e66bf814..82f0b313 100644
--- a/mes/qd/src/views/wms/pf/formula/DivDialog.vue
+++ b/mes/qd/src/views/wms/pf/formula/DivDialog.vue
@@ -147,9 +147,25 @@
           :precision="2"
           :min="1"
           :max="9999"
-          style="width:80px"
+          style="width:210px"
         />
       </el-form-item>
+      <el-form-item label="产品系列" prop="product_series_id">
+        <el-select
+          v-model="form.product_series_id"
+          style="width: 210px"
+          placeholder="产品系列"
+          class="filter-item"
+          disabled
+        >
+          <el-option
+            v-for="item in XLList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <label slot="label">备注:</label>
         <el-input v-model="form.remark" disabled style="width: 210px" />
@@ -343,6 +359,7 @@ import StructIvt3 from '@/views/wms/pf/initformula/StructIvt3'
 import StructIvt4 from '@/views/wms/pf/initformula/StructIvt4'
 import materTypeDialog from '@/views/wms/pf/initformula/materTypeDialog'
 import formula from '@/api/wms/pf/formula'
+import crudseriesProcessRoute from '@/api/wms/pdm/seriesProcessRoute'
 export default {
   name: 'DivDialog',
   components: { StructIvt, StructIvt2,StructIvt3, StructIvt4, materTypeDialog },
@@ -367,6 +384,7 @@ export default {
       structshow5: false,
       button1: true,
       button2: true,
+      XLList:[],
       tableDtl: [],
       mstrow: {},
       form: {},
@@ -390,6 +408,12 @@ export default {
       }
     }
   },
+  created() {
+    debugger
+    crudseriesProcessRoute.getXLlist2().then(res => {
+      this.XLList = res
+    })
+  },
   methods: {
     open() {
       formula.getform({ 'formula_id': this.mstrow.formula_id }).then(res => {
diff --git a/mes/qd/src/views/wms/pf/formula/ViewDialog.vue b/mes/qd/src/views/wms/pf/formula/ViewDialog.vue
index 612e380f..3fc55607 100644
--- a/mes/qd/src/views/wms/pf/formula/ViewDialog.vue
+++ b/mes/qd/src/views/wms/pf/formula/ViewDialog.vue
@@ -138,6 +138,22 @@
           style="width: 210px"
         />
       </el-form-item>
+      <el-form-item label="产品系列" prop="product_series_id">
+        <el-select
+          v-model="form.product_series_id"
+          style="width: 210px"
+          placeholder="产品系列"
+          class="filter-item"
+          disabled
+        >
+          <el-option
+            v-for="item in XLList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <label slot="label">备注:</label>
         <el-input v-model="form.remark" disabled style="width: 210px" />
@@ -277,6 +293,7 @@
 <script>
 import { crud } from '@crud/crud'
 import formula from '@/api/wms/pf/formula'
+import crudseriesProcessRoute from '@/api/wms/pdm/seriesProcessRoute'
 export default {
   name: 'ViewDialog',
   mixins: [crud()],
@@ -297,6 +314,7 @@ export default {
       mstrow: {},
       tabledis: [],
       form: {},
+      XLList:[],
       form2: {
         total_qty1: '0',
         add_qty1: '0',
@@ -317,6 +335,11 @@ export default {
       }
     }
   },
+  created() {
+    crudseriesProcessRoute.getXLlist2().then(res => {
+      this.XLList = res
+    })
+  },
   methods: {
     open() {
       formula.getView({ 'formula_id':this.mstrow.formula_id,'material_id': this.mstrow.material_id ,'workorder_id':this.mstrow.workorder_id}).then(res => {
diff --git a/mes/qd/src/views/wms/pf/initformula/DivDialog.vue b/mes/qd/src/views/wms/pf/initformula/DivDialog.vue
index cd1a02af..e76d0e42 100644
--- a/mes/qd/src/views/wms/pf/initformula/DivDialog.vue
+++ b/mes/qd/src/views/wms/pf/initformula/DivDialog.vue
@@ -118,9 +118,25 @@
           :precision="2"
           :min="1"
           :max="9999"
-          style="width:80px"
+          style="width: 210px"
         />
       </el-form-item>
+      <el-form-item label="产品系列" prop="product_series_id">
+        <el-select
+          v-model="form.product_series_id"
+          style="width: 210px"
+          placeholder="产品系列"
+          class="filter-item"
+          disabled
+        >
+          <el-option
+            v-for="item in XLList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
     </el-form>
 
     <div class="crud-opts2">
@@ -389,6 +405,7 @@ import StructIvt4 from '@/views/wms/pf/initformula/StructIvt4'
 import materTypeDialog from '@/views/wms/pf/initformula/materTypeDialog'
 import initformula from '@/api/wms/pf/initformula'
 import autoformula from '@/api/wms/pf/autoformula'
+import crudseriesProcessRoute from '@/api/wms/pdm/seriesProcessRoute'
 export default {
   name: 'DivDialog',
   components: { StructIvt, StructIvt2, StructIvt3, StructIvt4, materTypeDialog },
@@ -419,6 +436,7 @@ export default {
       tableDtl: [],
       mstrow: {},
       tabledis: [],
+      XLList:[],
       form: { waste_limit_down:0, waste_limit_uo:0},
       form2: {
         total_qty1: '0',
@@ -442,6 +460,11 @@ export default {
       }
     }
   },
+  created() {
+    crudseriesProcessRoute.getXLlist2().then(res => {
+      this.XLList = res
+    })
+  },
   methods: {
     open() {
       initformula.getform({ 'material_id': this.mstrow.material_id, 'workorder_id': this.mstrow.workorder_id }).then(res => {