From 06f1849c73860fc3498668d7443b0ba537a1432f Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 27 Nov 2025 11:05:26 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E7=A7=B0=E9=87=8D=E4=BD=8D?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E8=B4=A7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java | 9 +-------- .../src/main/java/org/nl/wms/ext/util/BaseResponse.java | 9 +++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java index e7b353a..8dbe16b 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java @@ -200,8 +200,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { public BaseResponse isPutVehicle(JSONObject whereJson) { log.info("ACS向WMS请求是否可以取放货，请求参数：--------------------------------------" + whereJson.toString()); - // 查询当前任务 - SchBaseTask taskDao = iSchBaseTaskService.getByCode(whereJson.getString("task_code")); // 查询当前点位 SchBasePoint pointDao = iSchBasePointService.getById(whereJson.getString("point_code")); if (ObjectUtil.isEmpty(pointDao)) { @@ -212,12 +210,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 判断当前点位是否有货 if (ObjectUtil.isNotEmpty(pointDao.getVehicle_code())) { data.put("is_confirm", IOSConstant.ZERO); - return BaseResponse.responseOk("当前点位存在库存，不允许放货【" + pointDao.getPoint_code() + "】", data); - } - // 判断任务是否一致 - if (!taskDao.getTask_id().equals(pointDao.getIng_task_code())) { - data.put("is_confirm", IOSConstant.ZERO); - return BaseResponse.responseOk("当前点位存其他任务，不允许放货【" + pointDao.getIng_task_code() + "】", data); + return BaseResponse.responseError("当前点位存在库存，不允许放货【" + pointDao.getPoint_code() + "】", data); } data.put("is_confirm", IOSConstant.ONE); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/util/BaseResponse.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/util/BaseResponse.java index 86dea60..9c33dc2 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/util/BaseResponse.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/util/BaseResponse.java @@ -91,4 +91,13 @@ public class BaseResponse implements Serializable { return response; } + public static BaseResponse responseError(String message,JSONObject data) { + BaseResponse response = new BaseResponse(); + response.setStatus(HttpStatus.HTTP_BAD_REQUEST); + response.setMessage(message); + response.setResponseDate(DateUtil.now()); + response.setData(data); + return response; + } + }