diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java index 1494c4eb..5ccf700c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java @@ -275,6 +275,7 @@ public class DailyplanServiceImpl implements DailyplanService { new_jo.put("planstart_time",jo.getString("planstart_date").substring(0,10)+" 08:00:00"); new_jo.put("planend_time",jo.getString("planend_date").substring(0,10)+" 23:59:59"); new_jo.put("status","10"); + new_jo.put("create_mode","03"); new_jo.put("source_bill_id",jo.getString("dailyplan_id")); new_jo.put("source_bill_type",jo.getString("workorder_type")); new_jo.put("source_bill_code",jo.getString("plan_code")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java index cb94be7b..f488e961 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java @@ -107,9 +107,9 @@ public class WorkOrderServiceImpl implements WorkOrdereService { for(int i=0;i'99' and material_id='"+material_id+"' and pcsn='"+pcsn+"'").uniqueResult(0); + JSONObject old = mstTab.query("is_delete='0' and material_id='"+material_id+"' and pcsn='"+pcsn+"'").uniqueResult(0); if(old!=null){ - throw new BadRequestException("已存在相同产品和批次的未完成工令！"); + throw new BadRequestException("已存在相同产品牌号和批次的工令！"); } json.put("pcsn", pcsn); String product_series_id = json.getString("product_series_id"); @@ -146,9 +146,9 @@ public class WorkOrderServiceImpl implements WorkOrdereService { String material_id = whereJson.getString("material_id"); String pcsn = whereJson.getString("pcsn"); String workorder_id = whereJson.getString("workorder_id"); - JSONObject old = mstTab.query("is_delete='0' and status<>'99' and material_id='"+material_id+"' and pcsn='"+pcsn+"' and workorder_id<>'"+workorder_id+"'").uniqueResult(0); + JSONObject old = mstTab.query("is_delete='0' and material_id='"+material_id+"' and pcsn='"+pcsn+"' and workorder_id<>'"+workorder_id+"'").uniqueResult(0); if(old!=null){ - throw new BadRequestException("已存在相同产品和批次的未完成工令！"); + throw new BadRequestException("已存在相同产品牌号和批次的工令！"); } String product_series_id = whereJson.getString("product_series_id"); if (StrUtil.isEmpty(product_series_id)) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql index 7ff33b4b..86b695d0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql @@ -27,7 +27,7 @@ 输入.device_id TYPEAS s_string 输入.pcsn TYPEAS s_string 输入.device_code TYPEAS s_string - + 输入.create_mode TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -83,6 +83,9 @@ OPTION 输入.status <> "" WorkOrder.status = 输入.status ENDOPTION + OPTION 输入.create_mode <> "" + WorkOrder.create_mode = 输入.create_mode + ENDOPTION OPTION 输入.workorder_type <> "" WorkOrder.workorder_type = 输入.workorder_type ENDOPTION @@ -142,6 +145,9 @@ ENDOPTION OPTION 输入.pcsn <> "" WorkOrder.pcsn like 输入.pcsn + ENDOPTION + OPTION 输入.create_mode <> "" + WorkOrder.create_mode = 输入.create_mode ENDOPTION OPTION 输入.workorder_type <> "" WorkOrder.workorder_type = 输入.workorder_type diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index 87bbb4c1..b22da91b 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue b/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue index 5705655f..9a9836f3 100644 --- a/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue +++ b/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue @@ -137,6 +137,7 @@ const defaultForm = { pcsn:'', org_id:'', status: '10', + create_mode: '01', product_series_id:'', workorder_qty: '500', workorder_type: '01', diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue b/mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue index 482fcc84..f6e2c80e 100644 --- a/mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue +++ b/mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue @@ -169,6 +169,22 @@ /> + + + + + @@ -246,7 +262,7 @@ export default { type: Object } }, - dicts: ['workorder_status', 'workorder_type', 'product_series', 'finish_type'], + dicts: ['workorder_status', 'workorder_type', 'product_series', 'finish_type', 'ST_CREATE_MODE'], data() { return { dialogVisible: false, diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue index 084a4ea3..ca9a0b33 100644 --- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue @@ -76,7 +76,23 @@ /> - + + + + + + @@ -292,7 +309,7 @@ export default { }, mixins: [presenter(), header(), crud()], // 数据字典 - dicts: ['workorder_status', 'workorder_type', 'product_series', 'workorder_type2'], + dicts: ['workorder_status', 'workorder_type', 'product_series', 'workorder_type2', 'ST_CREATE_MODE'], data() { return { height: document.documentElement.clientHeight - 180 + 'px;', @@ -392,6 +409,9 @@ export default { stateFormat(row) { return this.dict.label.workorder_status[row.status] }, + create_modeFormat(row) { + return this.dict.label.ST_CREATE_MODE[row.create_mode] + }, bill_typeFormat(row) { return this.dict.label.workorder_type[row.workorder_type] }, diff --git a/mes/qd/src/views/wms/pf/initformula/index.vue b/mes/qd/src/views/wms/pf/initformula/index.vue index 01a04e3b..04fa7544 100644 --- a/mes/qd/src/views/wms/pf/initformula/index.vue +++ b/mes/qd/src/views/wms/pf/initformula/index.vue @@ -75,6 +75,23 @@ /> + + + + + + @@ -176,7 +194,7 @@ export default { }, mixins: [presenter(), header(), crud()], // 数据字典 - dicts: ['workorder_status', 'workorder_type', 'product_series'], + dicts: ['workorder_status', 'workorder_type', 'product_series', 'ST_CREATE_MODE'], data() { return { height: document.documentElement.clientHeight - 180 + 'px;', @@ -279,6 +297,9 @@ export default { this.changeShow = true }) }, + create_modeFormat(row) { + return this.dict.label.ST_CREATE_MODE[row.create_mode] + }, autoAll(){ this.checkrows = this.$refs.table.selection autoformula.autoAll({rows:this.checkrows}).then(res => {