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

opt:优化待检区到装箱区agv搬运任务

Browse Source
This commit is contained in:
gongbaoxiong
2024-06-13 23:21:09 +08:00
parent 5ed5153bb4
commit 3d8a4a0cae
27 changed files with 1055 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
View File

@@ -31,6 +31,7 @@ public class AcsToWmsController {
@Log(value = "ACS给WMS反馈任务状态", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS)
@SaIgnore
public ResponseEntity<Object> receiveTaskStatusAcs(@RequestBody String string) {
log.info("ACS给WMS反馈任务状态:{}", string);
return new ResponseEntity<>(acsToWmsService.receiveTaskStatusAcs(string), HttpStatus.OK);
}

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

@@ -164,7 +164,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Transactional(rollbackFor = Exception.class)
@SneakyThrows
public Map<String, Object> receiveTaskStatusAcs(String string) {
log.info("receiveTaskStatusAcs请求参数：--------------------------------------" + string);
log.info("acs向lms反馈任务状态，请求参数：--------------------------------------" + string);
JSONArray array = JSONArray.parseArray(string);
//返回处理失败的任务
JSONArray errArr = new JSONArray();
@@ -228,7 +228,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
result.put("message", "任务状态反馈成功!");
result.put("data", new JSONObject());
result.put("errArr", errArr);
log.info("receiveTaskStatusAcs返回参数：--------------------------------------" + result.toString());
log.info("acs向lms反馈任务状态，返回参数：--------------------------------------" + result.toString());
return result;
}
@@ -1750,7 +1750,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 如果满轴位没有可用的空点位，先创建一个桁架任务但是不下发，等这边空出来点位，判断是否有这种桁架任务然后补发；
// 这个情况是有agv任务在搬去待检区或管制区的路上，还没有更新任务状态；需要查询是否有这种任务，等这个任务更新完后，
// 再补发之前创建的输送线到满轴缓存位任务；
log.info("sendProductToFirstFloor--------------------------：" + whereJson.toString());
log.info("二楼到一楼，成品子卷到达一楼输送线，sendProductToFirstFloor--------------------------：" + whereJson.toString());
JSONObject result = new JSONObject();
if (StringUtils.isBlank(whereJson.getString("device_code")) || StringUtils.isBlank(whereJson.getString("material_barcode"))) {
throw new BadRequestException("接口sendProductToFirstFloor，任务号或子卷号参数为空！");
@@ -1824,6 +1824,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
}
} else {
log.info("二楼到一楼，成品子卷到达一楼输送线，异常，任务正在创建中");
result.put("status", HttpStatus.BAD_REQUEST.value());
result.put("message", "任务正在创建中!");
}