From 72838468279bf71e03a8e11647982ed00832593d Mon Sep 17 00:00:00 2001 From: yewj Date: Mon, 18 Nov 2024 11:04:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E9=9B=B6=E8=A1=A5=E5=8D=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/inout/IoChangeInoutService.java | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index a933ebadb..51233062d 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -194,11 +194,11 @@ public class IoChangeInoutService { for (BasicBusTypePreEntity busTypePreEntity : busTypePreEntities) { targetBustypeEntity = basicBussinessTypeService.findByAction(busTypePreEntity.getAction()); if (busTypePreEntity.getSplitOrder() == ConstantStatus.ACTION_TYPE_NORMAL) { - buildGenOrder(targetBustypeEntity, busTypePreEntity, normalCodes, orderEntity, isGenInovice); + buildGenOrder(targetBustypeEntity, busTypePreEntity, normalCodes, orderEntity, isGenInovice, null); } else if (busTypePreEntity.getSplitOrder() == ConstantStatus.ACTION_TYPE_PREIN) { - buildGenOrder(targetBustypeEntity, busTypePreEntity, preInCodes, orderEntity, isGenInovice); + buildGenOrder(targetBustypeEntity, busTypePreEntity, preInCodes, orderEntity, isGenInovice, null); } else if (busTypePreEntity.getSplitOrder() == ConstantStatus.ACTION_TYPE_ADVANCE) { - buildGenOrder(targetBustypeEntity, busTypePreEntity, preCodes, orderEntity, isGenInovice); + buildGenOrder(targetBustypeEntity, busTypePreEntity, preCodes, orderEntity, isGenInovice, null); } } } @@ -223,22 +223,22 @@ public class IoChangeInoutService { .collect(Collectors.groupingBy(IoCodeEntity::getRelId)); if (splitMap.size() > 1) { for (List splitItems : splitMap.values()) { - buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, splitItems, orderEntity, isGenInovice); + buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, splitItems, orderEntity, isGenInovice, 1); } } } else { - buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, groupBuyList, orderEntity, isGenInovice); + buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, groupBuyList, orderEntity, isGenInovice, 1); } } if (CollUtil.isNotEmpty(unGroupBuyList)) { - buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, unGroupBuyList, orderEntity, isGenInovice); + buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, unGroupBuyList, orderEntity, isGenInovice, 2); } } else { - buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, useInList, orderEntity, isGenInovice); + buildGenOrder(targetBustypeEntity, bussinessChangeTypeEntity, useInList, orderEntity, isGenInovice, null); } } @@ -246,7 +246,8 @@ public class IoChangeInoutService { } - public void buildGenOrder(BasicBussinessTypeEntity targetBustypeEntity, BasicBusTypePreEntity bussinessChangeTypeEntity, List useInList, IoOrderEntity orderEntity, boolean isGenInvoice) { + public void buildGenOrder(BasicBussinessTypeEntity targetBustypeEntity, BasicBusTypePreEntity bussinessChangeTypeEntity, + List useInList, IoOrderEntity orderEntity, boolean isGenInvoice, Integer groupBuy) { Map> filterSupMaps = new HashMap<>(); //过滤供应商 if (targetBustypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT || bussinessChangeTypeEntity.getCreateType() == 3 || bussinessChangeTypeEntity.getCreateType() == 4) { @@ -374,9 +375,27 @@ public class IoChangeInoutService { if (CollUtil.isNotEmpty(orderDetailBizEntities)) { for (IoOrderDetailBizEntity orderDetailBizEntity : orderDetailBizEntities) { if (corpName.equals(orderDetailBizEntity.getSupId())) { - orderDetailBizEntity.setOrderIdFk(outOrder.getBillNo()); - orderDetailBizEntity.setId(IdUtil.getSnowflakeNextId()); - orderDetailBizService.insert(orderDetailBizEntity); + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(orderDetailBizEntity.getBindRlFk()); + if (IntUtil.value(groupBuy) == 1) { + if (IntUtil.value(udiRelevanceEntity.getGroupBuy())) { + orderDetailBizEntity.setOrderIdFk(outOrder.getBillNo()); + orderDetailBizEntity.setId(IdUtil.getSnowflakeNextId()); + orderDetailBizService.insert(orderDetailBizEntity); + } + + } else if (IntUtil.value(groupBuy) == 2) { + if (!IntUtil.value(udiRelevanceEntity.getGroupBuy())) { + orderDetailBizEntity.setOrderIdFk(outOrder.getBillNo()); + orderDetailBizEntity.setId(IdUtil.getSnowflakeNextId()); + orderDetailBizService.insert(orderDetailBizEntity); + } + } else { + orderDetailBizEntity.setOrderIdFk(outOrder.getBillNo()); + orderDetailBizEntity.setId(IdUtil.getSnowflakeNextId()); + orderDetailBizService.insert(orderDetailBizEntity); + } + + } }