feature：引用物料时添加特殊物料字段、生成预制是判断成品的标识bug修复

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())){

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" >