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" /> + + + + + @@ -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" /> + + + + + @@ -277,6 +293,7 @@