From 4f55ef2b31a12de45246cc6b2e1ee22a11769486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=90=A6?= <sci3197@dingtalk.com>
Date: Thu, 23 Nov 2023 15:17:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E9=A1=B9=E5=8F=91=E7=A5=A8=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dxhy/erp/entity/sdny/S4Request.java     | 12 ++++++++++++
 .../erp/service/impl/ImageSubmitServiceImpl.java     |  4 ++--
 升级sql/销项发票提交.sql                     |  4 +++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/S4Request.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/S4Request.java
index 5ca78cc1..dd4bfe6d 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/S4Request.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/S4Request.java
@@ -1,5 +1,6 @@
 package com.dxhy.erp.entity.sdny;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -23,16 +24,27 @@ import javax.xml.bind.annotation.XmlRootElement;
 @NoArgsConstructor
 public class S4Request {
 
+    @JSONField(name = "SYSID")
     private String SYSID;
+    @JSONField(name = "IFYWID")
     private String IFYWID;
+    @JSONField(name = "BSKEY")
     private String BSKEY;
+    @JSONField(name = "SAPKEY")
     private String SAPKEY;
+    @JSONField(name = "ZORG")
     private String ZORG;
+    @JSONField(name = "ZFILED1")
     private String ZFILED1;
+    @JSONField(name = "ZFILED2")
     private String ZFILED2;
+    @JSONField(name = "ZFILED3")
     private String ZFILED3;
+    @JSONField(name = "ZFILED4")
     private String ZFILED4;
+    @JSONField(name = "ZFILED5")
     private String ZFILED5;
+    @JSONField(name = "ZDATA")
     private String ZDATA;
 
 
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 c7cc9f62..e586333b 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
@@ -30,7 +30,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
-//@Transactional(rollbackFor = Exception.class)
+@Transactional(rollbackFor = Exception.class)
 @Slf4j
 public class ImageSubmitServiceImpl implements ImageSubmitService {
 
@@ -337,7 +337,7 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
         param.put("IS_INPUT", request);
         //推送到SAP
         log.info("推送山能数据:{}", JSONObject.toJSONString(param));
-        String result = snPushCheckRecordService.pushCheckResultToSAP(param.toJSONString());
+        String result = snPushCheckRecordService.pushCheckResultToSAP(JSONObject.toJSONString(param));
         JSONObject rs = JSONObject.parseObject(result).getJSONObject("ES_OUTPUT");
         if (!"S".equals(rs.getString("ZTYPE"))) {
             return R.error(500,rs.getString("ZMESSAGE"));
diff --git a/升级sql/销项发票提交.sql b/升级sql/销项发票提交.sql
index 50f5399f..f7e06653 100644
--- a/升级sql/销项发票提交.sql
+++ b/升级sql/销项发票提交.sql
@@ -10,4 +10,6 @@ ALTER TABLE `dxhy_tertiary`.`t_dx_sale_record_invoice` MODIFY COLUMN `image_id`
 
 ALTER TABLE `dxhy_tertiary`.`t_dx_sale_record_invoice` MODIFY COLUMN `sn_voucher_number` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '山能凭证号' AFTER `account_period`;
 
-ALTER TABLE `dxhy_detail`.`t_dx_record_invoice_detail_sales` MODIFY COLUMN `tax_code` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '税码' AFTER `kce`;
\ No newline at end of file
+ALTER TABLE `dxhy_tertiary`.`t_dx_record_invoice_detail_sales` MODIFY COLUMN `tax_code` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '税码' AFTER `kce`;
+
+ALTER TABLE dxhy_tertiary.t_dx_sale_record_invoice ADD INDEX image_id(image_id);