From a625425cb5da26af8664b5be93357097fa8b62ab Mon Sep 17 00:00:00 2001
From: wangzhikun <wangzhikun@ele-cloud.com>
Date: Thu, 20 Apr 2023 19:43:28 +0800
Subject: [PATCH] =?UTF-8?q?sap=E8=BD=AC=E5=87=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java | 2 ++
 dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml  | 3 ++-
 .../main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java   | 1 +
 .../java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java | 2 ++
 .../com/dxhy/extend/controller/VouncherSyncController.java    | 4 +++-
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java
index a0b4f794..db8d1873 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java
@@ -117,4 +117,6 @@ public class BaseReceiptInvoiceView implements Serializable {
     private String certDate;
 
     private String outBelongDate;
+    //转出来源 1 sap
+    private String outResource;
 }
diff --git a/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml b/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml
index 4d937745..cc7ffb04 100644
--- a/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml
@@ -26,6 +26,7 @@
         <result column="tax_amount" property="taxAmount"/>
         <result column="rzh_date" property="certDate"/>
         <result column="invoice_type" property="invoiceType"/>
+        <result column="out_resource" property="outResource"/>
 
     </resultMap>
 
@@ -90,7 +91,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         , b.gf_tax_no,b.gf_name,b.xf_name,b.invoice_date,b.invoice_status,b.invoice_amount,b.tax_amount
-        , b.rzh_date,b.invoice_type
+        , b.rzh_date,b.invoice_type,b.out_resource
         FROM t_dx_record_invoice_out a
         LEFT JOIN t_dx_record_invoice b ON a.uuid = b.uuid
         <where>
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java
index 4ff4d863..82861c3f 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java
@@ -475,5 +475,6 @@ public class BaseTDxRecordInvoice implements Serializable {
      * g公司id
      */
     private String compCode;
+    private String outResource;
 
 }
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java
index fbcaf001..d741974a 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java
@@ -120,6 +120,8 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
             condRecord.setId(record.getId());
             // 转出状态
             condRecord.setOutStatus(condVO.getOutStatus());
+            //表示转出来源是sap
+            condRecord.setOutResource("1");
             // 转出原因
             condRecord.setOutReason(condVO.getOutReason());
             // 备注
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java
index bb0c12f9..3989eede 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java
@@ -45,8 +45,9 @@ public class VouncherSyncController {
         String companyCode = map.get("companyCode");
         //开始日期
         String startTime= map.get("startTime");
+        String endTime = map.get("endTime");
         //结束日期
-        String month=map.get("endTime");
+        String month=map.get("monat");
         //GJAHR  nian
         String gjahr=map.get("gjahr");
 
@@ -67,6 +68,7 @@ public class VouncherSyncController {
         requestMap.put("GJAHR",gjahr);
         requestMap.put("MONAT",month);
         requestMap.put("ZDATEF",startTime);
+        requestMap.put("ZDATET",endTime);
         requestMap.put("ZFLAG",ifAll);
         object.setZDATA(JSONObject.toJSONString(requestMap));
         JSONObject request = new JSONObject();