root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:设备报修添加手持

Browse Source
This commit is contained in:
zhangzhiqiang
2023-11-08 17:22:52 +08:00
parent 4c0128e1e7
commit e218f447a1
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairrequestServiceImpl.java
View File

@@ -214,7 +214,7 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic
WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairrequest"); WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairrequest");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json); wo.insert(json);
MsgUtil.sendMsg("lms报修提醒:报修人"+dto.getCreate_name()+",报修单"+dto.getRequest_code()+"故障描述"+dto.getFault_desc() ,MsgUtil.MsgSend.FS); // MsgUtil.sendMsg("lms报修提醒:报修人"+dto.getCreate_name()+",报修单"+dto.getRequest_code()+"故障描述"+dto.getFault_desc() ,MsgUtil.MsgSend.FS);
} }
@Override @Override

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenanceplanmstController.java
View File

@@ -8,8 +8,10 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.common.anno.Log; import org.nl.common.anno.Log;
import org.nl.common.utils.MapOf;
import org.nl.common.utils.RedissonUtils; import org.nl.common.utils.RedissonUtils;
import org.nl.wms.device_manage.upkeep.service.DevicemaintenanceplanmstService; import org.nl.wms.device_manage.upkeep.service.DevicemaintenanceplanmstService;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@@ -44,6 +46,14 @@ public class DevicemaintenanceplanmstController {
return new ResponseEntity<>(devicemaintenanceplanmstService.queryDevice(whereJson, page), HttpStatus.OK); return new ResponseEntity<>(devicemaintenanceplanmstService.queryDevice(whereJson, page), HttpStatus.OK);
} }
@PostMapping("/queryDevice3")
@ApiOperation("查询设备档案2")
public ResponseEntity<Object> queryDevice3(@RequestBody JSONObject whereJson) {
PageRequest pageRequest =PageRequest.of(whereJson.getInteger("page"), whereJson.getInteger("size"));
Map<String, Object> stringObjectMap = devicemaintenanceplanmstService.queryDevice2(whereJson, pageRequest);
return new ResponseEntity<>(MapOf.of("data",stringObjectMap.get("content"),"totalCount",stringObjectMap.get("totalElements")), HttpStatus.OK);
}
@GetMapping("/queryDevice2") @GetMapping("/queryDevice2")
@ApiOperation("查询设备档案2") @ApiOperation("查询设备档案2")
public ResponseEntity<Object> queryDevice2(@RequestParam Map whereJson, Pageable page) { public ResponseEntity<Object> queryDevice2(@RequestParam Map whereJson, Pageable page) {

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicefaultclassController.java
View File

@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.MapOf;
import org.nl.wms.masterdata_manage.em.service.DevicefaultclassService; import org.nl.wms.masterdata_manage.em.service.DevicefaultclassService;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@@ -37,6 +38,15 @@ public class DevicefaultclassController {
return new ResponseEntity<>(devicefaultclassService.queryAll(whereJson, page), HttpStatus.OK); return new ResponseEntity<>(devicefaultclassService.queryAll(whereJson, page), HttpStatus.OK);
} }
@PostMapping("/dtl3")
@ApiOperation("查询设备故障分类维护")
//@PreAuthorize("@el.check('devicefaultclass:list')")
public ResponseEntity<Object> querydtl3(@RequestParam Map whereJson, Pageable page) {
Map<String, Object> stringObjectMap = devicefaultclassService.queryAll(whereJson, page);
return new ResponseEntity<>(MapOf.of("data",stringObjectMap.get("content"),"totalCount",stringObjectMap.get("totalElements")), HttpStatus.OK);
}
@PostMapping @PostMapping
@ApiOperation("新增设备故障分类维护") @ApiOperation("新增设备故障分类维护")
//@PreAuthorize("@el.check('devicefaultclass:add')") //@PreAuthorize("@el.check('devicefaultclass:add')")