From 6e4dadd22a12107da5ca9446995cc141c3a8ffee Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 13 Feb 2023 16:11:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=AE=A1=E7=90=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 33 ++++++++++--------- .../inout/IoOrderDetailBizController.java | 2 +- .../service/inout/IoCheckInoutService.java | 6 ++++ .../inout/IoOrderDetailBizService.java | 4 ++- .../impl/IoOrderDetailBizServiceImpl.java | 9 +++-- 5 files changed, 35 insertions(+), 19 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 44609e0f4..b32999680 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -461,9 +461,6 @@ public class IoCodeTempController extends BaseController { } - //校验库存是否存在 - - if (addOrderRequest.getFromCorp() == null) { BasicCorpEntity basicCorpEntity = basicUnitMaintainService.selectByName(addOrderRequest.getFromCorp()); if (basicCorpEntity == null && bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT && bussinessTypeEntity.isGenUnit()) { @@ -802,28 +799,34 @@ public class IoCodeTempController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/addCode/updateBindSup") - public BaseResponse updateBindSup(@RequestBody IoCodeTempEntity warehouseEntity, BindingResult bindingResult) { + public BaseResponse updateBindSup(@RequestBody IoCodeTempEntity codeTempEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - if (StrUtil.isNotEmpty(warehouseEntity.getMySupId())) { - warehouseEntity.setSupId(warehouseEntity.getMySupId()); - codeTempService.updateById(warehouseEntity); - } else if (warehouseEntity.getRelId() != null) { - warehouseEntity = codeTempService.selectById(warehouseEntity.getId()); - int reCount = udiCalCountUtil.getActCount(warehouseEntity); - warehouseEntity.setReCount(reCount); - codeTempService.updateById(warehouseEntity); - BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(warehouseEntity.getAction()); - BaseResponse baseResponse = checkSupId(bussinessTypeEntity, warehouseEntity, warehouseEntity.getSupId()); + + if (StrUtil.isNotEmpty(codeTempEntity.getSupId())) { + codeTempEntity.setSupId(codeTempEntity.getSupId()); + codeTempService.updateById(codeTempEntity); + } else if (codeTempEntity.getRelId() != null) { + codeTempEntity = codeTempService.selectById(codeTempEntity.getId()); + int reCount = udiCalCountUtil.getActCount(codeTempEntity); + codeTempEntity.setReCount(reCount); + codeTempService.updateById(codeTempEntity); + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(codeTempEntity.getAction()); + BaseResponse baseResponse = checkSupId(bussinessTypeEntity, codeTempEntity, codeTempEntity.getSupId()); if (baseResponse != null) return baseResponse; } + codeTempEntity = codeTempService.selectById(codeTempEntity.getId()); + IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId()); + ioAddInoutService.genOrderDetailCode(orderEntity, codeTempEntity); + return ResultVOUtils.success("绑定成功"); } - + @Resource + IoAddInoutService ioAddInoutService; @Resource IoOrderDetailCodeService ioOrderDetailCodeService; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index b1bd185e8..afcdf5ccd 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -125,7 +125,7 @@ public class IoOrderDetailBizController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/updateBizProduct") public BaseResponse updateBizProduct(@RequestBody IoOrderDetailBizEntity orderDetailBizEntity) { - boolean isExit = orderDetailBizService.isExit(orderDetailBizEntity.getBindRlFk(), orderDetailBizEntity.getBatchNo(), orderDetailBizEntity.getId()); + boolean isExit = orderDetailBizService.isExit(orderDetailBizEntity.getBindRlFk(), orderDetailBizEntity.getBatchNo(), orderDetailBizEntity.getId(), orderDetailBizEntity.getOrderIdFk()); if (isExit) { return ResultVOUtils.error(500, "存在相同产品，相同批次号，请检查后保存！"); } diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 50dbe5b6c..44c0a2bff 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -105,6 +105,12 @@ public class IoCheckInoutService { } public String checkCode(IoCodeTempEntity codeEntity) { + + boolean isBillExit = orderDetailBizService.isExit(codeEntity.getOrderId()); + if (!isBillExit) { + return "请先录入业务详情"; + } + IoOrderDetailBizEntity bizEntity = orderDetailBizService.findByUnique(codeEntity.getOrderId(), codeEntity.getRelId(), codeEntity.getBatchNo()); if (bizEntity == null) { return "非此单产品!"; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index f42009b7c..e2e7506b4 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -18,7 +18,9 @@ public interface IoOrderDetailBizService { int deleteByOrderId(String billNo); - boolean isExit(Long relId, String bacthNo, Integer ignoreId); + boolean isExit(String billNo); + + boolean isExit(Long relId, String bacthNo, Integer ignoreId,String orderId); IoOrderDetailBizEntity findByUnique(String orderId, Long relId, String bacthNo); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 15f7fcd6a..525a152ea 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -48,10 +48,15 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { return ioOrderDetailBizDao.delete(new QueryWrapper().eq("orderIdFk", billNo)); } + @Override + public boolean isExit(String billNo) { + return ioOrderDetailBizDao.exists(new QueryWrapper().eq("orderIdFk",billNo)); + } + @Override - public boolean isExit(Long relId, String bacthNo, Integer ignoreId) { - return ioOrderDetailBizDao.exists(new QueryWrapper().eq("bindRlFk", relId).eq("batchNo", bacthNo).ne("id", ignoreId)); + public boolean isExit(Long relId, String bacthNo, Integer ignoreId,String orderId) { + return ioOrderDetailBizDao.exists(new QueryWrapper().eq("bindRlFk", relId).eq("batchNo", bacthNo).eq("orderIdFk", orderId).ne("id", ignoreId)); } @Override