From 13f45979fd7510205529cf1440d1be20153b82c1 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 25 May 2023 16:46:13 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E7=94=9F=E6=88=90=E9=A2=84?= =?UTF-8?q?=E5=88=B6=E5=8F=91=E7=A5=A8=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=B8=BA=E7=9F=BF=E4=BA=A7=E7=9A=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=B8=8D=E5=85=81=E8=AE=B8=E7=94=9F=E6=88=90=E9=A2=84?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 5 +++++ 1 file changed, 5 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 a362fd01..b2568cc5 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 @@ -145,6 +145,8 @@ public class InvoiceServiceImpl implements InvoiceService { return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!"); } String cpy = ""; + String kcp = baseServiceConfig.getKcp(); + boolean kcpMark = kcp.contains(commonOrderInfo.getOrderItemInfo().get(0).getSpbm()); for(OrderItemInfo orderItemInfo: commonOrderInfo.getOrderItemInfo()){ if(StrUtil.isBlank(orderItemInfo.getSpbm())){ return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"第"+orderItemInfo.getSphxh()+"行商品税编为空,请补全!"); @@ -157,6 +159,9 @@ public class InvoiceServiceImpl implements InvoiceService { }else { cpy = taxClassCodeEntity.getCpy(); } + if(kcp.contains(orderItemInfo.getSpbm()) == kcpMark){ + return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"矿产品与非矿产品税编不能混开,请做手动拆分处理!"); + } } } if(ConfigureConstant.STRING_Y.equals(cpy) && commonOrderInfo.getOrderItemInfo().size()>ConfigureConstant.INT_8){