From 57f9a55581343a805cd589bbdc00e4d28a28aa97 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 28 七月 2025 13:26:42 +0800
Subject: [PATCH] erp对接

---
 src/main/java/com/zy/asrs/service/impl/CheckDetlServiceImpl.java |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/CheckDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CheckDetlServiceImpl.java
index 28c91e6..503bf9a 100644
--- a/src/main/java/com/zy/asrs/service/impl/CheckDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CheckDetlServiceImpl.java
@@ -3,12 +3,13 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.zy.asrs.entity.CheckDetl;
+import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.mapper.CheckDetlMapper;
 import com.zy.asrs.service.ApiLogService;
 import com.zy.asrs.service.CheckDetlService;
-import com.zy.asrs.task.kingdee.handler.LoginAuthenticationHandler;
 import com.zy.common.utils.HttpHandler;
 import javafx.print.Printer;
 import lombok.extern.slf4j.Slf4j;
@@ -29,15 +30,12 @@
     @Value("${erp.address.URL}")
     //绔彛
     private String URL;
-    @Value("${erp.address.outaddressSubmit}")
-    //涓婃姤鍑哄叆搴撳湴鍧�
-    private String outaddressSubmit;
-
+    @Value("${erp.address.outaddressSave}")
+    private String uploadAddress;
+    @Autowired
+    private CheckDetlService checkDetlService;
     @Autowired
     private ApiLogService apiLogService;
-
-    @Autowired
-    private LoginAuthenticationHandler loginAuthenticationHandler;
 
 
     @Override
@@ -45,18 +43,23 @@
     public void upload(List<CheckDetl> list) {
         Date now = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+
         // 鏋勫缓涓诲崟 JSON 鏁版嵁
         JSONObject requestBody = new JSONObject();
-        requestBody.put("createTime", sdf.format(now));
+        if (!list.isEmpty()) {
+            CheckDetl first = list.get(0);
+            requestBody.put("orderNo", first.getOrderNo());
+        }
         // 鏋勫缓鐗╂枡鍒楄〃
         JSONArray matList = new JSONArray();
 
         for(CheckDetl checkDetl : list) {
             JSONObject mat = new JSONObject();
             mat.put("detailId", checkDetl.getDetailId());
-            mat.put("orderNo", checkDetl.getOrderNo());
             mat.put("matnr", checkDetl.getMatnr());
             mat.put("anfme", checkDetl.getAnfme());
+            mat.put("number", checkDetl.getNumber());
             matList.add(mat);
         }
         requestBody.put("data", matList);
@@ -64,14 +67,9 @@
         String response = "";
         boolean success = false;
         try {
-            HashMap<String, Object> headers = new HashMap<>();
-            //  cookie
-            headers.put("Cookie", loginAuthenticationHandler.start().getContent());
-
             response = new HttpHandler.Builder()
-                    .setHeaders(headers)
                     .setUri(URL)
-                    .setPath(outaddressSubmit) // 璁剧疆浣犵殑鎺ュ彛璺緞
+                    .setPath(uploadAddress) // 璁剧疆浣犵殑鎺ュ彛璺緞
                     .setJson(requestBody.toJSONString())
                     .build()
                     .doPost();
@@ -89,7 +87,7 @@
             try {
                 apiLogService.save(
                         "鐩樼偣涓婃姤",
-                        URL + outaddressSubmit,
+                        URL + uploadAddress,
                         null,
                         "127.0.0.1",
                         requestBody.toJSONString(),
@@ -100,6 +98,11 @@
                 log.error("鏃ュ織淇濆瓨澶辫触", e);
             }
         }
+        if(success) {
+            for (CheckDetl entity : list){
+                checkDetlService.delete(new EntityWrapper<>(entity));
+            }
+        }
     }
 
     public static Object findValueByKey(JSONObject json, String key) {

--
Gitblit v1.9.1