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

rev：出入库异常任务

Browse Source
This commit is contained in:
liuxy
2024-03-14 10:21:58 +08:00
parent b0c711d5cc
commit d949018c11
7 changed files with 302 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -1997,9 +1997,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
} else if (taskDao.getTask_type().equals(TASKEnum.BOX_TYPE.code("木箱出库"))) {
// 木箱出库：空出、浅货位有货-取货时
if (type.equals("2") || type.equals("3")) {
if (type.equals("2")) {
point_code = outBoxManageService.taskExceptional(whereJson);
}
if (type.equals("3")) {
outBoxManageService.taskExceptionalOut(whereJson);
}
} else if (taskDao.getTask_type().equals(TASKEnum.VEHICLE_TYPE.code("托盘入库"))) {
// 托盘入库：满入、浅货位有货-放货时
if (type.equals("1") || type.equals("4")) {
@@ -2007,9 +2010,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
} else if (taskDao.getTask_type().equals(TASKEnum.VEHICLE_TYPE.code("托盘出库"))) {
// 托盘出库：空出、浅货位有货-取货时
if (type.equals("2") || type.equals("3")) {
if (type.equals("2")) {
point_code = outVehicleManageService.taskExceptional(whereJson);
}
if (type.equals("3")) {
outVehicleManageService.taskExceptionalOut(whereJson);
}
} else if (taskDao.getTask_type().equals(TASKEnum.PROUD_TYPE.code("成品入库"))) {
// 成品入库：满入、浅货位有货-放货时
if (type.equals("1") || type.equals("4")) {
@@ -2017,7 +2023,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
}
if (ObjectUtil.isEmpty(point_code)) {
if (!type.equals("3") && ObjectUtil.isEmpty(point_code)) {
throw new BadRequestException("点位为空!");
}

2
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
View File

@@ -382,6 +382,7 @@ public class CheckOutBillController {
@PostMapping("/testOutEmp")
@Log("空载具出库测试")
@SaIgnore
public ResponseEntity<Object> testOutEmp(@RequestBody JSONObject whereJson) {
new OutVehicleManageServiceImpl().outVehicle(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
@@ -397,6 +398,7 @@ public class CheckOutBillController {
@PostMapping("/testOutBox")
@Log("木箱出库测试")
@SaIgnore
public ResponseEntity<Object> testOutBox(@RequestBody JSONObject whereJson) {
new OutBoxManageServiceImpl().outBox(whereJson);
return new ResponseEntity<>(HttpStatus.OK);