Merge remote-tracking branch 'origin/release' into release

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