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

# Conflicts:
#	dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

dxhy-erp/src/main/java/com/dxhy/erp/entity/SalesInvoicePushInfos.java

@@ -88,5 +88,15 @@ public class SalesInvoicePushInfos {
     private String buyerPhone;
     private String compCode;
 
+    /**
+     * 报账单号
+     */
+    private String bzdh;
+
+    /**
+     * 报账人
+     */
+    private String bzr;
+
     private List<InvoiceDetailInfo> detailList;
 }

dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java

@@ -484,4 +484,14 @@ public class TdxSaleRecordInvoice implements Serializable {
     private String incentiveFlag;
 
     private String compCode;
+
+    /**
+     * 报账单号
+     */
+    private String bzdh;
+
+    /**
+     * 报账人
+     */
+    private String bzr;
 }

dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java

@@ -1662,6 +1662,10 @@ public class InvoicePoolServiceImpl implements InvoicePoolService {
                     update.setStatusUpdateDate(new Date());
                 }
                 update.setCompCode(infos.getCompCode());
+                // 报账单号 报账人
+                update.setBzdh(infos.getBzdh());
+                update.setBzr(infos.getBzr());
+
                 TDxInvoiceSales tDxInvoiceSales = new TDxInvoiceSales();
                 tDxInvoiceSales.setQsDate(new Date());
                 DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE);
@@ -1813,6 +1817,10 @@ public class InvoicePoolServiceImpl implements InvoicePoolService {
             invoice.setCheckCode(info.getCheckCode());
         }
 
+        // 报账单号 报账人
+        invoice.setBzdh(info.getBzdh());
+        invoice.setBzr(info.getBzr());
+
         invoice.setSourceSystem("1");
         invoice.setValid("1");
         invoice.setQsDate(new Date());