From 4562b85f1e1578ce5f13d19887dec8a8a44382ea Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 28 Mar 2023 11:00:32 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E7=A8=8E=E7=A0=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SDNYMainProcessController.java | 58 +++++++++++++++++--
 .../dxhy/erp/entity/sdny/SAPInvoiceInfo.java  |  2 +-
 .../com/dxhy/erp/entity/sdny/SNSAPObject.java |  2 +-
 .../erp/service/SNPushCheckRecordService.java |  4 +-
 4 files changed, 58 insertions(+), 8 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 c828ea84..1f546638 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
@@ -232,6 +232,7 @@ public class SDNYMainProcessController extends AbstractController {
                         }
                     }
 
+                    //价税分离
                     if(SNFplxEnum.HCP.getFplxDm().equals(fplxdm) || SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm) || SNFplxEnum.JPXCD.getFplxDm().equals(fplxdm)){
                         InvoiceInfo invoiceInfo = convertToInvoiceInfo(invoice);
                         ServiceResult<InvoiceInfo> invoiceResult = snPushCheckRecordService.valoremTaxCount(invoiceInfo, "Y");
@@ -312,7 +313,7 @@ public class SDNYMainProcessController extends AbstractController {
         object.setZFILED4("");
         object.setZFILED5("200");
 
-        List<SAPInvoiceInfo> sapInvoiceInfos = new ArrayList<>();
+        List<String> sapInvoiceInfos = new ArrayList<>();
         SAPInvoiceInfo info = new SAPInvoiceInfo();
         info.setZBAZT("0");
         info.setZXFSH(snInvoice.getSalesTaxNo());
@@ -355,7 +356,7 @@ public class SDNYMainProcessController extends AbstractController {
         if (invoiceLineList != null && invoiceLineList.size() > 0) {
             SNInvoiceDetail snInvoiceDetail = invoiceLineList.get(0);
             String taxRate = snInvoiceDetail.getTaxRate();
-            info.setZSM(taxRate);
+            info.setZSM(getZSM(taxRate));
             info.setZTAX(taxRate);
 
             SAPInvoiceDetail sapInvoiceDetail = new SAPInvoiceDetail();
@@ -387,7 +388,7 @@ public class SDNYMainProcessController extends AbstractController {
             sapInvoiceDetailList.add(sapInvoiceDetail);
         }
 
-        info.setIT_ITEM(sapInvoiceDetailList);
+        info.setIT_ITEM(sapInvoiceDetailList.toString());
 
         info.setZFPDM(snInvoice.getInvoiceCode());
         info.setZCD(snInvoice.getOriginPlace());
@@ -447,10 +448,59 @@ public class SDNYMainProcessController extends AbstractController {
         info.setZZWLX(snInvoice.getSeat());
         info.setZTID(snInvoice.getInvoiceCode()+snInvoice.getInvoiceNumber());
 
-        sapInvoiceInfos.add(info);
+        sapInvoiceInfos.add(info.toString());
         object.setZDATA(sapInvoiceInfos);
         return object;
 
     }
 
+    private String getZSM(String taxRate) {
+
+        String sm = "";
+
+        switch (taxRate) {
+            // 发票采集
+            case "0":
+                sm = "J0";
+                break;
+            case "免税":
+                sm = "J0";
+                break;
+            case "16":
+                sm = "J1";
+                break;
+            case "13":
+                sm = "J2";
+                break;
+            case "10":
+                sm = "J3";
+                break;
+            case "9":
+                sm = "J4";
+                break;
+            case "6":
+                sm = "J5";
+                break;
+            case "5":
+                sm = "J6";
+                break;
+            case "3":
+                sm = "J7";
+                break;
+            case "2":
+                sm = "J8";
+                break;
+            case "1":
+                sm = "J9";
+                break;
+            case "17":
+                sm = "JC";
+                break;
+            default:
+                sm = "";
+                break;
+
+        }
+        return sm;
+    }
 }
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 e7d375fb..59e276f1 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
@@ -452,7 +452,7 @@ public class SAPInvoiceInfo {
      * 行项目结构
      */
     @JSONField(name = "IT_ITEM")
-    private List<SAPInvoiceDetail> IT_ITEM;
+    private String IT_ITEM;
 
 
     /**
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 b20d258e..473178d6 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<SAPInvoiceInfo> ZDATA;
+    private List<String> ZDATA;
 
 }
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
index c06b8bde..37b0cfd6 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
@@ -45,8 +45,8 @@ import java.util.*;
 /**
  * 与山东能源交互数据主类
  *
- * @author JLY
- * @date 2017年6月26日下午5:02:49
+ * @author ariesy
+ * @date 2023年3月22日下午5:02:49
  */
 @SuppressWarnings("AlibabaUndefineMagicConstant")
 @Service