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

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -229,8 +229,7 @@ public class SDNYMainProcessController extends AbstractController {
         checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString());
 
         String kprq = checkInvoice.get("invoiceDate").toString();
-        Date formatDat = new SimpleDateFormat("yyyyMMdd").parse(kprq);
-        String str = new SimpleDateFormat("yyyy-MM-dd").format(formatDat);
+        String str = new SimpleDateFormat("yyyy-MM-dd").format(kprq);
         log.info("开票日期为:{} ", str);
 
         checkInvoice.put("billingDate", str);

dxhy-erp/src/main/java/com/dxhy/erp/dao/SysDeptDao.java

@@ -38,6 +38,10 @@ public interface SysDeptDao extends BaseMapper<SysDeptEntity> {
      * @return
      */
     SysDeptEntity getOrg(@Param("taxno") String taxno);
+
+    SysDeptEntity getOrgByCompCode(@Param("compCode") String compCode);
+
+
     SysDeptEntity getOrgByCompany(@Param("company") String company);
 
     /**

dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@@ -14,8 +14,10 @@ import com.dxhy.common.vo.UserInfo;
 import com.dxhy.erp.dao.AreaDao;
 import com.dxhy.erp.dao.BaseTDxRecordInvoiceDao;
 import com.dxhy.erp.dao.BaseTDxTaxCurrentDao;
+import com.dxhy.erp.dao.SysDeptDao;
 import com.dxhy.erp.entity.BaseTDxRecordInvoice;
 import com.dxhy.erp.entity.BaseTDxTaxCurrent;
+import com.dxhy.erp.entity.SysDeptEntity;
 import com.dxhy.erp.entity.TDxInvoiceReimburse;
 import com.dxhy.erp.entity.kfpt.ApiCheckInvoiceSingleRequest;
 import com.dxhy.erp.entity.kfpt.ApiRequest;
@@ -91,6 +93,9 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
     @Resource
     private TDxInvoiceReimburseService tDxInvoiceReimburseService;
 
+    @Resource
+    private SysDeptDao sysDeptDao;
+
     public String pushCheckResultToSAP(String requestParam) throws Exception {
         log.info("获取请求参数：{} , 请求地址：{}", requestParam, snYxUrl);
         String post = HttpUtils.sendPo(snYxUrl, requestParam, userName, password);
@@ -577,10 +582,18 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                 log.info("价税分离失败:{}", invoiceResult.getMsg());
                 return invoiceResult.getMsg();
             }
+            DynamicContextHolder.push(DbConstant.BASICS_READ);
 
+            SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(compCode);
+            reimburse.setGfTaxNo(orgByCompCode.getTaxno());
+            reimburse.setGfName(orgByCompCode.getTaxname());
+            reimburse.setGfAddressAndPhone(orgByCompCode.getAddress() + orgByCompCode.getPhone());
+            reimburse.setGfBankAndNo(orgByCompCode.getBank() + orgByCompCode.getAccount());
 
             reimburse = convertToReimburse(invoice, reimburse, fplxdm, company);
 
+
+
             DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE);
             int insert = 0;
             QueryWrapper wrapper = new QueryWrapper();

dxhy-erp/src/main/resources/mapper/SysDeptDao.xml

@@ -28,6 +28,14 @@
           and del_flag = '0' limit 1
     </select>
 
+    <select id="getOrgByCompCode" resultType="com.dxhy.erp.entity.SysDeptEntity">
+        select *
+        from sys_dept
+        where comp_code = #{compCode}
+          and org_type = '5'
+          and del_flag = '0' limit 1
+    </select>
+
     <select id="getOrgByCompany" resultType="com.dxhy.erp.entity.SysDeptEntity">
         select *
         from sys_dept