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 4b6b1ad19..2bf51f6a5 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -568,6 +568,11 @@ public class IoCodeTempController extends BaseController { exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1); exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getActCount(udiRelevanceResponses.get(0))); + + if (!StringUtils.isBlank(exitLocalEntity.getSerialNo())) { + return ResultVOUtils.error(500, "重复扫码!"); + } + BaseResponse invRes = null; if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 invRes = checkPreInInv(bussinessTypeEntity, exitLocalEntity); @@ -580,26 +585,24 @@ public class IoCodeTempController extends BaseController { return invRes; } - if (StringUtils.isBlank(exitLocalEntity.getSerialNo())) { - if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) { - String errMsg = ioCheckInoutService.checkCode(genDetaiEntity); - if (errMsg != null) { - return ResultVOUtils.error(500, errMsg); - } else - codeTempService.updateById(exitLocalEntity); - } else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) { - String errMsg = ioCheckInoutService.checkNoPiCode(genDetaiEntity); - if (errMsg != null) { - return ResultVOUtils.error(500, errMsg); - } else - codeTempService.updateById(exitLocalEntity); - } else { - codeTempService.updateById(exitLocalEntity); - } + if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) { + String errMsg = ioCheckInoutService.checkCode(genDetaiEntity); + if (errMsg != null) { + return ResultVOUtils.error(500, errMsg); + } else + codeTempService.updateById(exitLocalEntity); + } else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) { + String errMsg = ioCheckInoutService.checkNoPiCode(genDetaiEntity); + if (errMsg != null) { + return ResultVOUtils.error(500, errMsg); + } else + codeTempService.updateById(exitLocalEntity); } else { - return ResultVOUtils.error(ResultEnum.DATA_REPEAT); + codeTempService.updateById(exitLocalEntity); } + + } } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 5d5bca6c3..82562e630 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -200,7 +200,6 @@ public class IoOrderReviewController extends BaseController { List orderDetailResultResponses = acceptOrderEntity.getOrderDetailEntities(); if (StrUtil.isNotEmpty(acceptOrderEntity.getCode()) && CollUtil.isNotEmpty(orderDetailResultResponses)) { - boolean isExit = false; for (IoOrderDetailResultResponse orderDetailResultResponse : orderDetailResultResponses) { if (orderDetailResultResponse.getBindRlFk().longValue() == codeEntity.getRelId().longValue() && @@ -352,10 +351,16 @@ public class IoOrderReviewController extends BaseController { checkCode = checkCode.replace("\u001D", ""); } if (checkCode.toUpperCase(Locale.ROOT).equals(code.toUpperCase(Locale.ROOT))) { - if (IntUtil.value(checkOrderCodesBean.getStatus()) == Constant.DB_CHECK_ED - && IntUtil.value(checkOrderCodesBean.getReCount()) == checkOrderCodesBean.getScanCount()) { - return Constant.CHECK_REPEAT; +// if (IntUtil.value(checkOrderCodesBean.getStatus()) == Constant.DB_CHECK_ED +// && IntUtil.value(checkOrderCodesBean.getReCount()) == checkOrderCodesBean.getScanCount()) { +// return Constant.CHECK_REPEAT; +// } + if (StrUtil.isNotEmpty(checkOrderCodesBean.getSerialNo())) { + if (checkOrderCodesBean.getScanCount() > 0) { + return Constant.CHECK_REPEAT; + } } + int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getNameCode()); if (curCount == IntUtil.value(checkOrderCodesBean.getReCount())) { checkOrderCodesBean.setStatus(Constant.DB_CHECK_ED);