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 @@
ent_id,
+
+ tswl,
+
@@ -415,6 +418,9 @@
#{entId,jdbcType=VARCHAR},
+
+ #{tswl,jdbcType=VARCHAR},
+