diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 802ebb49b..c5570825b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -869,7 +869,7 @@ public class IoCodeTempController extends BaseController { IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null); if (fifoCodeEntity == null) { - return ResultVOUtils.error(500, "当前追溯码未上货!"); + return ResultVOUtils.error(500, "当前追溯码未上货或已出库完毕!"); } //校验码表是否已经存在追溯码 io_code_temp if (StrUtil.isNotEmpty(udiEntity.getSerialNo())) { @@ -1405,7 +1405,7 @@ public class IoCodeTempController extends BaseController { } else if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) { IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null); if (fifoCodeEntity == null) { - return ResultVOUtils.error(500, "当前追溯码未上货!"); + return ResultVOUtils.error(500, "当前追溯码未上货或已出库完毕!"); } IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(code); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index f8d131b54..4ef4212fa 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -454,6 +454,7 @@ public class IoCollectOrderService extends ServiceImpl