From 585e03701874d77638d47f14cec9f8dd3fa0f6bd Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 16 Sep 2022 11:11:02 +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 309248 -> 309760 bytes .../rest/DevicerepairrequestController.java | 8 ++ .../service/DevicerepairrequestService.java | 9 ++ .../service/dto/DevicerepairrequestDto.java | 3 + .../impl/DevicerepairmstServiceImpl.java | 3 +- .../impl/DevicerepairrequestServiceImpl.java | 43 ++++++- .../wql/EM_BI_DEVICEREPAIRREQUEST001.wql | 57 +++++++++ .../repair/devicerepairpa/ExecuteDialog.vue | 20 ++-- .../sb/repair/devicerepairpa/StartDialog.vue | 111 ++++++++++++++++++ .../wms/sb/repair/devicerepairpa/index.vue | 46 ++++---- .../views/wms/sb/repair/devicevprs/index.vue | 53 ++++++++- .../wms/sb/upkeep/devicemaintenance/index.vue | 2 +- 12 files changed, 322 insertions(+), 33 deletions(-) create mode 100644 mes/qd/src/views/wms/sb/repair/devicerepairpa/StartDialog.vue 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 48515aced0b7180117339e32404dd413516bb249..da1db16ade3284be02d6acbcaf37af652ec9df3b 100644 GIT binary patch delta 21772 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 delta 21821 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 KBNycBo&O)+FCKFM diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairrequestController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairrequestController.java index 1eb11e5d..45f7e57e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairrequestController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairrequestController.java @@ -40,6 +40,14 @@ public class DevicerepairrequestController { return new ResponseEntity<>(devicerepairrequestService.queryAll(whereJson, page), HttpStatus.OK); } + @GetMapping("/query2") + @Log("查询设备报修2") + @ApiOperation("查询设备报修2") + //@PreAuthorize("@el.check('devicerepairrequest:list')") + public ResponseEntity query2(@RequestParam Map whereJson, Pageable page) { + return new ResponseEntity<>(devicerepairrequestService.query2(whereJson, page), HttpStatus.OK); + } + @PostMapping @Log("新增设备报修") @ApiOperation("新增设备报修") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/DevicerepairrequestService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/DevicerepairrequestService.java index 698b2941..dc17599f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/DevicerepairrequestService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/DevicerepairrequestService.java @@ -26,6 +26,15 @@ public interface DevicerepairrequestService { */ Map queryAll(Map whereJson, Pageable page); + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map query2(Map whereJson, Pageable page); + /** * 查询所有数据不分页 * diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/dto/DevicerepairrequestDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/dto/DevicerepairrequestDto.java index 6f78ea7c..1bc39b09 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/dto/DevicerepairrequestDto.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/dto/DevicerepairrequestDto.java @@ -80,4 +80,7 @@ public class DevicerepairrequestDto implements Serializable { /** 公司ID */ private Long syscompanyid; + + /** 班组配合人 */ + private String product_person_name; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java index 2cfc0a60..bf9f043e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java @@ -289,6 +289,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { // 1. 更新设备维修单主表 JSONObject jsonReMst = reMstTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").uniqueResult(0); jsonReMst.put("invstatus", "03"); + jsonReMst.put("update_optname", whereJson.getString("update_optname")); jsonReMst.put("real_start_date", DateUtil.now()); reMstTab.update(jsonReMst); // 2.更新设备档案表 @@ -381,7 +382,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { // 1.更新维修主表 JSONObject jsonReMst = reMstTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").uniqueResult(0); - jsonReMst.put("update_optname", whereJson.getString("update_optname")); +// jsonReMst.put("update_optname", whereJson.getString("update_optname")); jsonReMst.put("product_person_name", whereJson.getString("product_person_name")); jsonReMst.put("update_time", DateUtil.now()); reMstTab.update(jsonReMst); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java index d2863b71..846c5ef5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java @@ -8,7 +8,9 @@ import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; import org.nl.exception.BadRequestException; import org.nl.modules.security.service.dto.JwtUserDto; +import org.nl.modules.system.service.DeptService; import org.nl.modules.system.util.CodeUtil; +import org.nl.utils.SpringContextHolder; import org.nl.wms.basedata.master.service.ClassstandardService; import org.nl.wms.sb.repair.service.DevicerepairrequestService; import org.nl.wms.sb.repair.service.dto.DevicerepairrequestDto; @@ -74,6 +76,44 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic return json; } + @Override + public Map query2(Map whereJson, Pageable page) { + DeptService deptService = SpringContextHolder.getBean(DeptService.class); + + String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); + String device_code = MapUtil.getStr(whereJson, "device_code"); + String request_code = MapUtil.getStr(whereJson, "request_code"); + String status = MapUtil.getStr(whereJson, "status"); + String begin_time = MapUtil.getStr(whereJson, "begin_time"); + String end_time = MapUtil.getStr(whereJson, "end_time"); + String class_idStr = (String) whereJson.get("class_idStr"); + + HashMap map = new HashMap<>(); + map.put("flag", "3"); + map.put("begin_time", begin_time); + map.put("end_time", end_time); + map.put("status", status); + if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code","%"+device_code+"%"); + if (ObjectUtil.isNotEmpty(request_code)) map.put("request_code","%"+request_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); + } + // 归属部门 + String dept_id = MapUtil.getStr(whereJson, "dept_id"); + if (!StrUtil.isEmpty(dept_id)) { + String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); + map.put("deptIds", deptIds); + } + JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIRREQUEST001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.create_time DESC"); + return json; + } + @Override public List queryAll(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairrequest"); @@ -176,7 +216,7 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic jsonFile.put("status","20"); fileTab.update(jsonFile); - // 2.更新设备保修单 + // 2.更新设备报修单 JSONObject jsonRequest = requestTab.query("request_id = '" + whereJson.getString("request_id") + "'").uniqueResult(0); jsonRequest.put("is_passed", "1"); jsonRequest.put("status", "02"); @@ -192,6 +232,7 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic jsonReMst.put("devicerecord_id", jsonRequest.get("devicerecord_id")); jsonReMst.put("maintenancecycle", "02"); jsonReMst.put("invstatus", "01"); + jsonReMst.put("product_person_name", jsonRequest.getString("product_person_name")); jsonReMst.put("fault_desc", jsonRequest.getString("fault_desc")); jsonReMst.put("fault_level", jsonRequest.getString("fault_level")); jsonReMst.put("plan_start_date", DateUtil.today()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql index 3e6cc875..2123b895 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql @@ -20,6 +20,7 @@ 输入.request_code TYPEAS s_string 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string + 输入.deptIds TYPEAS f_string [临时表] @@ -107,5 +108,61 @@ ENDPAGEQUERY ENDIF + IF 输入.flag = "3" + PAGEQUERY + SELECT + mst.*, + class.class_name, + file.device_code, + file.device_name, + file.extend_code, + class2.device_faultclass_name, + d1.name AS dept_name, + d2.name AS use_name + FROM + EM_BI_DeviceRepairRequest 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 EM_BI_DeviceFaultClass class2 ON mst.device_faultclass_id = class2.device_faultclass_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' + + OPTION 输入.device_code <> "" + (file.device_code like 输入.device_code or + file.device_name like 输入.device_code) + ENDOPTION + + OPTION 输入.request_code <> "" + (mst.request_code like 输入.request_code or + mst.request_code like 输入.request_code) + ENDOPTION + + OPTION 输入.classIds <> "" + class.class_id in 输入.classIds + ENDOPTION + + OPTION 输入.deptIds <> "" + d1.dept_id in 输入.deptIds + ENDOPTION + + OPTION 输入.status <> "" + mst.status = 输入.status + ENDOPTION + + OPTION 输入.begin_time <> "" + mst.create_time >= 输入.begin_time + ENDOPTION + + OPTION 输入.end_time <> "" + mst.create_time <= 输入.end_time + ENDOPTION + + ENDSELECT + ENDPAGEQUERY + ENDIF + diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/ExecuteDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/ExecuteDialog.vue index 852df758..6eff7242 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/ExecuteDialog.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/ExecuteDialog.vue @@ -8,12 +8,13 @@ destroy-on-close @close="close" > - - + + - + + 结束维修 保存 关闭 @@ -65,7 +66,7 @@ - + @@ -169,14 +170,19 @@ export default { }, submitMain() { const data = this.form - if (this.form.update_optname === '') { - return this.crud.notify('维修人不能为空', CRUD.NOTIFICATION_TYPE.INFO) - } crudDevicerepairmst.submitRepair(data).then(res => { this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() this.dialogVisible = false }) + }, + endRepair() { + const data = this.form + crudDevicerepairmst.endRepair(data).then(res => { + this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.toQuery() + this.dialogVisible = false + }) } } } diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/StartDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/StartDialog.vue new file mode 100644 index 00000000..a1e38ae6 --- /dev/null +++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/StartDialog.vue @@ -0,0 +1,111 @@ + + + + diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue index 2d1d304e..bdaa0c87 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue @@ -89,7 +89,7 @@ > 开始维修 - 维修执行 + --> + + 维修领用 结束维修 - - 维修领用 - - 维修确认 + 班组验收 + @@ -197,11 +198,12 @@ import crudMaterialbase from '@/api/wms/basedata/master/materialbase' import ExecuteDialog from '@/views/wms/sb/repair/devicerepairpa/ExecuteDialog' import resuftDialog from '@/views/wms/sb/repair/devicerepairpa/resuftDialog' import ReceiveDialog from '@/views/wms/sb/repair/devicerepairpa/ReceiveDialog' +import StartDialog from '@/views/wms/sb/repair/devicerepairpa/StartDialog' export default { name: 'Devicerepairpa', dicts: ['EM_DEVICE_WX_INVTYPE', 'EM_DEVICE_WX_INVSTATUS', 'EM_FAULT_LEVEL'], - components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect, ExecuteDialog, resuftDialog, ReceiveDialog }, + components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect, ExecuteDialog, resuftDialog, ReceiveDialog, StartDialog }, mixins: [presenter(), header(), crud()], cruds() { return CRUD({ @@ -234,6 +236,7 @@ export default { executeDialog: false, resuftDialog: false, receiveDialog: false, + startDialog: false, permission: { } } @@ -300,18 +303,19 @@ export default { if (data.invstatus !== '02') { return this.crud.notify('只能对提交状态的单据维修', CRUD.NOTIFICATION_TYPE.INFO) } - crudDevicerepairmst.startRepair(data).then(res => { - this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) - this.crud.toQuery() - }) + this.openParam = data + this.startDialog = true }, endRepair() { const _selectData = this.$refs.table.selection const data = _selectData[0] if (data.invstatus === '03' || data.invstatus === '05') { - crudDevicerepairmst.endRepair(data).then(res => { - this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) - this.crud.toQuery() + crudDevicerepairmst.getDtl(data).then(res => { + this.openParam = { + 'form': data, + 'tableData': res + } + this.executeDialog = true }) } else { return this.crud.notify('只能对开始或者委外验收的单据结束维修', CRUD.NOTIFICATION_TYPE.INFO) diff --git a/mes/qd/src/views/wms/sb/repair/devicevprs/index.vue b/mes/qd/src/views/wms/sb/repair/devicevprs/index.vue index 4f4e6593..73a1dfe1 100644 --- a/mes/qd/src/views/wms/sb/repair/devicevprs/index.vue +++ b/mes/qd/src/views/wms/sb/repair/devicevprs/index.vue @@ -20,6 +20,15 @@ placeholder="请选择" /> + + + + + + + + + + + @@ -187,8 +204,9 @@ import crudMaterialbase from '@/api/wms/basedata/master/materialbase' import PicDialog from '@/views/wms/sb/repair/devicerepairrequest/PicDialog' import DeviceDialog from '@/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog' import FaultDialog from '@/views/wms/sb/repair/devicevprs/FaultDialog' +import { getDepts } from '@/api/system/dept' -const defaultForm = { device_faultclass_name: null, device_code: null, request_id: null, request_code: null, devicerecord_id: null, fault_time: null, device_faultclass_id: null, fault_desc: null, fault_level: null, remark: null, status: null, create_id: null, create_name: null, create_time: null, is_passed: null, process_id: null, process_name: null, process_time: null, finish_id: null, finish_name: null, finish_time: null, is_delete: null, sysdeptid: null, syscompanyid: null } +const defaultForm = { product_person_name: null, device_faultclass_name: null, device_code: null, request_id: null, request_code: null, devicerecord_id: null, fault_time: null, device_faultclass_id: null, fault_desc: null, fault_level: null, remark: null, status: null, create_id: null, create_name: null, create_time: null, is_passed: null, process_id: null, process_name: null, process_time: null, finish_id: null, finish_name: null, finish_time: null, is_delete: null, sysdeptid: null, syscompanyid: null } export default { name: 'Devicevprs', dicts: ['EM_FAULT_LEVEL'], @@ -197,7 +215,7 @@ export default { cruds() { return CRUD({ title: '设备报修', - url: 'api/devicerepairrequest', + url: 'api/devicerepairrequest/query2', idField: 'request_id', sort: 'request_id,desc', crudMethod: { ...crudDevicerepairrequest }, @@ -216,6 +234,7 @@ export default { faultDialog: false, classes: [], class_idStr: null, + depts: [], materOpt_code: '23', statusList: [ { 'label': '生成', 'value': '01' }, @@ -234,6 +253,9 @@ export default { ], fault_level: [ { required: true, message: '故障等级不能为空', trigger: 'blur' } + ], + product_person_name: [ + { required: true, message: '班组配合人不能为空', trigger: 'blur' } ] } } @@ -248,6 +270,7 @@ export default { this.crud.toQuery() this.queryClassId() }) + this.getDepts() }, methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 @@ -350,6 +373,32 @@ export default { tableChanged(row) { this.form.device_faultclass_id = row.device_faultclass_id this.form.device_faultclass_name = row.device_faultclass_name + }, + // 获取弹窗内部门数据 + loadDepts({ action, parentNode, callback }) { + if (action === LOAD_CHILDREN_OPTIONS) { + getDepts({ enabled: true, pid: parentNode.id }).then(res => { + parentNode.children = res.content.map(function(obj) { + if (obj.hasChildren) { + obj.children = null + } + return obj + }) + setTimeout(() => { + callback() + }, 200) + }) + } + }, + getDepts() { + getDepts({ enabled: true }).then(res => { + this.depts = res.content.map(function(obj) { + if (obj.hasChildren) { + obj.children = null + } + return obj + }) + }) } } } 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 c129d874..4c8e36b2 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue @@ -98,7 +98,7 @@ :disabled="crud.selections.length !== 1" @click="createExcel" > - 生成设备保养 + 生成保养单