From 5e3a5586c6fb2e3e264c946a021276cbea12d7a7 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Fri, 3 Nov 2023 13:35:22 +0800 Subject: [PATCH] add:working material --- .../rest/DevicelubricatemstController.java | 13 +++++++++---- .../repair/rest/DevicerepairmstController.java | 12 +++++++++--- .../impl/DevicerepairrequestServiceImpl.java | 2 ++ .../rest/DevicesportcheckmstController.java | 13 +++++++++---- .../upkeep/rest/DevicemaintenancemstController.java | 13 +++++++++---- .../impl/DevicemaintenanceplanmstServiceImpl.java | 4 +++- .../upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN_01.wql | 5 +++++ 7 files changed, 46 insertions(+), 16 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricatemstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricatemstController.java index ad0a5732..4f6159fc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricatemstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricatemstController.java @@ -7,6 +7,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.TableDataInfo; import org.nl.common.utils.SecurityUtils; import org.nl.wms.device_manage.lubricate.service.DevicelubricatemstService; import org.springframework.data.domain.Pageable; @@ -34,11 +36,14 @@ public class DevicelubricatemstController { public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicelubricatemstService.queryAll(whereJson, page), HttpStatus.OK); } - @GetMapping("/byuser") + @RequestMapping("/byuser") @ApiOperation("润滑单维护查询") public ResponseEntity querybyuser(@RequestParam Map whereJson, Pageable page) { - whereJson.put("update_optname", SecurityUtils.getCurrentNickName()); - whereJson.put("invstatus", "03"); + String currentNickName = SecurityUtils.getCurrentNickName(); + + if (!StringUtils.isEmpty(currentNickName) && !currentNickName.equals("管理员")){ + whereJson.put("update_optname", currentNickName); + } whereJson.put("invstatus", "03"); return new ResponseEntity<>(devicelubricatemstService.queryAll(whereJson, page), HttpStatus.OK); } @@ -86,7 +91,7 @@ public class DevicelubricatemstController { @PostMapping("/getDtl") @ApiOperation("获取明细") public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(devicelubricatemstService.getDtl(whereJson),HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(devicelubricatemstService.getDtl(whereJson)),HttpStatus.OK); } @PostMapping("/putIn") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java index beb6530f..2fdb7f40 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java @@ -7,6 +7,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.utils.RedissonUtils; import org.nl.common.utils.SecurityUtils; @@ -39,14 +41,18 @@ public class DevicerepairmstController { public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicerepairmstService.queryAll(whereJson, page), HttpStatus.OK); } - @GetMapping("/byuser") + @RequestMapping("/byuser") @ApiOperation("查询维修单维护") public ResponseEntity querybyuser(@RequestParam Map whereJson, Pageable page) { - whereJson.put("update_optname", SecurityUtils.getCurrentNickName()); + String currentNickName = SecurityUtils.getCurrentNickName(); + if (!StringUtils.isEmpty(currentNickName) && !currentNickName.equals("管理员")){ + whereJson.put("update_optname", currentNickName); + } whereJson.put("invstatus", "03"); return new ResponseEntity<>(devicerepairmstService.queryAll(whereJson, page), HttpStatus.OK); } + @GetMapping("/query") @ApiOperation("查询维修单维护2") public ResponseEntity query2(@RequestParam Map whereJson, Pageable page) { @@ -108,7 +114,7 @@ public class DevicerepairmstController { @ApiOperation("编辑时获取明细") @PostMapping("/getDtl") public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(devicerepairmstService.getDtl(whereJson),HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(devicerepairmstService.getDtl(whereJson)),HttpStatus.OK); } @ApiOperation("提交") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairrequestServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairrequestServiceImpl.java index 11d7db36..48aa719f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairrequestServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairrequestServiceImpl.java @@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.utils.MsgUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; @@ -213,6 +214,7 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairrequest"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.insert(json); + MsgUtil.sendMsg("lms报修提醒:报修人"+dto.getCreate_name()+",报修单"+dto.getRequest_code()+"故障描述"+dto.getFault_desc() ,MsgUtil.MsgSend.FS); } @Override diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckmstController.java index 16e01d78..74118b35 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckmstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckmstController.java @@ -7,6 +7,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.TableDataInfo; import org.nl.common.utils.SecurityUtils; import org.nl.wms.device_manage.sportcheck.service.DevicesportcheckmstService; import org.springframework.data.domain.Pageable; @@ -35,11 +37,14 @@ public class DevicesportcheckmstController { return new ResponseEntity<>(devicesportcheckmstService.queryAll(whereJson, page), HttpStatus.OK); } - @GetMapping("/byuser") + @RequestMapping("/byuser") @ApiOperation("查询人员点检单") public ResponseEntity querybyuser(@RequestParam Map whereJson, Pageable page) { - whereJson.put("update_optname", SecurityUtils.getCurrentNickName()); - whereJson.put("invstatus", "03"); + String currentNickName = SecurityUtils.getCurrentNickName(); + + if (!StringUtils.isEmpty(currentNickName) && !currentNickName.equals("管理员")){ + whereJson.put("update_optname", currentNickName); + } whereJson.put("invstatus", "03"); return new ResponseEntity<>(devicesportcheckmstService.queryAll(whereJson, page), HttpStatus.OK); } @@ -87,7 +92,7 @@ public class DevicesportcheckmstController { @PostMapping("/getDtl") @ApiOperation("获取明细") public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(devicesportcheckmstService.getDtl(whereJson),HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(devicesportcheckmstService.getDtl(whereJson)),HttpStatus.OK); } @PostMapping("/putIn") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java index f3989ddf..1f0e4626 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java @@ -7,6 +7,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.TableDataInfo; import org.nl.common.utils.SecurityUtils; import org.nl.wms.device_manage.upkeep.service.DevicemaintenancemstService; import org.springframework.data.domain.Pageable; @@ -35,11 +37,14 @@ public class DevicemaintenancemstController { public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicemaintenancemstService.queryAll(whereJson, page), HttpStatus.OK); } - @GetMapping("/byuser") + @RequestMapping("/byuser") @ApiOperation("保养单维护查询") public ResponseEntity querybyuser(@RequestParam Map whereJson, Pageable page) { - whereJson.put("update_optname", SecurityUtils.getCurrentNickName()); - whereJson.put("invstatus", "03"); + String currentNickName = SecurityUtils.getCurrentNickName(); + + if (!StringUtils.isEmpty(currentNickName) && !currentNickName.equals("管理员")){ + whereJson.put("update_optname", currentNickName); + } whereJson.put("invstatus", "03"); return new ResponseEntity<>(devicemaintenancemstService.queryAll(whereJson, page), HttpStatus.OK); } @@ -87,7 +92,7 @@ public class DevicemaintenancemstController { @PostMapping("/getDtl") @ApiOperation("获取明细") public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(devicemaintenancemstService.getDtl(whereJson),HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(devicemaintenancemstService.getDtl(whereJson)),HttpStatus.OK); } @PostMapping("/putIn") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java index e6fddfad..b0501730 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java @@ -297,7 +297,9 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); map.put("deptIds", deptIds); } - + if (!StrUtil.isEmpty(MapUtil.getStr(whereJson, "material_type_id"))) { + map.put("material_type_id", MapUtil.getStr(whereJson, "material_type_id")); + } String use_id = MapUtil.getStr(whereJson, "use_id"); if (!StrUtil.isEmpty(use_id)) { String useIds = deptService.getChildIdStr(Long.parseLong(use_id)); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN_01.wql index 9002f84b..f445ba5a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN_01.wql @@ -21,6 +21,7 @@ 输入.device_code TYPEAS s_string 输入.maintenancecycle TYPEAS s_string 输入.maint_plan_id TYPEAS s_string + 输入.material_type_id TYPEAS s_string 输入.maint_plan_code TYPEAS s_string 输入.is_active TYPEAS s_string 输入.begin_time TYPEAS s_string @@ -183,6 +184,10 @@ file.device_name like 输入.device_code) ENDOPTION + OPTION 输入.material_type_id <> "" + file.material_type_id = 输入.material_type_id + ENDOPTION + OPTION 输入.deptIds <> "" d1.dept_id in 输入.deptIds ENDOPTION