diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/EquipmentfileServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/EquipmentfileServiceImpl.java index 7cdc9919..9643abb5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/EquipmentfileServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/EquipmentfileServiceImpl.java @@ -214,7 +214,7 @@ public class EquipmentfileServiceImpl implements EquipmentfileService { public JSONArray queryAll1(Map whereJson) { String devicerecord_id = (String) whereJson.get("devicerecord_id"); WQLObject EM_BI_DeviceLifeCycle = WQLObject.getWQLObject("EM_BI_DeviceLifeCycle"); // 工艺路线主表 - JSONArray ja = EM_BI_DeviceLifeCycle.query("devicerecord_id='"+devicerecord_id+"'").getResultJSONArray(0); + JSONArray ja = EM_BI_DeviceLifeCycle.query("devicerecord_id='"+devicerecord_id+"'"," create_time ").getResultJSONArray(0); return ja; } 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 2e956d9b..471624e1 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 @@ -47,6 +47,10 @@ public class WorkOrderServiceImpl implements WorkOrdereService { if (StrUtil.isNotEmpty(workorder_code)) { map.put("workorder_code", "%" + workorder_code + "%"); } + String pcsn = map.get("pcsn"); + if (StrUtil.isNotEmpty(pcsn)) { + map.put("pcsn", "%" + pcsn + "%"); + } String material_id = map.get("material_id"); if (StrUtil.isNotEmpty(material_id)) { map.put("material_id", "%" + material_id + "%"); @@ -71,6 +75,10 @@ public class WorkOrderServiceImpl implements WorkOrdereService { if (StrUtil.isNotEmpty(workorder_code)) { map.put("workorder_code", "%" + workorder_code + "%"); } + String pcsn = map.get("pcsn"); + if (StrUtil.isNotEmpty(pcsn)) { + map.put("pcsn", "%" + pcsn + "%"); + } String material_id = map.get("material_id"); if (StrUtil.isNotEmpty(material_id)) { map.put("material_id", "%" + material_id + "%"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java index 5cf2bf7c..c3712d5b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java @@ -40,6 +40,10 @@ public class WorkTaskServiceImpl implements WorkTaskService { if (StrUtil.isNotEmpty(workorder_code)) { map.put("workorder_code", "%" + workorder_code + "%"); } + String pcsn = map.get("pcsn"); + if (StrUtil.isNotEmpty(pcsn)) { + map.put("pcsn", "%" + pcsn + "%"); + } String material_id = map.get("material_id"); if (StrUtil.isNotEmpty(material_id)) { map.put("material_id", "%" + material_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 583abe5e..e885f336 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 @@ -25,6 +25,7 @@ 输入.product_series_id TYPEAS s_string 输入.workprocedure_id TYPEAS s_string 输入.device_id TYPEAS s_string + 输入.pcsn TYPEAS s_string [临时表] @@ -69,6 +70,9 @@ OPTION 输入.workorder_code <> "" WorkOrder.workorder_code like 输入.workorder_code ENDOPTION + OPTION 输入.pcsn <> "" + WorkOrder.pcsn like 输入.pcsn + ENDOPTION OPTION 输入.status <> "" WorkOrder.status = 输入.status ENDOPTION @@ -127,6 +131,9 @@ OPTION 输入.status <> "" WorkOrder.status = 输入.status ENDOPTION + OPTION 输入.pcsn <> "" + WorkOrder.pcsn like 输入.pcsn + ENDOPTION OPTION 输入.workorder_type <> "" WorkOrder.workorder_type = 输入.workorder_type ENDOPTION diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql index e8969605..b0bc46ae 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql @@ -72,6 +72,9 @@ OPTION 输入.workorder_code <> "" WorkTask.workorder_code like 输入.workorder_code ENDOPTION + OPTION 输入.pcsn <> "" + WorkTask.pcsn like 输入.pcsn + ENDOPTION OPTION 输入.worktask_code <> "" WorkTask.worktask_code like 输入.worktask_code ENDOPTION diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java index 6d450313..7baebaf6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java @@ -66,6 +66,10 @@ public class FormulaServiceImpl implements FormulaService { if (StrUtil.isNotEmpty(workorder_code)) { map.put("workorder_code", "%" + workorder_code + "%"); } + String pcsn = map.get("pcsn"); + if (StrUtil.isNotEmpty(pcsn)) { + map.put("pcsn", "%" + pcsn + "%"); + } String material_id = map.get("material_id"); if (StrUtil.isNotEmpty(material_id)) { map.put("material_id", "%" + material_id + "%"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_FORMULA01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_FORMULA01.wql index d61ec7c0..d50d97e0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_FORMULA01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_FORMULA01.wql @@ -21,6 +21,7 @@ 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string 输入.formula_id TYPEAS s_string + 输入.pcsn TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -68,6 +69,9 @@ OPTION 输入.workorder_code <> "" Formula.workorder_code like 输入.workorder_code ENDOPTION + OPTION 输入.pcsn <> "" + Formula.pcsn like 输入.pcsn + ENDOPTION OPTION 输入.status <> "" Formula.status = 输入.status ENDOPTION diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue index 7ad2aeec..2a1ddb59 100644 --- a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue @@ -68,11 +68,13 @@ @@ -311,9 +313,6 @@ export default { crudWorkProcedure.downSelect().then(res => { this.workProcedureList = res }) - this.crud.query.beginuse_date = [new Date(), new Date()] - this.crud.toQuery() - const param = { 'materOpt_code': '23' } @@ -322,6 +321,9 @@ export default { this.queryClassId() }) this.getDepts() + + this.crud.query.createTime = [new Date(), new Date()] + this.crud.toQuery() }, methods: { canUd(row) { @@ -434,6 +436,9 @@ export default { this.dissub_flag = true this.open_flag = true }, + onInput() { + this.$forceUpdate() + }, checkboxT(row) { return row.status !== '99' }, 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 4dd1a643..1f4d4165 100644 --- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue @@ -33,6 +33,7 @@ + + + @@ -399,6 +409,9 @@ export default { this.mstrow = this.checkrows.pop() this.changeShow = true }, + onInput() { + this.$forceUpdate() + }, submit(status) { this.checkrows = this.$refs.table.selection if(this.checkrows.length === 0 ){ diff --git a/mes/qd/src/views/wms/pdm/produce/worktask/index.vue b/mes/qd/src/views/wms/pdm/produce/worktask/index.vue index 9f0e5d10..f6acca44 100644 --- a/mes/qd/src/views/wms/pdm/produce/worktask/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/worktask/index.vue @@ -55,7 +55,15 @@ /> - + + + @@ -381,6 +390,9 @@ export default { this.querytable() }) }, + onInput() { + this.$forceUpdate() + }, openWork() { this.checkrows = this.$refs.table.selection if(this.checkrows.length === 0 ){ diff --git a/mes/qd/src/views/wms/pf/formula/index.vue b/mes/qd/src/views/wms/pf/formula/index.vue index a9d429a8..eb402a09 100644 --- a/mes/qd/src/views/wms/pf/formula/index.vue +++ b/mes/qd/src/views/wms/pf/formula/index.vue @@ -56,6 +56,15 @@ :value="item.value" /> + + + diff --git a/mes/qd/src/views/wms/pf/initformula/index.vue b/mes/qd/src/views/wms/pf/initformula/index.vue index 1aceefb8..01a04e3b 100644 --- a/mes/qd/src/views/wms/pf/initformula/index.vue +++ b/mes/qd/src/views/wms/pf/initformula/index.vue @@ -75,6 +75,15 @@ /> + + + diff --git a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/DivDialog.vue b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/DivDialog.vue index bee553e8..21d4cc36 100644 --- a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/DivDialog.vue +++ b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/DivDialog.vue @@ -325,10 +325,12 @@ export default { this.areatype = "'31'" } else if (this.mstrow.bill_type === '010201' || this.mstrow.bill_type === '010202' || this.mstrow.bill_type === '010401') { this.areatype = "'21'" - } else if (this.mstrow.bill_type === '010503' || this.mstrow.bill_type === '010501' || this.mstrow.bill_type === '010801') { + } else if (this.mstrow.bill_type === '010503' || this.mstrow.bill_type === '010501') { this.areatype = "'22','23','24'" } else if (this.mstrow.bill_type === '010502') { this.areatype = "'21','22','23','24'" + } else if (this.mstrow.bill_type === '010801') { + this.areatype = "'22','23','24','31','35'" } else if (this.mstrow.bill_type === '010601') { this.areatype = '' }