From b00841f3bfae404c88a3be6fa2a6851b4ab1e4a8 Mon Sep 17 00:00:00 2001 From: yewj Date: Wed, 4 Sep 2024 17:44:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOriginController.java | 1 - .../collect/IoCollectOrderService.java | 28 +++---------------- .../collect/IoCollectOriginService.java | 6 +++- 3 files changed, 9 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java index d5ad7e79b..54ecbcbbb 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java @@ -3,7 +3,6 @@ package com.glxp.api.controller.collect; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.service.collect.IoCollectOriginService; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; 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 906ff794c..ff77d0898 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -209,7 +209,7 @@ public class IoCollectOrderService extends ServiceImpl basicSkPrescribeEntities) { //下载处方 - List basicSkPrescribeEntities = basicSkPrescribeService.list(); + if (CollUtil.isNotEmpty(basicSkPrescribeEntities)) + basicSkPrescribeEntities = basicSkPrescribeService.list(); List allWorksList = new ArrayList<>(); - List collectOrderList = new ArrayList<>(); for (BasicSkPrescribeEntity basicSkPrescribeEntity : basicSkPrescribeEntities) { -// BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByFromCode(String.valueOf(basicSkPrescribeEntity.getAddr())); -// if (collectBustypeEntity == null) -// continue; if (collectOrderMapper.exists(new LambdaQueryWrapper().eq(IoCollectOrder::getBillNo, basicSkPrescribeEntity.getCode()))) { continue; } - SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(basicSkPrescribeEntity.getAddr()); if (sysWorkplaceDocumentEntity == null) continue; @@ -411,17 +407,12 @@ public class IoCollectOrderService extends ServiceImpl basicSkPrescribeItemEntities = basicSkPrescirbeDetailService.findByPrescribeNum(basicSkPrescribeEntity.getCode()); List collectOrderBizs = new ArrayList<>(); for (BasicSkPrescribeItemEntity bizEntity : basicSkPrescribeItemEntities) { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(bizEntity.getRelId() + ""); - double doubleValue = Double.parseDouble(bizEntity.getMeasureCount()); - - // 将double转换为int,这将截断小数部分 - int intValue = (int) doubleValue; IoCollectOrderBiz collectOrderBiz = IoCollectOrderBiz.builder().orderIdFk(collectOrder.getBillNo()) .relId(bizEntity.getRelId()) .thrCode(bizEntity.getItemCode()) @@ -451,17 +442,6 @@ public class IoCollectOrderService extends ServiceImpl sysWorkplaceMap = new HashMap<>(); -// for (SysWorkplaceResponse sysWorkplace : allWorksList) { -// sysWorkplaceMap.put(sysWorkplace.getId(), sysWorkplace); -// } -// for (SysWorkplaceResponse value : sysWorkplaceMap.values()) { -// splitFifoCodeService.preAllotInv(value.getWorkplaceId()); -// } - } @Transactional(rollbackFor = Exception.class) diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java index 0bbfeb3e3..e55bd7979 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java @@ -34,6 +34,8 @@ public class IoCollectOriginService { BasicSkPrescribeService basicSkPrescribeService; @Resource BasicSkPrescirbeDetailService basicSkPrescirbeDetailService; + @Resource + IoCollectOrderService collectOrderService; public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) { @@ -68,9 +70,11 @@ public class IoCollectOriginService { basicSkPrescribeEntities.add(basicSkPrescribeEntity); basicSkPrescribeService.saveOrUpdate(basicSkPrescribeEntity); }); + collectOrderService.importPrescribe(basicSkPrescribeEntities); + return ResultVOUtils.success("下载成功"); } } + return ResultVOUtils.error("下载失败"); - return ResultVOUtils.success("下载成功"); } } From 82973f06be019c16136ba886f2bb23a2f7eb18f2 Mon Sep 17 00:00:00 2001 From: yewj Date: Wed, 4 Sep 2024 17:51:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=84=E6=96=B9=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/service/collect/IoCollectOrderService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ff77d0898..d9e0019d7 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -395,7 +395,7 @@ public class IoCollectOrderService extends ServiceImpl Date: Wed, 4 Sep 2024 19:42:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=8E=9F=E5=A7=8B=E8=BD=AC=E5=BE=85?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/collect/CollectOrderBizResponse.java | 9 +++++++++ .../service/inout/IoSplitFifoCodeService.java | 20 +++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java index 0f53bc37d..e9b70c3a8 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -1,5 +1,7 @@ package com.glxp.api.res.collect; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -127,4 +129,11 @@ public class CollectOrderBizResponse { private Integer autoResCount; private String replaceCode; + + /** + * 自动赋码状态:1:无法自动赋码;2:可以自动赋码;3:可以自动赋码,但是数量不足 + */ + @TableField(value = "autoTagStatus") + @ApiModelProperty(value = "autoTagStatus") + private Integer autoTagStatus; } diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java index f0e00e09b..5ed788e9c 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java @@ -210,8 +210,24 @@ public class IoSplitFifoCodeService extends ServiceImpl ioSplitInvResponses = splitFifoInvService.filterList(ioSplitFifoInvRequest); - if (CollUtil.isEmpty(ioSplitInvResponses)) return false; - Map> splitInvMap = ioSplitInvResponses.stream().collect(Collectors.groupingBy(IoSplitInvResponse::getRelId)); + if (CollUtil.isEmpty(ioSplitInvResponses)){ + collectOrderMapper.updateInvAlert(order.getId(), 2); + + if (CollUtil.isNotEmpty(bizList)) { + for (int i = 0; i < bizList.size(); i++) { + CollectOrderBizResponse collectOrderBizResponse = bizList.get(i); + Integer count = 0; + if (IntUtil.value(collectOrderBizResponse.getAutoResCount()) < 0) { + count = 0 - IntUtil.value(collectOrderBizResponse.getAutoResCount()); + } else { + count = collectOrderBizResponse.getCount(); + } + collectOrderBizMapper.updateAutoResCount(collectOrderBizResponse.getId(), -count); + } + } + return false; + } + Map> splitInvMap = ioSplitInvResponses.stream().filter(item -> item.getRelId() != null).collect(Collectors.groupingBy(IoSplitInvResponse::getRelId)); if (CollUtil.isNotEmpty(bizList)) { if (lockType == 1) { From c78b04188ecce364bf2a9be8577c6c79ddb8ee76 Mon Sep 17 00:00:00 2001 From: yewj Date: Wed, 4 Sep 2024 21:47:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 36 +++++++++---------- .../res/collect/CollectOrderBizResponse.java | 4 --- .../collect/IoCollectOrderService.java | 1 - .../api/service/inout/IoSplitCodeService.java | 3 ++ .../service/inout/IoSplitFifoCodeService.java | 4 ++- 5 files changed, 24 insertions(+), 24 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 24bbb2f80..ade0d3629 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -773,12 +773,12 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品!"); } - if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) { - return ResultVOUtils.error(500, "当前上货只允许录入整取产品!"); - } - if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) { - return ResultVOUtils.error(500, "当前上货只允许录入拆零产品!"); - } +// if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) { +// return ResultVOUtils.error(500, "当前上货只允许录入整取产品!"); +// } +// if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) { +// return ResultVOUtils.error(500, "当前上货只允许录入拆零产品!"); +// } //计算实际数量 if (bussinessTypeEntity.isUse()) { codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getUseActCount(udiRelevanceResponse)); @@ -1185,12 +1185,12 @@ public class IoCodeTempController extends BaseController { if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) { //只采集非集采产品 return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品!"); } - if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) { - return ResultVOUtils.error(500, "当前上货只允许录入整取产品!"); - } - if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) { - return ResultVOUtils.error(500, "当前上货只允许录入拆零产品!"); - } +// if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) { +// return ResultVOUtils.error(500, "当前上货只允许录入整取产品!"); +// } +// if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) { +// return ResultVOUtils.error(500, "当前上货只允许录入拆零产品!"); +// } //计算实际数量 if (bussinessTypeEntity.isUse()) { @@ -2147,12 +2147,12 @@ public class IoCodeTempController extends BaseController { if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) { //只采集非集采产品 return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品!"); } - if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) { - return ResultVOUtils.error(500, "当前上货只允许录入整取产品!"); - } - if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) { - return ResultVOUtils.error(500, "当前上货只允许录入拆零产品!"); - } +// if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) { +// return ResultVOUtils.error(500, "当前上货只允许录入整取产品!"); +// } +// if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) { +// return ResultVOUtils.error(500, "当前上货只允许录入拆零产品!"); +// } //计算实际数量 codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getActCount(udiRelevanceResponse)); } else if (udiRelevanceResponses.size() == 0) { diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java index e9b70c3a8..4805437fa 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -1,7 +1,5 @@ package com.glxp.api.res.collect; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -133,7 +131,5 @@ public class CollectOrderBizResponse { /** * 自动赋码状态:1:无法自动赋码;2:可以自动赋码;3:可以自动赋码,但是数量不足 */ - @TableField(value = "autoTagStatus") - @ApiModelProperty(value = "autoTagStatus") private Integer autoTagStatus; } 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 d9e0019d7..5d36936ae 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -517,7 +517,6 @@ public class IoCollectOrderService extends ServiceImpl= needCount) { break; diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java index 5ed788e9c..05b902434 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java @@ -54,12 +54,14 @@ public class IoSplitFifoCodeService extends ServiceImpl splitFifoCodeEntities = list(new LambdaQueryWrapper() .eq(IoSplitFifoCodeEntity::getWorkPlaceCode, workPlaceCode) - .eq(StrUtil.isNotEmpty(busType), IoSplitFifoCodeEntity::getBusType, busType) + .eq(IoSplitFifoCodeEntity::getRelId, relId) .eq(StrUtil.isNotEmpty(batchNo), IoSplitFifoCodeEntity::getBatchNo, batchNo) .orderByAsc(IoSplitFifoCodeEntity::getInBactchNo) ); +// 暂时不穿todo +// .eq(StrUtil.isNotEmpty(busType), IoSplitFifoCodeEntity::getBusType, busType) return splitFifoCodeEntities; }