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 8dbe16b..549dc53 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,21 +200,21 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { public BaseResponse isPutVehicle(JSONObject whereJson) { log.info("ACS向WMS请求是否可以取放货,请求参数:--------------------------------------" + whereJson.toString()); + JSONObject data = new JSONObject(); // 查询当前点位 SchBasePoint pointDao = iSchBasePointService.getById(whereJson.getString("point_code")); if (ObjectUtil.isEmpty(pointDao)) { - throw new BadRequestException("当前点位不存在【" + pointDao.getPoint_code() + "】"); + data.put("is_confirm", IOSConstant.ZERO); + return BaseResponse.responseOk("当前点位不存在【" + whereJson.getString("point_code")+ "】", data); } - JSONObject data = new JSONObject(); // 判断当前点位是否有货 if (ObjectUtil.isNotEmpty(pointDao.getVehicle_code())) { data.put("is_confirm", IOSConstant.ZERO); - return BaseResponse.responseError("当前点位存在库存,不允许放货【" + pointDao.getPoint_code() + "】", data); + return BaseResponse.responseOk("当前点位存在库存,不允许放货【" + pointDao.getPoint_code() + "】", data); } data.put("is_confirm", IOSConstant.ONE); - log.info("ACS向WMS请求是否可以取放货,返回参数:--------------------------------------" + BaseResponse.responseOk(data).toString()); return BaseResponse.responseOk(data); }