From 08c4123483b730a68cfe5631387f5200a883af2e Mon Sep 17 00:00:00 2001 From: yewj Date: Wed, 16 Oct 2024 10:48:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8B=86=E9=9B=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/inout/IoCodeTempController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 130a12085..43b6beb2a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -810,7 +810,7 @@ public class IoCodeTempController extends BaseController { //校验工位存量是否存在 if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) { - IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode()); + IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null); if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) { return ResultVOUtils.error(533, "当前追溯码已存在！"); } @@ -824,7 +824,7 @@ public class IoCodeTempController extends BaseController { } else if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) { - IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode()); + IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null); if (fifoCodeEntity == null) { return ResultVOUtils.error(500, "当前追溯码未上货！"); } @@ -1316,7 +1316,7 @@ public class IoCodeTempController extends BaseController { //------工位上货相关-----校验工位存量是否存在---- if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) { - IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode()); + IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null); if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) { return ResultVOUtils.error(533, "当前追溯码已存在！"); } @@ -1333,7 +1333,7 @@ public class IoCodeTempController extends BaseController { } } else if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) { - IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode()); + IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null); if (fifoCodeEntity == null) { return ResultVOUtils.error(500, "当前追溯码未上货！"); } From 987fb774c0947d679babb28626e33fcbeb132fae Mon Sep 17 00:00:00 2001 From: yewj Date: Wed, 16 Oct 2024 10:57:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8D=AF=E5=93=81=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E6=A0=A1=E9=AA=8C=E5=BA=8F=E5=88=97=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E6=9C=89bug=EF=BC=8C=E8=8D=AF=E5=93=81=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E6=B2=A1=E6=9C=89=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoCodeTempController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 43b6beb2a..7611a0644 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1322,8 +1322,8 @@ public class IoCodeTempController extends BaseController { } IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(code); - if (splitCodeEntity != null && StrUtil.isNotEmpty(splitCodeEntity.getSerialNo())) { - return ResultVOUtils.error(533, "当前追溯码已存在！"); + if (splitCodeEntity != null) {//&& StrUtil.isNotEmpty(splitCodeEntity.getSerialNo()) + return ResultVOUtils.error(533, "当前追溯码已存在拆零库存！"); } //校验码表是否已经存在追溯码 io_code_temp @@ -1339,7 +1339,7 @@ public class IoCodeTempController extends BaseController { } IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(code); - if (splitCodeEntity != null && StrUtil.isNotEmpty(splitCodeEntity.getSerialNo())) { + if (splitCodeEntity != null) {//&& StrUtil.isNotEmpty(splitCodeEntity.getSerialNo()) return ResultVOUtils.error(533, "当前追溯码已经拆零，无法退货！"); }