From f8a7c55c09e62d5fb1ae16f997c3b1b130f3e437 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 15 Mar 2023 18:15:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=9B=B8=E5=85=B3bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 11 ++- .../inout/IoOrderDetailBizController.java | 2 +- .../inout/IoOrderReviewController.java | 4 +- .../api/service/inout/IoAddInoutService.java | 4 +- .../service/inout/IoCheckInoutService.java | 72 ++++++++++--------- .../inout/impl/IoOrderServiceImpl.java | 10 +-- .../glxp/api/util/udi/UdiCalCountUtil.java | 8 +-- src/main/resources/application.yml | 2 +- 8 files changed, 61 insertions(+), 52 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 589d111cf..a35b885f4 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -853,6 +853,11 @@ public class IoCodeTempController extends BaseController { codeTempService.updateById(codeSaveRequest); } + if(StrUtil.isNotEmpty(codeSaveRequest.getSupId())){ + codeTempEntity.setSupId(codeSaveRequest.getSupId()); + codeTempService.updateById(codeSaveRequest); + } + //更新耗材字典 if (codeSaveRequest.getRelId() != null) { @@ -897,7 +902,7 @@ public class IoCodeTempController extends BaseController { IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId()); if (codeTempEntity.getMyCount() > 1) { codeTempEntity.setCount(codeTempEntity.getMyCount() - 1); - codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getActCount(codeTempEntity.getRelId())); + codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getActCount(codeTempEntity.getNameCode())); codeTempService.updateById(codeTempEntity); } else { codeTempService.deleteById(id); @@ -911,7 +916,7 @@ public class IoCodeTempController extends BaseController { int orderReCount = orderDetailCodeEntity.getReCount(); if (orderCount > 1) { orderDetailCodeEntity.setCount(orderCount - 1); - orderDetailCodeEntity.setReCount(orderReCount - udiCalCountUtil.getActCount(codeTempEntity.getRelId())); + orderDetailCodeEntity.setReCount(orderReCount - udiCalCountUtil.getActCount(codeTempEntity.getNameCode())); ioOrderDetailCodeService.update(orderDetailCodeEntity); } else { ioOrderDetailCodeService.deleteById(orderDetailCodeEntity.getId()); @@ -952,7 +957,7 @@ public class IoCodeTempController extends BaseController { if (codeTempEntity.getMyCount() <= 0) { return ResultVOUtils.error(500, "数量不能小于0"); } - codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getActCount(codeTempEntity.getRelId())); + codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode())); int b = codeTempService.updateById(codeTempEntity); if (b > 0) return ResultVOUtils.success("修改成功"); 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 f574ab7cb..2b7783c08 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -139,7 +139,7 @@ public class IoOrderDetailBizController extends BaseController { ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid()); ioOrderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode()); ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc()); - ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh()); + ioOrderDetailBizEntity.setCertCode(addBizProductReqeust.getZczbhhzbapzbh()); ioOrderDetailBizEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc()); ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory()); ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname()); 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 0667ee35e..fc28b70c0 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -140,7 +140,7 @@ public class IoOrderReviewController extends BaseController { for (IoOrderDetailResultResponse orderDetailResultResponse : orderDetailResultResponses) { if (orderDetailResultResponse.getBindRlFk().longValue() == codeEntity.getRelId().longValue() && StrUtil.trimToEmpty(orderDetailResultResponse.getBatchNo()).equals(StrUtil.trimToEmpty(codeEntity.getBatchNo()))) { - orderDetailResultResponse.setAcceptCount(orderDetailResultResponse.getAcceptCount() + calCountUtil.getActCount(codeEntity.getRelId())); + orderDetailResultResponse.setAcceptCount(orderDetailResultResponse.getAcceptCount() + calCountUtil.getActCount(codeEntity.getNameCode())); if (orderDetailResultResponse.getAcceptCount() > orderDetailResultResponse.getCount()) { return ResultVOUtils.error(500, "数量溢出！"); } @@ -284,7 +284,7 @@ public class IoOrderReviewController extends BaseController { && checkOrderCodesBean.getMyCount() == checkOrderCodesBean.getScanCount()) { return Constant.CHECK_REPEAT; } - int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getRelId()); + int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getNameCode()); if (curCount == checkOrderCodesBean.getMyCount()) { checkOrderCodesBean.setStatus(Constant.DB_CHECK_ED); } diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 27fafdc58..d8c11b8ce 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -417,7 +417,7 @@ public class IoAddInoutService { codeEnttity.setDeptCode(orderEntity.getDeptCode()); codeEnttity.setOrderId(orderEntity.getBillNo()); codeEnttity.setInvCode(orderEntity.getInvCode()); - codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getRelId())); + codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getNameCode())); codeEnttity.setUpdateTime(new Date()); codeEnttity.setCreateTime(DateUtil.parseDate(pdaCodeEntity.getActDate())); ioCodeEnttities.add(codeEnttity); @@ -469,7 +469,7 @@ public class IoAddInoutService { codeEnttity.setDeptCode(orderSaveRequest.getDeptCode()); codeEnttity.setOrderId(orderSaveRequest.getBillNo()); codeEnttity.setInvCode(orderSaveRequest.getInvCode()); - codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getRelId())); + codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getNameCode())); codeEnttity.setUpdateTime(new Date()); codeEnttity.setCreateTime(DateUtil.parseDate(pdaCodeEntity.getActDate())); ioCodeEnttities.add(codeEnttity); 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 cbeb5c753..9eaebd5b2 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -602,49 +602,53 @@ public class IoCheckInoutService { } if (preInOrder.size() > 0) { String preInBillNo = ""; + boolean isBreak = false; for (String key : preInOrder.keySet()) { - preInBillNo = preInBillNo + "," + key; - IoOrderEntity preInEntity = orderService.findByBillNo(key); - preInEntity.setPreOutBillNo(orderEntity.getBillNo()); - orderService.update(preInEntity); - - //预验收不删除单号，方便后续查询 - if (bussinessTypeEntity.isPreInBack()) { //预验收如果带回，则清空相关预验收库存； - invPreinDetailService.deleteByOrderId(preInEntity.getBillNo()); - } else { //预验收如果不带回，则清除已出库相关库存 - for (IoCodeEntity codeEntity : codeList) { - if (StrUtil.isEmpty(codeEntity.getSerialNo())) { - InvPreinDetailEntity invPreinDetailEntity = invPreinDetailService.findByCode(key, codeEntity.getCode()); - if (invPreinDetailEntity != null) { - int count = 0; - if (invPreinDetailEntity.getCount() < codeEntity.getCount()) { - count = 0; - } else { - count = invPreinDetailEntity.getCount() - codeEntity.getCount(); - } - if (count >= 0) { - if (count == 0) { - invPreinDetailService.deleteByCode(key, codeEntity.getCode()); + if (!isBreak) { + preInBillNo = preInBillNo + "," + key; + IoOrderEntity preInEntity = orderService.findByBillNo(key); + preInEntity.setPreOutBillNo(orderEntity.getBillNo()); + orderService.update(preInEntity); + BasicBussinessTypeEntity preBusType = basicBussinessTypeService.findByAction(preInEntity.getAction()); + //预验收不删除单号，方便后续查询 + if (preBusType.isPreInBack()) { //预验收如果带回，则清空相关预验收库存； + invPreinDetailService.deleteByOrderId(preInEntity.getBillNo()); + } else { //预验收如果不带回，则清除已出库相关库存 + for (IoCodeEntity codeEntity : codeList) { + if (StrUtil.isEmpty(codeEntity.getSerialNo())) { + InvPreinDetailEntity invPreinDetailEntity = invPreinDetailService.findByCode(key, codeEntity.getCode()); + if (invPreinDetailEntity != null) { + int count = 0; + if (invPreinDetailEntity.getCount() < codeEntity.getCount()) { + count = 0; } else { - invPreinDetailEntity.setCount(count); - invPreinDetailService.update(invPreinDetailEntity); + count = invPreinDetailEntity.getCount() - codeEntity.getCount(); } - int reCount = invPreinDetailEntity.getReCount() - codeEntity.getMyReCount(); - if (reCount == 0) { - invPreinDetailService.deleteByCode(key, codeEntity.getCode()); - } else { - invPreinDetailEntity.setReCount(reCount); - invPreinDetailService.update(invPreinDetailEntity); + if (count >= 0) { + isBreak = true; + if (count == 0) { + invPreinDetailService.deleteByCode(key, codeEntity.getCode()); + } else { + invPreinDetailEntity.setCount(count); + invPreinDetailService.update(invPreinDetailEntity); + } + int reCount = invPreinDetailEntity.getReCount() - codeEntity.getMyReCount(); + if (reCount == 0) { + invPreinDetailService.deleteByCode(key, codeEntity.getCode()); + } else { + invPreinDetailEntity.setReCount(reCount); + invPreinDetailService.update(invPreinDetailEntity); + } } + } + } else { + invPreinDetailService.deleteByCode(key, codeEntity.getCode()); } - - } else { - invPreinDetailService.deleteByCode(key, codeEntity.getCode()); } - } + } } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index fdf44b6dd..e45321c6a 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -256,7 +256,7 @@ public class IoOrderServiceImpl implements IoOrderService { if (ioCodeEntity.getMyCount() > 1) { //更新码表 ioCodeEntity.setCount(ioCodeEntity.getMyCount() - 1); - int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getRelId()); + int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getNameCode()); ioCodeEntity.setReCount(ioCodeEntity.getMyReCount() - reCount); codeService.updateById(ioCodeEntity); //更新码详情 @@ -287,7 +287,7 @@ public class IoOrderServiceImpl implements IoOrderService { preinDetailService.deleteById(invPreinDetailEntity.getId()); } else { invPreinDetailEntity.setCount(count); - int reCount = udiCalCountUtil.getActCount(invPreinDetailEntity.getRelId()); + int reCount = udiCalCountUtil.getActCount(invPreinDetailEntity.getNameCode()); invPreinDetailEntity.setReCount(invPreinDetailEntity.getReCount() - reCount); preinDetailService.update(invPreinDetailEntity); } @@ -300,7 +300,7 @@ public class IoOrderServiceImpl implements IoOrderService { } else { //更新详情表 invProductDetailEntity.setCount(count); - int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getRelId()); + int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode()); invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount); invPreProductDetailService.update(invProductDetailEntity); } @@ -325,7 +325,7 @@ public class IoOrderServiceImpl implements IoOrderService { } else { //更新详情表 invProductDetailEntity.setCount(count); - int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getRelId()); + int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode()); invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount); invProductDetailService.update(invProductDetailEntity); } @@ -353,7 +353,7 @@ public class IoOrderServiceImpl implements IoOrderService { if (ioCodeEntity.getCount() > 1) { //删除一个条码 ioCodeEntity.setCount(ioCodeEntity.getCount() - 1); - int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getRelId()); + int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getNameCode()); ioCodeEntity.setReCount(ioCodeEntity.getMyReCount() - reCount); codeTempService.updateById(ioCodeEntity); //更新码详情 } else { diff --git a/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java b/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java index d2aca86fa..aebc2833c 100644 --- a/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java +++ b/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java @@ -14,10 +14,10 @@ public class UdiCalCountUtil { UdiRelevanceService udiRelevanceService; - public int getActCount(Long relId) { - UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(relId); - return getActCount(udiRelevanceResponse); - } +// public int getActCount(Long relId) { +// UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(relId); +// return getActCount(udiRelevanceResponse); +// } public int getActCount(UdiRelevanceResponse udiRelevanceResponse) { int actCount; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a3fb0cb76..1c0966353 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: pro + active: dev jmx: enabled: false