From ee266a7ea590556b0ca77a0d69f1db89994d318a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=90=A6?= <sci3197@dingtalk.com>
Date: Mon, 9 Oct 2023 09:55:32 +0800
Subject: [PATCH] =?UTF-8?q?FI845=20FI889=E5=A2=9E=E5=8A=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/SDNYMainProcessController.java     |  2 ++
 .../java/com/dxhy/erp/entity/sdny/SAPInvoiceInfo.java |  6 ++++++
 .../main/java/com/dxhy/erp/entity/sdny/SNInvoice.java |  5 +++++
 .../erp/entity/sdny/SdnyTDxSaleRecordInvoice.java     |  3 +++
 .../src/main/java/com/dxhy/erp/entity/sdny/ZData.java | 11 +++++++++--
 .../dxhy/erp/service/impl/ImageSubmitServiceImpl.java |  4 ++++
 6 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
index b05fd980..cba17dc2 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
@@ -1306,6 +1306,8 @@ public class SDNYMainProcessController extends AbstractController {
         info.setZDJZH(snInvoice.getCertificateNo());
         info.setZGFMC(snInvoice.getPurchaserName());
         info.setSORT(snInvoice.getSort());
+        // 文件名
+        info.setZWJMC(snInvoice.getFileName());
         //机打代码
         info.setZJDDM(snInvoice.getMachineCode());
         if (snInvoice.getTotalAmount() != null) {
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SAPInvoiceInfo.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SAPInvoiceInfo.java
index 409356e1..ad0f2f7f 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SAPInvoiceInfo.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SAPInvoiceInfo.java
@@ -545,4 +545,10 @@ public class SAPInvoiceInfo {
     @JSONField(name = "ZTID")
     private String ZTID = "";
 
+    /**
+     * 文件名称
+     */
+    @JSONField(name = "ZWJMC")
+    private String ZWJMC = "";
+
 }
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNInvoice.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNInvoice.java
index bacc972e..045dc1c9 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNInvoice.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNInvoice.java
@@ -334,6 +334,11 @@ public class SNInvoice {
      */
     private String isDeductible;
 
+    /**
+     * 文件名
+     */
+    private String fileName;
+
     /**
      * 明细列表
      */
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SdnyTDxSaleRecordInvoice.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SdnyTDxSaleRecordInvoice.java
index 23f276d9..472f51a4 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SdnyTDxSaleRecordInvoice.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SdnyTDxSaleRecordInvoice.java
@@ -858,4 +858,7 @@ public class SdnyTDxSaleRecordInvoice implements Serializable {
     private String sort;
     @TableField(exist = false)
     private String fileId;
+
+    @TableField(exist = false)
+    private String fileName;
 }
\ No newline at end of file
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/ZData.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/ZData.java
index 0c575036..6711e17c 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/ZData.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/ZData.java
@@ -340,6 +340,11 @@ public class ZData {
      * 国税局商品编码 发票信息空则不传
      */
     private String ZGSJBM="";
+
+    /**
+     * 文件名称
+     */
+    private String ZWJMC = "";
     @JSONField(name = "ZBHSJE_Y")
     public String getZBHSJE_Y() {
         return ZBHSJE_Y;
@@ -729,6 +734,8 @@ public class ZData {
         return RESERVE5;
     }
 
-
-
+    @JSONField(name = "ZWJMC")
+    public String getZWJMC() {
+        return ZWJMC;
+    }
 }
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
index 96fde11e..9f66e499 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
@@ -160,6 +160,7 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
             saleRecordInvoice.setDetailList(salesDetailList);
             saleRecordInvoice.setSort(paramsInvoiceMap.get(invoice.getUuid()).getSort());
             saleRecordInvoice.setFileId(paramsInvoiceMap.get(invoice.getUuid()).getFileId());
+            saleRecordInvoice.setFileName(paramsInvoiceMap.get(invoice.getUuid()).getFileName());
             salesInvoiceList.add(saleRecordInvoice);
         });
 
@@ -255,6 +256,9 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
                 zdata.setFPYXBH(item.getFileId());
                 zdata.setIMG_ID(params.getImageId());
                 zdata.setSORT(String.valueOf(item.getSort()));
+                // 增加文件名
+                zdata.setZWJMC(item.getFileName());
+
                 // 处理明细行
                 List<ZData> zDatas=new ArrayList<>();
                 for (SdnyTDxRecordInvoiceDetailSales detail : item.getDetailList()) {