src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/impl/BusinessFsSaleRevenueServiceImpl.java

@@ -280,7 +280,9 @@ public class BusinessFsSaleRevenueServiceImpl extends ServiceImpl<BusinessFsSale
         if (CollectionUtils.isNotEmpty(param.getRevenueSettleList())) {
             param.getRevenueSettleList().forEach(settle -> {
                 settle.setFsSaleRevenueId(param.getId());
-                settle.setProvinceAcceptanceUnit(settle.getOrgName());
+                if (StringUtils.isNotBlank(settle.getOrgName())) {
+                    settle.setProvinceAcceptanceUnit(settle.getOrgName());
+                }
                 settleMapper.insert(settle);
             });
         }

src/main/resources/mapper/priceApproval/BusinessFsSaleRevenueMapper.xml

@@ -226,7 +226,7 @@
             cdIn.htbh,
             cdIn2.sjckchmc storehouseName,
             cdIn2.sjhwhmc warehouseName,
-            cdIn.cph,
+            cdIn.cph qcph,
             cdIn2.mz mzzl,
             cdIn3.pz,
             cdIn2.klhjz bzwkl,
@@ -396,7 +396,8 @@
             rs.province_invoice_unit_price provinceInvoiceUnitPrice,
             rs.province_invoice_amount provinceInvoiceAmount,
             rs.province_loan_return_time provinceLoanReturnTime,
-            rs.province_loan_return_amount provinceLoanReturnAmount
+            rs.province_loan_return_amount provinceLoanReturnAmount,
+            rs.fs_out_confirm_id fsOutConfirmId
         FROM
             business_fs_sale_revenue_settle rs
         WHERE
@@ -413,7 +414,9 @@
             sc.in_financial_verification inNinancialVerification,
             ap.storage_amount storageAmount,
             ap.document_number,
-            ap.document_upload
+            ap.document_upload,
+            ap.grain_situation_card_id,
+	        ap.fs_sale_revenue_id
         FROM
             business_fs_sale_revenue_approval_price ap
         LEFT JOIN grain_situation_card sc ON ap.grain_situation_card_id = sc.id