Merge branch '0613-新入库数据赋值税率字段' of http://192.168.12.182/invoice/pt into release

dxhy-core/src/main/java/com/dxhy/core/job/pojo/InvoiceCollectionInfo.java

@@ -583,4 +583,9 @@ public class InvoiceCollectionInfo {
      */
     private String userName;
 
+    /**
+     * 税率
+     */
+    private String taxRate;
+
 }

dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java

@@ -89,6 +89,8 @@ public class CheckTaskServiceImpl implements CheckTaskService {
         return checkTaskDao.getNoDetailInvoiceOld();
     }
 
+    private String taxRate;
+
     /**
      * 查验
      *
@@ -140,7 +142,7 @@ public class CheckTaskServiceImpl implements CheckTaskService {
 
                     // 构建主表实体
                     InvoiceCollectionInfo invoiceCollectionInfo =
-                        buildInvoiceCollectionInfo(responseInvoice, checkNoDetailInvoice.getBuyerTaxNo());
+                        buildInvoiceCollectionInfo(responseInvoice, checkNoDetailInvoice.getBuyerTaxNo(),taxRate);
 
                     int countdetail = getDetailCount(invoiceCollectionInfo, db);
                     // 更新主表
@@ -186,7 +188,7 @@ public class CheckTaskServiceImpl implements CheckTaskService {
 
                     // 构建主表实体
                     InvoiceCollectionInfo invoiceCollectionInfo =
-                        buildInvoiceCollectionInfo(responseInvoice, checkNoDetailInvoice.getBuyerTaxNo());
+                        buildInvoiceCollectionInfo(responseInvoice, checkNoDetailInvoice.getBuyerTaxNo(),"");
                     DynamicContextHolder.push(db + DbConstant.BUSINESS_READ);
                     int countdetail = tDxRecordInvoiceDetailDao
                         .getDetailJd(invoiceCollectionInfo.getInvoiceCode() + invoiceCollectionInfo.getInvoiceNo());
@@ -385,6 +387,7 @@ public class CheckTaskServiceImpl implements CheckTaskService {
      * @return
      */
     private List<InvoiceDetailInfo> buildDetailList(ResponseInvoice responseInvoice) {
+        taxRate = "";
         // 构建返回值
         final List<InvoiceDetailInfo> invoiceDetailInfoList = new ArrayList<>();
 
@@ -417,6 +420,8 @@ public class CheckTaskServiceImpl implements CheckTaskService {
             invoiceDetailInfo.setTxrqz(invoiceDetail.getTxrqz());
             // 税率
             invoiceDetailInfo.setTaxRate(invoiceDetail.getTaxRate());
+
+            taxRate = taxRate + invoiceDetail.getTaxRate();
             //山能项目 增加税码字段
             if(invoiceDetail.getTaxRate() != null){
                 invoiceDetailInfo.setTaxCode(getZSM(invoiceDetail.getTaxRate()));
@@ -645,7 +650,7 @@ public class CheckTaskServiceImpl implements CheckTaskService {
      *            抵账主体数据
      * @return 主体数据
      */
-    private InvoiceCollectionInfo buildInvoiceCollectionInfo(ResponseInvoice responseInvoice, String buyerTaxNo) {
+    private InvoiceCollectionInfo buildInvoiceCollectionInfo(ResponseInvoice responseInvoice, String buyerTaxNo,String taxRate) {
         // 定义返回值
         final InvoiceCollectionInfo invoiceCollectionInfo = new InvoiceCollectionInfo();
         // 购方税号
@@ -712,6 +717,8 @@ public class CheckTaskServiceImpl implements CheckTaskService {
         invoiceCollectionInfo.setMachinecode(responseInvoice.getMachineNo());
 
         invoiceCollectionInfo.setQsType(responseInvoice.getQsType());
+
+        invoiceCollectionInfo.setTaxRate(taxRate);
         // 返回
         return invoiceCollectionInfo;
     }

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

@@ -496,4 +496,6 @@ public class TdxRecordInvoice implements Serializable {
     private String compCode;
 
     private String invoiceSource;
+
+    private String taxRate;
 }

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

@@ -53,6 +53,8 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
     @Resource
     private SignFpqsService signFpqsService;
 
+    private String taxRate;
+
     @Override
     public void saveQueryInvoiceResult(JSONObject queryInvoiceResult, String userName, String qsType, String dbName) {
 
@@ -62,6 +64,8 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
         TDxVehicleSaleInvoice vehicleSaleInvoice = getVehicleSaleInvoice(queryInvoiceResult);
         // 底账明细表
         List<TDxRecordInvoiceDetail> recordInvoiceDetail = getRecordInvoiceDetail(queryInvoiceResult);
+
+        recordInvoice.setTaxRate(taxRate);
         // 税率统计表
         List<TdxRecordInvoiceStatistics> invoiceStatistics = getInvoiceStatistics(queryInvoiceResult);
 
@@ -282,6 +286,7 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
 
     @Override
     public List<TDxRecordInvoiceDetail> getRecordInvoiceDetail(JSONObject queryInvoiceResult) {
+        taxRate = "";
         if (queryInvoiceResult.containsKey("invoiceLineList")) {
             JSONArray dataArray = queryInvoiceResult.getJSONArray("invoiceLineList");
             if (dataArray != null && dataArray.size() > 0) {
@@ -310,6 +315,7 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
                     invoiceDetail.setUnitPrice(invoiceDetailQuery.getString("unitPrice"));
                     invoiceDetail.setDetailAmount(invoiceDetailQuery.getString("amount"));
                     invoiceDetail.setTaxRate(invoiceDetailQuery.getString("taxRate"));
+                    taxRate = taxRate + invoiceDetailQuery.getString("taxRate");
                     if(invoiceDetailQuery.getString("taxRate") != null){
                         invoiceDetail.setTaxCode(getZSM(invoiceDetailQuery.getString("taxRate")));
                     }