From 01ba80a3845a86cec33dc99a8b673cc8e26fca04 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 14 Aug 2024 10:35:51 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=B8=80=E6=9C=9F=E8=BE=93?= =?UTF-8?q?=E9=80=81=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 120a629bd..59653abc1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -1592,16 +1592,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { log.info("shipDeviceUpdate请求参数：---------------------------------------------" + whereJson.toString() + ",ACS上报无货且此时LMS该点位没有任何任务！"); JSONObject result = new JSONObject(); result.put("status", HttpStatus.OK.value()); - result.put("message", "反馈成功,ACS上报无货且此时LMS该点位没有任何任务！"); + result.put("message", "反馈成功!"); 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 { //如果为分切输送线上料位，判断该点位是否存在未完成的任务类型为分切输送出的或载具横移任务 @@ -1612,14 +1604,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { result.put("status", HttpStatus.OK.value()); result.put("message", "反馈成功!"); 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");