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

fix:异常任务相关处理

Browse Source
This commit is contained in:
zhouz
2024-05-21 14:53:49 +08:00
parent 8217df4480
commit 8664d7943f
17 changed files with 130 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2000,7 +2000,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
.eq(SchBaseTask::getTask_code, whereJson.getString("task_code"))
);
String point_code = "";
JSONObject point_code = new JSONObject();
// 判断任务类型
if (taskDao.getTask_type().equals(TASKEnum.BOX_TYPE.code("木箱入库"))) {
// 木箱入库：满入、浅货位有货-放货时
@@ -2043,7 +2043,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
result.put("status", HttpStatus.OK.value());
result.put("message", "下发成功!");
result.put("point_code", point_code);
result.put("point_code", point_code.getString("struct_code"));
result.put("vehicle_code", point_code.getString("struct_code"));
log.info("deviceApplyExceptional返回参数：---------------------------------------------" + result.toString());
return result;
}

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java
View File

@@ -50,7 +50,7 @@ public class AcsUtil {
throw new BadRequestException("未查询到区域对应的acs地址！");
}
//String url =acs_url + api;
String url ="10.1.3.96:8011/"+ api;
String url =acs_url+ api;
try {
JSONArray rows = new JSONArray();
rows.add(jo);