diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
index ef3b93ff..f91d3079 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
@@ -710,10 +710,10 @@ public class CommodityServiceImpl implements CommodityService {
commodityCodeEntity.setBmbBbh(taxClassCodeEntity.getBbh());
commodityCodeEntity.setCzlx("");
commodityCodeEntity.setEntId(receiveSpxxReq.getEntId());
- commodityCodeEntity.setStatus("1");
+// commodityCodeEntity.setStatus("1");
commodityCodeEntity.setInvoiceName(CommonUtils.subSpmc(receiveSpxxReq.getXmmc()));
- commodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_4.getKey());
+ commodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_6.getKey());
commodityCodeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey());
commodityCodeEntity.setDataState(TaxClassCodeEnum.DATA_STATE_0.getKey());
diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
index b7aed421..9e66802d 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
@@ -569,9 +569,6 @@
invoice_name,
-
- status,
-
@@ -693,9 +690,6 @@
#{invoiceName,jdbcType=VARCHAR},
-
- #{status,jdbcType=VARCHAR},
-
diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/TaxClassCodeEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/TaxClassCodeEnum.java
index 96ce3250..11abf315 100644
--- a/order-management-common/src/main/java/com/dxhy/order/constant/TaxClassCodeEnum.java
+++ b/order-management-common/src/main/java/com/dxhy/order/constant/TaxClassCodeEnum.java
@@ -25,6 +25,7 @@ public enum TaxClassCodeEnum {
DATA_SOURCE_3("3", "采集下级"),
DATA_SOURCE_4("4", "自动归集"),
DATA_SOURCE_5("5", "接口同步"),
+ DATA_SOURCE_6("6", "开票自动归集"),
/**
* 匹配状态
*/
diff --git a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml
index 5d73e001..3281b5e1 100644
--- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml
+++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml
@@ -141,7 +141,6 @@
-
@@ -1307,8 +1306,7 @@
opi.yzfp,
opi.origin_ddh,
opi.origin_order_id,
- opi.kb,
- opi.bzdh
+ opi.kb
FROM order_invoice_info oii
LEFT JOIN order_info oi ON oii.order_info_id = oi.id