From c60243e10ce9db8bce4201cf735a372ada538181 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 27 Sep 2022 10:02:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/basedata/em/wql/em.xls | Bin 309760 -> 311808 bytes .../impl/DevicerepairplanmstServiceImpl.java | 5 ++++ .../repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql | 5 ++++ .../sb/repair/devicerepairplan/AddDialog.vue | 25 ++++++++++++++++-- .../repair/devicerepairplan/CopyAddDialog.vue | 22 +++++++++++++-- .../wms/sb/repair/devicerepairplan/index.vue | 23 +++++++++++++++- 6 files changed, 75 insertions(+), 5 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls index da1db16ade3284be02d6acbcaf37af652ec9df3b..03543cfeb7c300a0b43f0c08cabfd07844439aa0 100644 GIT binary patch delta 28728 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 delta 27646 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 X;~Aqlb0BY{26bZ!t+afX(e?iTX$8Tx diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java index b1e6c58f..034599c9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java @@ -48,6 +48,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic @Override public Map queryAll(Map whereJson, Pageable page) { String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); + String repair_type = MapUtil.getStr(whereJson, "repair_type"); String device_code = MapUtil.getStr(whereJson, "device_code"); String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle"); String repair_plan_code = MapUtil.getStr(whereJson, "repair_plan_code"); @@ -62,6 +63,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic map.put("is_active", is_active); map.put("begin_time", begin_time); map.put("end_time", end_time); + map.put("repair_type", repair_type); if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code","%"+device_code+"%"); if (ObjectUtil.isNotEmpty(repair_plan_code)) map.put("repair_plan_code","%"+repair_plan_code+"%"); //处理物料当前节点的所有子节点 @@ -128,6 +130,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic jsonMst.put("repair_plan_name",whereJson.getString("repair_plan_name")); jsonMst.put("devicerecord_id",whereJson.get("devicerecord_id")); jsonMst.put("maintenancecycle",whereJson.getString("maintenancecycle")); + jsonMst.put("repair_type",whereJson.getString("repair_type")); jsonMst.put("plan_start_date",whereJson.getString("plan_start_date")); jsonMst.put("detail_count",tableData.size()); jsonMst.put("create_id",currentUserId); @@ -169,6 +172,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic jsonMst.put("repair_plan_name",whereJson.getString("repair_plan_name")); jsonMst.put("devicerecord_id",whereJson.get("devicerecord_id")); jsonMst.put("maintenancecycle",whereJson.getString("maintenancecycle")); + jsonMst.put("repair_type",whereJson.getString("repair_type")); jsonMst.put("plan_start_date",whereJson.getString("plan_start_date")); jsonMst.put("detail_count",tableData.size()); jsonMst.put("update_optid",currentUserId); @@ -268,6 +272,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic jsonMst.put("repair_plan_name",whereJson.getString("repair_plan_name")); jsonMst.put("devicerecord_id",whereJson.get("devicerecord_id")); jsonMst.put("maintenancecycle",whereJson.getString("maintenancecycle")); + jsonMst.put("repair_type",whereJson.getString("repair_type")); jsonMst.put("plan_start_date",whereJson.getString("plan_start_date")); jsonMst.put("detail_count",tableData.size()); jsonMst.put("create_id",currentUserId); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql index 8ed59224..ef8405ca 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql @@ -22,6 +22,7 @@ 输入.is_active TYPEAS s_string 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string + 输入.repair_type TYPEAS s_string [临时表] @@ -80,6 +81,10 @@ mst.maintenancecycle = 输入.maintenancecycle ENDOPTION + OPTION 输入.repair_type <> "" + mst.repair_type = 输入.repair_type + ENDOPTION + OPTION 输入.is_active <> "" mst.is_active = 输入.is_active ENDOPTION diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairplan/AddDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairplan/AddDialog.vue index dd4c6d03..c94064eb 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepairplan/AddDialog.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepairplan/AddDialog.vue @@ -65,7 +65,25 @@ - + + + + + + + + @@ -144,7 +162,7 @@ import CRUD, { form, crud } from '@crud/crud' export default { name: 'AddDialog', - dicts: ['EM_DEVICE_WX_CYCLE'], + dicts: ['EM_DEVICE_WX_CYCLE', 'EM_DEVICE_WX_TYPE'], components: { ItemDialog, DeviceDialog }, mixins: [form(defaultForm), crud()], props: { @@ -180,6 +198,9 @@ export default { ], devicerecord_id: [ { required: true, message: '设备不能为空', trigger: 'blur' } + ], + repair_type: [ + { required: true, message: '维修类型不能为空', trigger: 'blur' } ] } } diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairplan/CopyAddDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairplan/CopyAddDialog.vue index 1d129080..cc4bd320 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepairplan/CopyAddDialog.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepairplan/CopyAddDialog.vue @@ -68,7 +68,25 @@ - + + + + + + + + @@ -137,7 +155,7 @@ import CRUD, { crud } from '@crud/crud' export default { name: 'AddDialog', - dicts: ['EM_DEVICE_WX_CYCLE'], + dicts: ['EM_DEVICE_WX_CYCLE', 'EM_DEVICE_WX_TYPE'], components: { ItemDialog, DeviceDialog }, mixins: [crud()], props: { diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue index e61067b4..1443dfe2 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue @@ -73,6 +73,23 @@ /> + + + + + @@ -111,6 +128,7 @@ + @@ -153,7 +171,7 @@ import CopyAddDialog from '@/views/wms/sb/repair/devicerepairplan/CopyAddDialog' export default { name: 'Devicerepairplanmst', - dicts: ['EM_DEVICE_WX_CYCLE', 'IS_OR_NOT'], + dicts: ['EM_DEVICE_WX_CYCLE', 'IS_OR_NOT', 'EM_DEVICE_WX_TYPE'], components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect, CopyAddDialog }, mixins: [presenter(), header(), crud()], cruds() { @@ -228,6 +246,9 @@ export default { formatMainName(row, cloum) { return this.dict.label.EM_DEVICE_WX_CYCLE[row.maintenancecycle] }, + formatRepairpType(row, cloum) { + return this.dict.label.EM_DEVICE_WX_TYPE[row.repair_type] + }, loadClass({ action, parentNode, callback }) { if (action === LOAD_CHILDREN_OPTIONS) { crudClassstandard.getClass({ pid: parentNode.id }).then(res => {