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

rev：一期输送线

Browse Source
This commit is contained in:
liuxy
2024-08-14 10:35:51 +08:00
parent 2b816302ba
commit 01ba80a384
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1592,16 +1592,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("shipDeviceUpdate请求参数：---------------------------------------------" + whereJson.toString() + ",ACS上报无货且此时LMS该点位没有任何任务！"); log.info("shipDeviceUpdate请求参数：---------------------------------------------" + whereJson.toString() + ",ACS上报无货且此时LMS该点位没有任何任务！");
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("status", HttpStatus.OK.value()); result.put("status", HttpStatus.OK.value());
result.put("message", "反馈成功,ACS上报无货且此时LMS该点位没有任何任务！"); result.put("message", "反馈成功!");
return result; return result;
}else {
String vehicleCode2 = left_jo.getString("vehicle_code2");
if (!deliver_jo.getString("vehicle_code").equals(vehicleCode2)) {
JSONObject result = new JSONObject();
result.put("status", HttpStatus.OK.value());
result.put("message", "反馈成功,ACS上报无货但当前点位载具和任务载具号不一致！");
return result;
}
} }
} else { } else {
//如果为分切输送线上料位，判断该点位是否存在未完成的任务类型为分切输送出的或载具横移任务 //如果为分切输送线上料位，判断该点位是否存在未完成的任务类型为分切输送出的或载具横移任务
@@ -1612,14 +1604,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
result.put("status", HttpStatus.OK.value()); result.put("status", HttpStatus.OK.value());
result.put("message", "反馈成功!"); result.put("message", "反馈成功!");
return result; return result;
}else {
String vehicleCode2 = right_jo.getString("vehicle_code2");
if (!deliver_jo.getString("vehicle_code").equals(vehicleCode2)) {
JSONObject result = new JSONObject();
result.put("status", HttpStatus.OK.value());
result.put("message", "反馈成功,ACS上报无货但当前点位载具和任务载具号不一致！");
return result;
}
} }
} }
deliver_jo.put("point_status", "01"); deliver_jo.put("point_status", "01");