From 66943ad3c5d29510389db36fceff3c9de33d2eb9 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Wed, 14 Jun 2023 16:21:42 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=BC=95=E7=94=A8=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=97=B6=E6=B7=BB=E5=8A=A0=E7=89=B9=E6=AE=8A=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=AD=97=E6=AE=B5=E3=80=81=E7=94=9F=E6=88=90=E9=A2=84?=
 =?UTF-8?q?=E5=88=B6=E6=98=AF=E5=88=A4=E6=96=AD=E6=88=90=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/manager/service/impl/InvoiceServiceImpl.java    | 3 ++-
 .../resources/mybatis/mapper/GroupCommodityCodeMapper.xml   | 6 ++++++
 2 files changed, 8 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 98c21af2..e7140721 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
@@ -146,11 +146,12 @@ public class InvoiceServiceImpl implements InvoiceService {
             }
             String cpy = "";
             String kcp = baseServiceConfig.getKcp();
-            boolean kcpMark = kcp.contains(commonOrderInfo.getOrderItemInfo().get(0).getSpbm());
+            boolean kcpMark;
             for(OrderItemInfo orderItemInfo: commonOrderInfo.getOrderItemInfo()){
                 if(StrUtil.isBlank(orderItemInfo.getSpbm())){
                     return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"第"+orderItemInfo.getSphxh()+"行商品税编为空,请补全!");
                 }else {
+                    kcpMark = kcp.contains(commonOrderInfo.getOrderItemInfo().get(0).getSpbm());
                     TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(orderItemInfo.getSpbm());
                     if(StrUtil.isNotBlank(cpy)){
                         if(!cpy.equals(taxClassCodeEntity.getCpy())){
diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
index 8bab52fe..c1736264 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
@@ -300,6 +300,9 @@
             <if test="entId != null">
                 ent_id,
             </if>
+            <if test="tswl != null">
+                tswl,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -415,6 +418,9 @@
             <if test="entId != null">
                 #{entId,jdbcType=VARCHAR},
             </if>
+            <if test="tswl != null">
+                #{tswl,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateCommodityCode" >