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

add：设备管理，人员单据

Browse Source
This commit is contained in:
zhangzhiqiang
2023-10-23 14:08:29 +08:00
parent 05bf2e296b
commit c8734d0ac2
21 changed files with 1439 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricatemstController.java
View File

@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.device_manage.lubricate.service.DevicelubricatemstService;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -33,6 +34,13 @@ public class DevicelubricatemstController {
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(devicelubricatemstService.queryAll(whereJson, page), HttpStatus.OK);
}
@GetMapping("/byuser")
@ApiOperation("润滑单维护查询")
public ResponseEntity<Object> querybyuser(@RequestParam Map whereJson, Pageable page) {
whereJson.put("update_optname", SecurityUtils.getCurrentNickName());
whereJson.put("invstatus", "03");
return new ResponseEntity<>(devicelubricatemstService.queryAll(whereJson, page), HttpStatus.OK);
}
@GetMapping("/query")
@ApiOperation("润滑单审核查询")

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricatemstServiceImpl.java
View File

@@ -61,6 +61,7 @@ public class DevicelubricatemstServiceImpl implements DevicelubricatemstService
map.put("invstatus", invstatus);
map.put("begin_time", begin_time);
map.put("end_time", end_time);
map.put("update_optname", MapUtil.getStr(whereJson, "update_optname"));
if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%");
if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%");
//处理物料当前节点的所有子节点

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/wql/EM_BIDEVICELUBRICATE_01.wql
View File

@@ -21,6 +21,7 @@
输入.maint_code TYPEAS s_string
输入.invstatus TYPEAS s_string
输入.begin_time TYPEAS s_string
输入.update_optname TYPEAS s_string
输入.end_time TYPEAS s_string
输入.maint_object TYPEAS s_string
输入.deptIds TYPEAS f_string
@@ -87,6 +88,10 @@
mst.maintenancecycle = 输入.maintenancecycle
ENDOPTION
OPTION 输入.update_optname <> ""
mst.update_optname = 输入.update_optname
ENDOPTION
OPTION 输入.begin_time <> ""
mst.plan_start_date >= 输入.begin_time
ENDOPTION
@@ -281,4 +286,4 @@
ENDSELECT
ENDPAGEQUERY
ENDIF
ENDIF

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java
View File

@@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.anno.Log;
import org.nl.common.utils.RedissonUtils;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.device_manage.repair.service.DevicerepairmstService;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -38,6 +39,13 @@ public class DevicerepairmstController {
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(devicerepairmstService.queryAll(whereJson, page), HttpStatus.OK);
}
@GetMapping("/byuser")
@ApiOperation("查询维修单维护")
public ResponseEntity<Object> querybyuser(@RequestParam Map whereJson, Pageable page) {
whereJson.put("update_optname", SecurityUtils.getCurrentNickName());
whereJson.put("invstatus", "03");
return new ResponseEntity<>(devicerepairmstService.queryAll(whereJson, page), HttpStatus.OK);
}
@GetMapping("/query")
@ApiOperation("查询维修单维护2")

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

@@ -84,6 +84,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
map.put("invstatus",invstatus);
map.put("begin_time",begin_time);
map.put("end_time",end_time);
map.put("update_optname",MapUtil.getStr(whereJson, "update_optname"));
if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code","%"+device_code+"%");
if (ObjectUtil.isNotEmpty(repair_code)) map.put("repair_code","%"+repair_code+"%");
//处理物料当前节点的所有子节点
@@ -428,13 +429,11 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
private void createIos(JSONObject whereJson) {
JSONObject mst = whereJson.getJSONObject("form2");
JSONArray tableDataDtl = mst.getJSONArray("tableDataDtl");
// 准备参数
mst.put("biz_date", DateUtil.now());
mst.put("tableData", tableDataDtl);
mst.put("source_id", whereJson.getString("repair_code"));
mst.put("remark", "由维修单创建");
emBiIostorinvOutService.create(mst);
}

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/wql/EM_BI_DEVICEREPAIR_01.wql
View File

@@ -23,6 +23,7 @@
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
输入.device_bom_id TYPEAS s_string
输入.update_optname TYPEAS s_string
输入.material_id TYPEAS s_string
输入.sparepart_only_id TYPEAS s_string
输入.material_code TYPEAS s_string
@@ -95,6 +96,10 @@
mst.maintenancecycle = 输入.maintenancecycle
ENDOPTION
OPTION 输入.update_optname <> ""
mst.update_optname = 输入.update_optname
ENDOPTION
OPTION 输入.begin_time <> ""
mst.plan_start_date >= 输入.begin_time
ENDOPTION

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckmstController.java
View File

@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.device_manage.sportcheck.service.DevicesportcheckmstService;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -34,6 +35,14 @@ public class DevicesportcheckmstController {
return new ResponseEntity<>(devicesportcheckmstService.queryAll(whereJson, page), HttpStatus.OK);
}
@GetMapping("/byuser")
@ApiOperation("查询人员点检单")
public ResponseEntity<Object> querybyuser(@RequestParam Map whereJson, Pageable page) {
whereJson.put("update_optname", SecurityUtils.getCurrentNickName());
whereJson.put("invstatus", "03");
return new ResponseEntity<>(devicesportcheckmstService.queryAll(whereJson, page), HttpStatus.OK);
}
@GetMapping("/query")
@ApiOperation("点检单审核查询")
public ResponseEntity<Object> query2(@RequestParam Map whereJson, Pageable page) {

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

@@ -54,6 +54,7 @@ public class DevicesportcheckmstServiceImpl implements DevicesportcheckmstServic
String invstatus = MapUtil.getStr(whereJson, "invstatus");
String begin_time = MapUtil.getStr(whereJson, "begin_time");
String end_time = MapUtil.getStr(whereJson, "end_time");
String update_optname = MapUtil.getStr(whereJson, "update_optname");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "1");
@@ -61,6 +62,7 @@ public class DevicesportcheckmstServiceImpl implements DevicesportcheckmstServic
map.put("invstatus", invstatus);
map.put("begin_time", begin_time);
map.put("end_time", end_time);
map.put("update_optname", update_optname);
if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%");
if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%");
//处理物料当前节点的所有子节点

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/wql/EM_BIDEVICESPORTCHECK_01.wql
View File

@@ -19,6 +19,7 @@
输入.maintenancecycle TYPEAS s_string
输入.maint_id TYPEAS s_string
输入.maint_code TYPEAS s_string
输入.update_optname TYPEAS s_string
输入.invstatus TYPEAS s_string
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
@@ -87,6 +88,10 @@
mst.maintenancecycle = 输入.maintenancecycle
ENDOPTION
OPTION 输入.update_optname <> ""
mst.update_optname = 输入.update_optname
ENDOPTION
OPTION 输入.begin_time <> ""
mst.plan_start_date >= 输入.begin_time
ENDOPTION
@@ -281,4 +286,4 @@
ENDSELECT
ENDPAGEQUERY
ENDIF
ENDIF

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.device_manage.upkeep.service.DevicemaintenancemstService;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -34,6 +35,13 @@ public class DevicemaintenancemstController {
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(devicemaintenancemstService.queryAll(whereJson, page), HttpStatus.OK);
}
@GetMapping("/byuser")
@ApiOperation("保养单维护查询")
public ResponseEntity<Object> querybyuser(@RequestParam Map whereJson, Pageable page) {
whereJson.put("update_optname", SecurityUtils.getCurrentNickName());
whereJson.put("invstatus", "03");
return new ResponseEntity<>(devicemaintenancemstService.queryAll(whereJson, page), HttpStatus.OK);
}
@GetMapping("/query")
@ApiOperation("保养单审核查询")

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
View File

@@ -62,6 +62,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
map.put("invstatus", invstatus);
map.put("begin_time", begin_time);
map.put("end_time", end_time);
map.put("update_optname", MapUtil.getStr(whereJson, "update_optname"));
if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%");
if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%");
//处理物料当前节点的所有子节点

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCE_01.wql
View File

@@ -19,6 +19,7 @@
输入.maintenancecycle TYPEAS s_string
输入.maint_id TYPEAS s_string
输入.maint_code TYPEAS s_string
输入.update_optname TYPEAS s_string
输入.invstatus TYPEAS s_string
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
@@ -87,6 +88,11 @@
mst.maintenancecycle = 输入.maintenancecycle
ENDOPTION
OPTION 输入.update_optname <> ""
mst.update_optname = 输入.update_optname
ENDOPTION
OPTION 输入.begin_time <> ""
mst.plan_start_date >= 输入.begin_time
ENDOPTION
@@ -281,4 +287,4 @@
ENDSELECT
ENDPAGEQUERY
ENDIF
ENDIF

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
View File

@@ -575,6 +575,7 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
.eq(SchBasePoint::getIs_used, IOSEnum.IS_USED.code("是"))
.eq(SchBasePoint::getRegion_code, PDAEnum.REGION_CODE.code("发货区域"))
.eq(SchBasePoint::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
.orderByDesc(SchBasePoint::getPriority)
.orderByAsc(SchBasePoint::getPoint_code)
);