From b5691b067aac4287cd03f17428fe1a85729e694b Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 27 Mar 2023 14:41:04 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=8F=91=E7=A5=A8=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=92=8C=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/CustomsMapper.xml   |  4 ++
 .../controller/SDNYMainProcessController.java | 11 ++---
 .../com/dxhy/erp/entity/sdny/SNSAPObject.java |  2 +-
 .../dxhy/extend/model/ExtBbfpzhcxRespVO.java  |  6 +++
 .../main/resources/mapper/CustomsMapper.xml   |  4 ++
 .../main/resources/mapper/ExtBbfpzhMapper.xml | 44 ++++++++++++++++++-
 6 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml
index 51229f09..258f61ac 100644
--- a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml
@@ -29,6 +29,10 @@
         <result column="in_account_status" property="inAccountStatus"/>
         <result column="voucher_number" property="voucherNumber"/>
         <result column="document_number" property="documentNumber"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="postingTime" property="postingTime"/>
+        <result column="image_id" property="imageId"/>
+        <result column="account_period" property="accountPeriod"/>
     </resultMap>
 
     <select databaseId="mysql" id="selectByPramsMap"
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 2c8edbde..c828ea84 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
@@ -27,6 +27,7 @@ import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONString;
+import org.omg.CORBA.OBJ_ADAPTER;
 import org.omg.PortableInterceptor.INACTIVE;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -176,7 +177,7 @@ public class SDNYMainProcessController extends AbstractController {
     @SysLog("同步发票信息")
     public ResponseEntity<?> syncInvoiceInfo(@RequestBody SNRequestObject snRequestObject) {
 
-        log.info("影像系统同步数据:{}",snRequestObject);
+        log.info("影像系统同步数据:{}",JSONObject.toJSONString(snRequestObject));
 
         String userid = "101833";
         String dbName = "business";
@@ -243,7 +244,7 @@ public class SDNYMainProcessController extends AbstractController {
                     }
 
                     SNSAPObject object = convertToSapOnject(invoice, imageId,compCode);
-                    log.info("推送山能数据:{}",object);
+                    log.info("推送山能数据:{}",JSONObject.toJSONString(object));
 
                     JSONObject request = new JSONObject();
                     request.put("IS_INPUT",object);
@@ -311,7 +312,7 @@ public class SDNYMainProcessController extends AbstractController {
         object.setZFILED4("");
         object.setZFILED5("200");
 
-        List<String> sapInvoiceInfos = new ArrayList<>();
+        List<SAPInvoiceInfo> sapInvoiceInfos = new ArrayList<>();
         SAPInvoiceInfo info = new SAPInvoiceInfo();
         info.setZBAZT("0");
         info.setZXFSH(snInvoice.getSalesTaxNo());
@@ -444,9 +445,9 @@ public class SDNYMainProcessController extends AbstractController {
         info.setZQM("");
         info.setZPJLY(snInvoice.getSource());
         info.setZZWLX(snInvoice.getSeat());
-        info.setZTID("500005000002601689027");
+        info.setZTID(snInvoice.getInvoiceCode()+snInvoice.getInvoiceNumber());
 
-        sapInvoiceInfos.add(JSONObject.toJSONString(info));
+        sapInvoiceInfos.add(info);
         object.setZDATA(sapInvoiceInfos);
         return object;
 
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNSAPObject.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNSAPObject.java
index 473178d6..b20d258e 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNSAPObject.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNSAPObject.java
@@ -73,6 +73,6 @@ public class SNSAPObject {
      * 外围系统标识
      */
     @JSONField(name = "ZDATA")
-    private List<String> ZDATA;
+    private List<SAPInvoiceInfo> ZDATA;
 
 }
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java
index eaa1aa0b..58540cfc 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java
@@ -180,6 +180,12 @@ public class ExtBbfpzhcxRespVO implements Serializable {
      */
     private String illegalEnterprise;
 
+    private String snVoucherNumber;
+    private String postingTime;
+    private String imageId;
+    private String accountPeriod;
+    private String compCode;
+
     public ExtBbfpzhcxRespVO() {}
 
 }
diff --git a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
index 0017c7c1..0b883a82 100644
--- a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
@@ -30,6 +30,10 @@
         <result column="in_account_status" property="inAccountStatus"/>
         <result column="voucher_number" property="voucherNumber"/>
         <result column="document_number" property="documentNumber"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="postingTime" property="postingTime"/>
+        <result column="image_id" property="imageId"/>
+        <result column="account_period" property="accountPeriod"/>
     </resultMap>
 
     <resultMap id="HjResultMap" type="java.util.Map">
diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
index 40710625..e027cec5 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
@@ -39,6 +39,10 @@
         <result column="settlement_status" property="settlementStatus"/>
         <result column="voucher_number" property="voucherNumber"/>
         <result column="total_amount" property="totalAmount"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="postingTime" property="postingTime"/>
+        <result column="image_id" property="imageId"/>
+        <result column="account_period" property="accountPeriod"/>
     </resultMap>
 
     <resultMap id="BbfpzhcxhjResultMap"
@@ -60,7 +64,7 @@
         t.invoice_type , t.dept_name deptName,t.glzt
         glzt,t.uuid,t.bdk_status,t.scan_id,t.in_account_status,t.settle_source,
         t.settlement_no,
-        t.settlement_status,t.voucher_number,t.total_amount
+        t.settlement_status,t.voucher_number,t.total_amount,t.sn_voucher_number,t.postingTime,t.image_id,t.account_period
         from t_dx_record_invoice t
         WHERE t.company = #{company} and t.invoice_date between #{kpksrq} and #{kpjsrq}
         and t.gf_tax_no in
@@ -163,6 +167,18 @@
         <if test='inAccountStatus!=null and inAccountStatus != "" and inAccountStatus != "99"'>
             and t.in_account_status = #{inAccountStatus}
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
+            and t.postingTime = #{postingTime}
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
+            and t.image_id = #{imageId}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
         order by t.invoice_date desc
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"
@@ -176,7 +192,7 @@
         dqskssq,t.auth_status,t.qs_type,t.qs_status,t.confirm_user,t.qs_name,t.rzh_yesorno,
         t.invoice_type , t.dept_name deptName,t.glzt glzt,t.uuid,t.bdk_status,t.in_account_status,t.settle_source,
         t.settlement_no,
-        t.settlement_status,t.voucher_number,t.total_amount
+        t.settlement_status,t.voucher_number,t.total_amount,t.sn_voucher_number,t.postingTime,t.image_id,t.account_period
         from t_dx_record_invoice t
         WHERE t.company = #{company} and t.invoice_date between to_date(#{kpksrq},'yyyy-mm-dd
         hh24:mi:ss') and
@@ -280,6 +296,18 @@
         <if test='inAccountStatus!=null and inAccountStatus != "" and inAccountStatus != "99"'>
             and t.in_account_status = #{inAccountStatus}
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
+            and t.postingTime = #{postingTime}
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
+            and t.image_id = #{imageId}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
         order by t.invoice_date desc
     </select>
 
@@ -387,6 +415,18 @@
         <if test='inAccountStatus!=null and inAccountStatus != "" and inAccountStatus != "99"'>
             and t.in_account_status = #{inAccountStatus}
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
+            and t.postingTime = #{postingTime}
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
+            and t.image_id = #{imageId}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
     </select>
 
     <select id="selectBbfpzhHj" parameterType="java.util.Map"