From 3f122e3c2add14abaa17f811c7baed6887b16e31 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 28 Sep 2022 16:14:41 +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 --- .../nl/wms/sb/auToTask/AutoCreateUpkeep.java | 4 + .../rest/DevicemaintenancemstController.java | 24 +- .../service/DevicemaintenancemstService.java | 18 + .../impl/DevicemaintenancemstServiceImpl.java | 70 ++++ .../DevicemaintenanceplanmstServiceImpl.java | 5 + .../upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql | 234 +++++++++++ .../wql/EM_BIDEVICEMAINTENANCEPLAN001.wql | 5 + .../sb/upkeep/devicemaintenance/AddDialog.vue | 42 +- .../wms/sb/upkeep/devicemaintenance/index.vue | 6 +- .../devicemaintenancegrid/AddDialog.vue | 311 ++++++++++++++ .../sb/upkeep/devicemaintenancegrid/index.vue | 277 +++++++++++++ .../sb/upkeep/devicemaintenancepa/index.vue | 27 +- .../devicemaintenancepagrid/ExecuteDialog.vue | 228 +++++++++++ .../devicemaintenancepagrid/StartDialog.vue | 111 +++++ .../upkeep/devicemaintenancepagrid/index.vue | 380 ++++++++++++++++++ .../devicemaintenanceplan/AddDialog.vue | 32 +- .../devicemaintenanceplan/CopyAddDialog.vue | 31 +- .../devicemaintenanceplan/ItemDialog.vue | 9 +- .../sb/upkeep/devicemaintenanceplan/index.vue | 22 +- 19 files changed, 1812 insertions(+), 24 deletions(-) create mode 100644 mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/AddDialog.vue create mode 100644 mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/index.vue create mode 100644 mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/ExecuteDialog.vue create mode 100644 mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue create mode 100644 mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/index.vue diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/auToTask/AutoCreateUpkeep.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/auToTask/AutoCreateUpkeep.java index ca1aa05e..043dd6e3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/auToTask/AutoCreateUpkeep.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/auToTask/AutoCreateUpkeep.java @@ -60,6 +60,7 @@ public class AutoCreateUpkeep { param.put("plan_start_date",jsonPlanMst.getString("plan_start_date")); param.put("source_bill_id",jsonPlanMst.getString("maint_plan_id")); param.put("source_bill_code",jsonPlanMst.getString("maint_plan_code")); + param.put("maint_object",jsonPlanMst.getString("maint_object")); // 计算 当前日期 - 保养计划日期 后的天数 String num = String.valueOf(NumberUtil.sub(today, plan_start_date)); @@ -96,6 +97,8 @@ public class AutoCreateUpkeep { param.put("plan_start_date",jsonPlanMst.getString("plan_start_date")); param.put("source_bill_id",jsonPlanMst.getString("maint_plan_id")); param.put("source_bill_code",jsonPlanMst.getString("maint_plan_code")); + param.put("maint_object",jsonPlanMst.getString("maint_object")); + // 计算 当前日期 - 保养实际结束 后的天数 String num = String.valueOf(NumberUtil.sub(today, rep_real_end_date)); @@ -152,6 +155,7 @@ public class AutoCreateUpkeep { jsonMainMst.put("maintenancecycle",json.getString("maintenancecycle")); jsonMainMst.put("invstatus","01"); jsonMainMst.put("plan_start_date",json.getString("plan_start_date")); + jsonMainMst.put("maint_object",json.getString("maint_object")); jsonMainMst.put("detail_count",planDtlArr.size()); jsonMainMst.put("source_bill_id",json.get("source_bill_id")); jsonMainMst.put("source_bill_type","BYJH"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenancemstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenancemstController.java index 78f276d2..f1c9c201 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenancemstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenancemstController.java @@ -35,8 +35,8 @@ public class DevicemaintenancemstController { private final DevicemaintenancemstService devicemaintenancemstService; @GetMapping - @Log("查询设备保养单") - @ApiOperation("查询设备保养单") + @Log("查询设备保养单(维修班)") + @ApiOperation("查询设备保养单(维修班)") //@PreAuthorize("@el.check('devicemaintenancemst:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicemaintenancemstService.queryAll(whereJson, page), HttpStatus.OK); @@ -52,13 +52,29 @@ public class DevicemaintenancemstController { @GetMapping("query3") - @Log("查询设备保养单") - @ApiOperation("查询设备保养单") + @Log("查询设备保养单填报（维修班）") + @ApiOperation("查询设备保养单填报（维修班）") //@PreAuthorize("@el.check('devicemaintenancemst:list')") public ResponseEntity query3(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicemaintenancemstService.query3(whereJson, page), HttpStatus.OK); } + @GetMapping("query4") + @Log("查询设备保养单(班组)") + @ApiOperation("查询设备保养单(班组)") + //@PreAuthorize("@el.check('devicemaintenancemst:list')") + public ResponseEntity query4(@RequestParam Map whereJson, Pageable page) { + return new ResponseEntity<>(devicemaintenancemstService.query4(whereJson, page), HttpStatus.OK); + } + + @GetMapping("query5") + @Log("查询设备保养单填报（班组）") + @ApiOperation("查询设备保养单填报（班组）") + //@PreAuthorize("@el.check('devicemaintenancemst:list')") + public ResponseEntity query5(@RequestParam Map whereJson, Pageable page) { + return new ResponseEntity<>(devicemaintenancemstService.query5(whereJson, page), HttpStatus.OK); + } + @PostMapping @Log("新增设备保养单") @ApiOperation("新增设备保养单") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/DevicemaintenancemstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/DevicemaintenancemstService.java index 931b2141..471f9648 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/DevicemaintenancemstService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/DevicemaintenancemstService.java @@ -146,4 +146,22 @@ public interface DevicemaintenancemstService { * @return Map */ Map query3(Map whereJson, Pageable page); + + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map query4(Map whereJson, Pageable page); + + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map query5(Map whereJson, Pageable page); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java index c7426911..0e26f3b6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java @@ -169,6 +169,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle")); jsonMst.put("invstatus", "01"); jsonMst.put("plan_start_date", whereJson.getString("plan_start_date")); + jsonMst.put("maint_object", whereJson.getString("maint_object")); jsonMst.put("detail_count", tableData.size()); jsonMst.put("input_optid", currentUserId); jsonMst.put("input_optname", nickName); @@ -203,6 +204,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ jsonMst.put("devicerecord_id", whereJson.get("devicerecord_id")); jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle")); jsonMst.put("plan_start_date", whereJson.getString("plan_start_date")); + jsonMst.put("maint_object", whereJson.getString("maint_object")); jsonMst.put("detail_count", tableData.size()); mstTab.update(jsonMst); @@ -531,6 +533,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ String invstatus = MapUtil.getStr(whereJson, "invstatus"); String begin_time = MapUtil.getStr(whereJson, "begin_time"); String end_time = MapUtil.getStr(whereJson, "end_time"); + String maint_object = MapUtil.getStr(whereJson, "maint_object"); HashMap map = new HashMap<>(); map.put("flag", "4"); @@ -538,6 +541,39 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ map.put("invstatus", invstatus); map.put("begin_time", begin_time); map.put("end_time", end_time); + map.put("maint_object", maint_object); + if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%"); + if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%"); + //处理物料当前节点的所有子节点 + if (!StrUtil.isEmpty(material_type_id)) { + map.put("material_type_id", material_type_id); + String classIds = classstandardService.getChildIdStr(material_type_id); + map.put("classIds", classIds); + } else if (ObjectUtil.isNotEmpty(class_idStr)) { + String classIds = classstandardService.getAllChildIdStr(class_idStr); + map.put("classIds", classIds); + } + JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time DESC"); + return json; + } + + @Override + public Map query4(Map whereJson, Pageable page) { + String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); + String class_idStr = MapUtil.getStr(whereJson, "class_idStr"); + String device_code = MapUtil.getStr(whereJson, "device_code"); + String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle"); + String maint_code = MapUtil.getStr(whereJson, "maint_code"); + String invstatus = MapUtil.getStr(whereJson, "invstatus"); + String begin_time = MapUtil.getStr(whereJson, "begin_time"); + String end_time = MapUtil.getStr(whereJson, "end_time"); + + HashMap map = new HashMap<>(); + map.put("flag", "5"); + map.put("maintenancecycle", maintenancecycle); + map.put("invstatus", invstatus); + map.put("begin_time", begin_time); + map.put("end_time", end_time); if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%"); if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%"); //处理物料当前节点的所有子节点 @@ -553,4 +589,38 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ return json; } + @Override + public Map query5(Map whereJson, Pageable page) { + String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); + String class_idStr = MapUtil.getStr(whereJson, "class_idStr"); + String device_code = MapUtil.getStr(whereJson, "device_code"); + String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle"); + String maint_code = MapUtil.getStr(whereJson, "maint_code"); + String invstatus = MapUtil.getStr(whereJson, "invstatus"); + String begin_time = MapUtil.getStr(whereJson, "begin_time"); + String end_time = MapUtil.getStr(whereJson, "end_time"); + String maint_object = MapUtil.getStr(whereJson, "maint_object"); + + HashMap map = new HashMap<>(); + map.put("flag", "6"); + map.put("maintenancecycle", maintenancecycle); + map.put("invstatus", invstatus); + map.put("begin_time", begin_time); + map.put("end_time", end_time); + map.put("maint_object", maint_object); + if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%"); + if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%"); + //处理物料当前节点的所有子节点 + if (!StrUtil.isEmpty(material_type_id)) { + map.put("material_type_id", material_type_id); + String classIds = classstandardService.getChildIdStr(material_type_id); + map.put("classIds", classIds); + } else if (ObjectUtil.isNotEmpty(class_idStr)) { + String classIds = classstandardService.getAllChildIdStr(class_idStr); + map.put("classIds", classIds); + } + JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time DESC"); + return json; + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java index dbd0806a..1798597f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java @@ -56,6 +56,7 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla String is_active = MapUtil.getStr(whereJson, "is_active"); String begin_time = MapUtil.getStr(whereJson, "begin_time"); String end_time = MapUtil.getStr(whereJson, "end_time"); + String maint_object = MapUtil.getStr(whereJson, "maint_object"); String class_idStr = (String) whereJson.get("class_idStr"); HashMap map = new HashMap<>(); @@ -64,6 +65,7 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla map.put("is_active", is_active); map.put("begin_time", begin_time); map.put("end_time", end_time); + map.put("maint_object", maint_object); if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code","%"+device_code+"%"); if (ObjectUtil.isNotEmpty(maint_plan_code)) map.put("maint_plan_code","%"+maint_plan_code+"%"); //处理物料当前节点的所有子节点 @@ -132,6 +134,7 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla jsonMst.put("devicerecord_id", whereJson.getString("devicerecord_id")); jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle")); jsonMst.put("plan_start_date", whereJson.getString("plan_start_date")); + jsonMst.put("maint_object", whereJson.getString("maint_object")); jsonMst.put("detail_count", tableData.size()); jsonMst.put("create_id", currentUserId); jsonMst.put("create_name", nickName); @@ -174,6 +177,7 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla jsonMst.put("devicerecord_id", whereJson.getString("devicerecord_id")); jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle")); jsonMst.put("plan_start_date", whereJson.getString("plan_start_date")); + jsonMst.put("maint_object", whereJson.getString("maint_object")); jsonMst.put("detail_count", tableData.size()); jsonMst.put("update_optid", currentUserId); jsonMst.put("update_optname", nickName); @@ -334,6 +338,7 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla jsonMst.put("devicerecord_id", whereJson.getString("devicerecord_id")); jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle")); jsonMst.put("plan_start_date", whereJson.getString("plan_start_date")); + jsonMst.put("maint_object", whereJson.getString("maint_object")); jsonMst.put("detail_count", tableData.size()); jsonMst.put("create_id", currentUserId); jsonMst.put("create_name", nickName); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql index 209e97c5..c408ce44 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql @@ -22,6 +22,7 @@ 输入.invstatus TYPEAS s_string 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string + 输入.maint_object TYPEAS s_string [临时表] @@ -65,6 +66,7 @@ WHERE mst.is_delete = '0' AND file.is_delete = '0' + AND mst.maint_object = '02' OPTION 输入.device_code <> "" (file.device_code like 输入.device_code or @@ -193,6 +195,7 @@ WHERE mst.is_delete = '0' AND file.is_delete = '0' + AND mst.maint_object = '02' AND mst.invstatus not in ('01') OPTION 输入.device_code <> "" @@ -213,6 +216,237 @@ mst.maintenancecycle = 输入.maintenancecycle ENDOPTION + OPTION 输入.maint_object <> "" + mst.maint_object = 输入.maint_object + ENDOPTION + + OPTION 输入.begin_time <> "" + mst.plan_start_date >= 输入.begin_time + ENDOPTION + + OPTION 输入.end_time <> "" + mst.plan_start_date <= 输入.end_time + ENDOPTION + + OPTION 输入.invstatus <> "" + mst.invstatus = 输入.invstatus + ENDOPTION + + UNION + + SELECT + mst.*, + class.class_name, + file.device_code, + file.device_name, + file.extend_code, + d1.name AS dept_name, + d2.name AS use_name + FROM + EM_BI_DeviceMaintenanceMst mst + LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id + LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id + LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id + LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id + WHERE + mst.is_delete = '0' + AND file.is_delete = '0' + AND mst.maint_object = '01' + AND mst.invstatus in ('04') + + OPTION 输入.device_code <> "" + (file.device_code like 输入.device_code or + file.device_name like 输入.device_code) + ENDOPTION + + OPTION 输入.maint_code <> "" + (mst.maint_code like 输入.maint_code or + mst.maint_code like 输入.maint_code) + ENDOPTION + + OPTION 输入.classIds <> "" + class.class_id in 输入.classIds + ENDOPTION + + OPTION 输入.maintenancecycle <> "" + mst.maintenancecycle = 输入.maintenancecycle + ENDOPTION + + OPTION 输入.maint_object <> "" + mst.maint_object = 输入.maint_object + ENDOPTION + + OPTION 输入.begin_time <> "" + mst.plan_start_date >= 输入.begin_time + ENDOPTION + + OPTION 输入.end_time <> "" + mst.plan_start_date <= 输入.end_time + ENDOPTION + + OPTION 输入.invstatus <> "" + mst.invstatus = 输入.invstatus + ENDOPTION + + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "5" + PAGEQUERY + SELECT + mst.*, + class.class_name, + file.device_code, + file.device_name, + file.extend_code, + d1.name AS dept_name, + d2.name AS use_name + FROM + EM_BI_DeviceMaintenanceMst mst + LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id + LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id + LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id + LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id + WHERE + mst.is_delete = '0' + AND file.is_delete = '0' + AND mst.maint_object = '01' + + OPTION 输入.device_code <> "" + (file.device_code like 输入.device_code or + file.device_name like 输入.device_code) + ENDOPTION + + OPTION 输入.maint_code <> "" + (mst.maint_code like 输入.maint_code or + mst.maint_code like 输入.maint_code) + ENDOPTION + + OPTION 输入.classIds <> "" + class.class_id in 输入.classIds + ENDOPTION + + OPTION 输入.maintenancecycle <> "" + mst.maintenancecycle = 输入.maintenancecycle + ENDOPTION + + OPTION 输入.begin_time <> "" + mst.plan_start_date >= 输入.begin_time + ENDOPTION + + OPTION 输入.end_time <> "" + mst.plan_start_date <= 输入.end_time + ENDOPTION + + OPTION 输入.invstatus <> "" + mst.invstatus = 输入.invstatus + ENDOPTION + + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "6" + PAGEQUERY + SELECT + mst.*, + class.class_name, + file.device_code, + file.device_name, + file.extend_code, + d1.name AS dept_name, + d2.name AS use_name + FROM + EM_BI_DeviceMaintenanceMst mst + LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id + LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id + LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id + LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id + WHERE + mst.is_delete = '0' + AND file.is_delete = '0' + AND mst.maint_object = '01' + AND mst.invstatus not in ('01') + + OPTION 输入.device_code <> "" + (file.device_code like 输入.device_code or + file.device_name like 输入.device_code) + ENDOPTION + + OPTION 输入.maint_code <> "" + (mst.maint_code like 输入.maint_code or + mst.maint_code like 输入.maint_code) + ENDOPTION + + OPTION 输入.classIds <> "" + class.class_id in 输入.classIds + ENDOPTION + + OPTION 输入.maintenancecycle <> "" + mst.maintenancecycle = 输入.maintenancecycle + ENDOPTION + + OPTION 输入.maint_object <> "" + mst.maint_object = 输入.maint_object + ENDOPTION + + OPTION 输入.begin_time <> "" + mst.plan_start_date >= 输入.begin_time + ENDOPTION + + OPTION 输入.end_time <> "" + mst.plan_start_date <= 输入.end_time + ENDOPTION + + OPTION 输入.invstatus <> "" + mst.invstatus = 输入.invstatus + ENDOPTION + + UNION + + SELECT + mst.*, + class.class_name, + file.device_code, + file.device_name, + file.extend_code, + d1.name AS dept_name, + d2.name AS use_name + FROM + EM_BI_DeviceMaintenanceMst mst + LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id + LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id + LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id + LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id + WHERE + mst.is_delete = '0' + AND file.is_delete = '0' + AND mst.maint_object = '02' + AND mst.invstatus in ('04') + + OPTION 输入.device_code <> "" + (file.device_code like 输入.device_code or + file.device_name like 输入.device_code) + ENDOPTION + + OPTION 输入.maint_code <> "" + (mst.maint_code like 输入.maint_code or + mst.maint_code like 输入.maint_code) + ENDOPTION + + OPTION 输入.classIds <> "" + class.class_id in 输入.classIds + ENDOPTION + + OPTION 输入.maintenancecycle <> "" + mst.maintenancecycle = 输入.maintenancecycle + ENDOPTION + + OPTION 输入.maint_object <> "" + mst.maint_object = 输入.maint_object + ENDOPTION + OPTION 输入.begin_time <> "" mst.plan_start_date >= 输入.begin_time ENDOPTION diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql index c4f5fdd5..667e75fc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql @@ -25,6 +25,7 @@ 输入.is_active TYPEAS s_string 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string + 输入.maint_object TYPEAS s_string [临时表] @@ -95,6 +96,10 @@ mst.plan_start_date <= 输入.end_time ENDOPTION + OPTION 输入.maint_object <> "" + mst.maint_object = 输入.maint_object + ENDOPTION + ENDSELECT ENDPAGEQUERY ENDIF diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/AddDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/AddDialog.vue index 037358aa..74f41dcf 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/AddDialog.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/AddDialog.vue @@ -20,19 +20,19 @@ - + - + - + - + - + + + + + + + + @@ -118,7 +135,7 @@ - + @@ -126,9 +143,12 @@ const defaultForm = { maint_code: null, + maint_object: null, devicerecord_id: null, maintenancecycle: '02', plan_start_date: null, + material_type_id: null, + device_code: null, tableData: [] } @@ -163,6 +183,9 @@ export default { dialogVisible: false, deviceDialog: false, itemDialog: false, + objectList: [ + { 'label': '维修班', 'value': '02' } + ], rules: { plan_start_date: [ { required: true, message: '计划开始日期不能为空', trigger: 'blur' } @@ -172,6 +195,9 @@ export default { ], devicerecord_id: [ { required: true, message: '设备不能为空', trigger: 'blur' } + ], + maint_object: [ + { required: true, message: '保养对象不能为空', trigger: 'blur' } ] } } @@ -224,6 +250,7 @@ export default { this.deviceDialog = true }, putItem() { + this.openParam = this.form this.itemDialog = true }, tableChanged1(row) { @@ -247,7 +274,8 @@ export default { }, tableChanged2(row) { this.form.devicerecord_id = row.devicerecord_id - this.form.device_code = row.device_code + this.form.material_type_id = row.material_type_id + this.form.device_code = row.device_name + '-' + row.device_code }, delRow(index, rows) { rows.splice(index, 1) diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue index 4c8e36b2..e2d7f75d 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue @@ -115,6 +115,7 @@ + @@ -163,7 +164,7 @@ import {downloadFile} from "@/utils"; export default { name: 'Devicemaintenance', - dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE'], + dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE', 'EM_DEVICE_MAINT_OBJECT'], components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker }, mixins: [presenter(), header(), crud()], cruds() { @@ -210,6 +211,9 @@ export default { hand(value) { this.crud.toQuery() }, + formatMainObject(row, cloum) { + return this.dict.label.EM_DEVICE_MAINT_OBJECT[row.maint_object] + }, formatInvsName(row, cloum) { return this.dict.label.EM_DEVICE_BY_INVSTATUS[row.invstatus] }, diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/AddDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/AddDialog.vue new file mode 100644 index 00000000..52724723 --- /dev/null +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/AddDialog.vue @@ -0,0 +1,311 @@ + + + + + diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/index.vue new file mode 100644 index 00000000..1ca7b6aa --- /dev/null +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/index.vue @@ -0,0 +1,277 @@ + + + + + diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue index cef73cd1..ed7e98f1 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue @@ -73,6 +73,22 @@ /> + + + + + @@ -132,6 +148,7 @@ + @@ -171,7 +188,7 @@ import StartDialog from '@/views/wms/sb/upkeep/devicemaintenancepa/StartDialog' export default { name: 'Devicemaintenancepa', - dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE'], + dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE', 'EM_DEVICE_MAINT_OBJECT'], components: { ExecuteDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker, StartDialog }, mixins: [presenter(), header(), crud()], cruds() { @@ -225,6 +242,9 @@ export default { hand(value) { this.crud.toQuery() }, + formatMainObject(row, cloum) { + return this.dict.label.EM_DEVICE_MAINT_OBJECT[row.maint_object] + }, formatInvsName(row, cloum) { return this.dict.label.EM_DEVICE_BY_INVSTATUS[row.invstatus] }, @@ -331,7 +351,10 @@ export default { if ('01,02,04,05,99'.includes(rows[i].invstatus)) { this.end_flag = true } - if ('01,02,03,05,99'.includes(rows[i].invstatus)) { + // if ('01,02,03,05,99'.includes(rows[i].invstatus)) { + // this.confirm_flag = true + // } + if (rows[i].maint_object !== '01') { this.confirm_flag = true } if (rows.length > 1) { diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/ExecuteDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/ExecuteDialog.vue new file mode 100644 index 00000000..104259e3 --- /dev/null +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/ExecuteDialog.vue @@ -0,0 +1,228 @@ + + + + diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue new file mode 100644 index 00000000..368fb58e --- /dev/null +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue @@ -0,0 +1,111 @@ + + + + diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/index.vue new file mode 100644 index 00000000..18bf8541 --- /dev/null +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/index.vue @@ -0,0 +1,380 @@ + + + + + diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/AddDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/AddDialog.vue index a5d02e88..ed085754 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/AddDialog.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/AddDialog.vue @@ -65,7 +65,24 @@ - + + + + + + + + @@ -133,7 +150,7 @@ - + @@ -141,6 +158,8 @@ const defaultForm = { maint_plan_code: null, + material_type_id: null, + maint_object: null, maint_plan_name: null, devicerecord_id: null, maintenancecycle: null, @@ -157,7 +176,7 @@ import CRUD, { form, crud } from '@crud/crud' export default { name: 'AddDialog', - dicts: ['EM_DEVICE_BY_CYCLE'], + dicts: ['EM_DEVICE_BY_CYCLE', 'EM_DEVICE_MAINT_OBJECT'], components: { ItemDialog, DeviceDialog }, mixins: [form(defaultForm), crud()], props: { @@ -193,6 +212,9 @@ export default { ], devicerecord_id: [ { required: true, message: '设备不能为空', trigger: 'blur' } + ], + maint_object: [ + { required: true, message: '保养对象不能为空', trigger: 'blur' } ] } } @@ -228,6 +250,7 @@ export default { this.deviceDialog = true }, putItem() { + this.openParam = this.form this.itemDialog = true }, formatLevel(row, cloum) { @@ -260,7 +283,8 @@ export default { }, tableChanged2(row) { this.form.devicerecord_id = row.devicerecord_id - this.form.device_code = row.device_code + this.form.device_code = row.device_name + '-' + row.device_code + this.form.material_type_id = row.material_type_id }, delRow(index, rows) { rows.splice(index, 1) diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/CopyAddDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/CopyAddDialog.vue index 81e6309e..a8f18ac4 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/CopyAddDialog.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/CopyAddDialog.vue @@ -68,7 +68,24 @@ - + + + + + + + + @@ -125,7 +142,7 @@ - + @@ -138,7 +155,7 @@ import CRUD, { crud } from '@crud/crud' export default { name: 'CopyAddDialog', - dicts: ['EM_DEVICE_BY_CYCLE'], + dicts: ['EM_DEVICE_BY_CYCLE', 'EM_DEVICE_MAINT_OBJECT'], components: { ItemDialog, DeviceDialog }, mixins: [crud()], props: { @@ -189,6 +206,7 @@ export default { this.crud.toQuery() }, putDevice() { + this.openParam = this.form1 this.deviceDialog = true }, putItem() { @@ -224,12 +242,14 @@ export default { }, tableChanged2(row) { this.form1.devicerecord_id = row.devicerecord_id - this.form1.device_code = row.device_code + this.form1.device_code = row.device_name + '-' + row.device_code + this.form1.material_type_id = row.material_type_id }, delRow(index, rows) { rows.splice(index, 1) }, submit() { + debugger const data = this.form1 if (data.maint_plan_name === null) { return this.crud.notify('计划名称不能为空', CRUD.NOTIFICATION_TYPE.INFO) @@ -243,6 +263,9 @@ export default { if (data.plan_start_date === null) { return this.crud.notify('计划开始日期不能为空', CRUD.NOTIFICATION_TYPE.INFO) } + if (data.maint_object === '') { + return this.crud.notify('保养对象不能为空', CRUD.NOTIFICATION_TYPE.INFO) + } if (data.tableData.length === 0) { return this.crud.notify('明细不能为空', CRUD.NOTIFICATION_TYPE.INFO) } diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/ItemDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/ItemDialog.vue index 8381192d..3168b45b 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/ItemDialog.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/ItemDialog.vue @@ -6,6 +6,7 @@ destroy-on-close width="1000px" @close="close" + @open="open" > { this.class_idStr = res.class_idStr this.crud.query.class_idStr = this.class_idStr - this.crud.toQuery() this.queryClassId() }) }, methods: { + open() { + this.query.material_type_id = this.openParam.material_type_id + this.crud.toQuery() + }, clickChange(item) { this.tableRadio = item }, diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue index 7e44c8c6..d7e6a0e6 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue @@ -73,6 +73,22 @@ /> + + + + + @@ -111,6 +127,7 @@ + @@ -154,7 +171,7 @@ import CopyAddDialog from '@/views/wms/sb/upkeep/devicemaintenanceplan/CopyAddDi export default { name: 'Devicemaintenanceplan', - dicts: ['IS_OR_NOT', 'EM_DEVICE_BY_CYCLE'], + dicts: ['IS_OR_NOT', 'EM_DEVICE_BY_CYCLE', 'EM_DEVICE_MAINT_OBJECT'], components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker, CopyAddDialog }, mixins: [presenter(), header(), crud()], cruds() { @@ -229,6 +246,9 @@ export default { formatMainName(row, cloum) { return this.dict.label.EM_DEVICE_BY_CYCLE[row.maintenancecycle] }, + formatMainObject(row, cloum) { + return this.dict.label.EM_DEVICE_MAINT_OBJECT[row.maint_object] + }, copyAdd() { const _selectData = this.$refs.table.selection const data = {