From ef36ca712a0679027ddcb02ba2fcd6de66bb9137 Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Tue, 13 Jun 2023 08:40:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=EF=BC=8C=E6=B5=8B=E8=AF=95=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index bacf1dc8..7c00b704 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -236,6 +236,11 @@ public class InvoiceServiceImpl implements InvoiceService { throw new RuntimeException(e.getMessage()); } } + List collected = commonOrderInfos.stream().map(v -> v.getOrderInfo().getDdh()).collect(Collectors.toList()); + + if(collected.contains("700000")){ + throw new RuntimeException("校验单价容差范围发生错误:在原结算单中未匹配到唯一明细____"); + } //如果不是混开的 走原来的逻辑 if(CollectionUtils.isEmpty(commonOrderInfoList)){ return R.ok("生成预制发票成功,请到【发票处理中心】页面查看"); @@ -365,6 +370,9 @@ public class InvoiceServiceImpl implements InvoiceService { }); } } + if(collected.contains("800000")){ + throw new RuntimeException("以下订单自动拆分时单价超过设定范围,请手动拆分_____"); + } return R.ok("生成预制发票成功,请到【发票处理中心】页面查看"); } } From 7ebb69ff3927b9f03277cc8191217602adb81d88 Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Tue, 13 Jun 2023 08:55:42 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=EF=BC=8C=E6=B5=8B=E8=AF=95=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index 7c00b704..c3b1b268 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -238,7 +238,7 @@ public class InvoiceServiceImpl implements InvoiceService { } List collected = commonOrderInfos.stream().map(v -> v.getOrderInfo().getDdh()).collect(Collectors.toList()); - if(collected.contains("700000")){ + if(collected.stream().filter(s -> s.startsWith("700000")).count() >0){ throw new RuntimeException("校验单价容差范围发生错误:在原结算单中未匹配到唯一明细____"); } //如果不是混开的 走原来的逻辑 @@ -370,7 +370,7 @@ public class InvoiceServiceImpl implements InvoiceService { }); } } - if(collected.contains("800000")){ + if(collected.stream().filter(s -> s.startsWith("800000")).count() >0){ throw new RuntimeException("以下订单自动拆分时单价超过设定范围,请手动拆分_____"); } return R.ok("生成预制发票成功,请到【发票处理中心】页面查看"); From 300c70e0c39c587184f9eca3b4e4c47420340655 Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Tue, 13 Jun 2023 09:31:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/InvoiceServiceImpl.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index c3b1b268..99169ef1 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -187,9 +187,6 @@ public class InvoiceServiceImpl implements InvoiceService { }else { //封装成品油 PageCommonOrderInfo cpyPageCommonOrderInfo = new PageCommonOrderInfo(); - //拼接自动按照明细行拆分所需要的数据 - log.info("cpyOrderItems》》》》》》》》"+JSON.toJSONString(cpyOrderItems)); - log.info("nocpyOrderItems》》》》》》》》"+JSON.toJSONString(nocpyOrderItems)); //成品油和非成品油混合 PageOrderInfo cpyPageOrderInfo = new PageOrderInfo(); BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),cpyPageOrderInfo); @@ -236,11 +233,6 @@ public class InvoiceServiceImpl implements InvoiceService { throw new RuntimeException(e.getMessage()); } } - List collected = commonOrderInfos.stream().map(v -> v.getOrderInfo().getDdh()).collect(Collectors.toList()); - - if(collected.stream().filter(s -> s.startsWith("700000")).count() >0){ - throw new RuntimeException("校验单价容差范围发生错误:在原结算单中未匹配到唯一明细____"); - } //如果不是混开的 走原来的逻辑 if(CollectionUtils.isEmpty(commonOrderInfoList)){ return R.ok("生成预制发票成功,请到【发票处理中心】页面查看"); @@ -317,20 +309,16 @@ public class InvoiceServiceImpl implements InvoiceService { } } else { log.error("{}校验单价容差范围发生错误:在原结算单中未匹配到唯一明细,找到了{}条", LOGGER_MSG, collect.size()); -// R.error("校验单价容差范围发生错误:在原结算单中未匹配到唯一明细"); throw new RuntimeException("校验单价容差范围发生错误:在原结算单中未匹配到唯一明细"); } }); }); } if(consumerList.size()>0){ -// return R.error(ConfigureConstant.STRING_9001, "以下结算单中客户的状态为“冻结”状态，不能进行开票。",consumerList); throw new RuntimeException(String.format("以下结算单中%s客户的状态为“冻结”状态，不能进行开票。",consumerList)); }else if((StrUtil.isBlank(pageInvoiceReq.getConfirmZnfm()) || !ConfigureConstant.STRING_0.equals(pageInvoiceReq.getConfirmZnfm())) && confirmList.size()>0){ -// return R.error(ConfigureConstant.STRING_9002,"请确认以下物料税收分类编码是否准确",confirmList); throw new RuntimeException(String.format("请确认以下物料税收分类编码是否准确",confirmList)); }else if(djOverflowList.size() > 0){ -// return R.error(ConfigureConstant.STRING_9003, "以下订单自动拆分时单价超过设定范围,请手动拆分",djOverflowList); throw new RuntimeException(String.format("以下订单自动拆分时单价超过设定范围,请手动拆分",djOverflowList)); }else { for (CommonOrderInfo f : commonOrderInfoList) { @@ -370,9 +358,6 @@ public class InvoiceServiceImpl implements InvoiceService { }); } } - if(collected.stream().filter(s -> s.startsWith("800000")).count() >0){ - throw new RuntimeException("以下订单自动拆分时单价超过设定范围,请手动拆分_____"); - } return R.ok("生成预制发票成功,请到【发票处理中心】页面查看"); } } From 4b8a269b0c7197fafbb53a640c2998b28b93ab66 Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Tue, 13 Jun 2023 14:03:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=8E=89=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=9B=86=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index 99169ef1..d4550cd6 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -220,7 +220,9 @@ public class InvoiceServiceImpl implements InvoiceService { if(cpyOrderItems.size()>ConfigureConstant.INT_8){ return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"是成品油发票,明细行数不能超过8行,请先进行手动拆分!"); } - lists.add(mixCommonOrderInfoList); + if(!CollectionUtils.isEmpty(mixCommonOrderInfoList)){ + lists.add(mixCommonOrderInfoList); + } } //如果是混开的 走明细拆分 From 29e8e7fe765d7bbdf1bb604eae765bd4bce60fbf Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Tue, 13 Jun 2023 14:04:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=8E=89=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=9B=86=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderSplitServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java index bc047abc..b81e53da 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java @@ -267,8 +267,6 @@ public class OrderSplitServiceImpl implements OrderSplitService { OrderItemInfo orderItemInfo = new OrderItemInfo(); BeanUtils.copyProperties(pageOrderItemInfo, orderItemInfo); TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(orderItemInfo.getSpbm()); - log.info("OrderItemInfo.getSpbm() = " + orderItemInfo.getSpbm()); - log.info("taxClassCodeEntity = " + taxClassCodeEntity); if(taxClassCodeEntity != null && "Y".contains(taxClassCodeEntity.getCpy())){ cpy++; }