From 6b02223ae9c193e4fb04e5c6ea48e76e4b60cb32 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 09:57:34 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
index 7b7092d..c9e9340 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
@@ -47,8 +47,13 @@
 
     @Transactional
     public ReturnT<String> start(Order order) {
+        String orderNo = order.getOrderNo();
+        String[] split = orderNo.split("-");
+        String orderNoS = split[0];
         //鐧诲綍閲戣澏r
+        log.info("鐧诲綍閲戣澏");
         ReturnT<String> start = loginAuthenticationHandler.start();
+        log.info("鐧诲綍閲戣澏:start:"+start);
         DocType docType = docTypeService.selectById(order.getDocType());
         if (null == docType) {
             return SUCCESS;
@@ -56,14 +61,21 @@
         KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
 
         //鏉′欢鎷兼帴
+        log.info("鏉′欢鎷兼帴");
         JSONObject dataJsonObject = new JSONObject();
-        dataJsonObject.put("Numbers",order.getOrderNo());
+        dataJsonObject.put("Numbers",orderNoS);
+        dataJsonObject.put("EntryIds","");
+        dataJsonObject.put("RuleId",kingDeeUtilType.ruleId);
+        dataJsonObject.put("TargetFormId",kingDeeUtilType.correspondingFormId);
 
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("data", dataJsonObject);
         jsonObject.put("FormId",kingDeeUtilType.formId);
+        jsonObject.put("data", dataJsonObject);
         String add = jsonObject.toJSONString();
+        log.info("鏉′欢鎷兼帴:"+jsonObject);
+
         //涓嬫帹
+        log.info("涓嬫帹");
         String response = "";
         boolean success = false;
         try {
@@ -75,18 +87,21 @@
                     .setUri(URL)
                     .setPath(pushDowmAudit)
                     .setJson(add)
+                    .setHttps(true)
                     .build()
                     .doPost();
             JSONObject data = JSON.parseObject(response);
+            log.info("涓嬫帹response:"+response);
             Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
             String bool=IsSuccess.toString();
-            //瀹℃牳瀹屾垚鍘熻鍗�4杞�6  6.涓婃姤瀹屾垚
+            //涓嬫帹瀹屾垚鍘熻鍗�4杞�6  6.涓婃姤瀹屾垚
             if(bool.equals("true")){
                 success = true;
                 order.setSettle(6L);
                 orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
             }
         } catch (Exception e) {
+            log.info("涓嬫帹error:"+response);
             log.error("fail", e);
 //            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return FAIL.setMsg(e.getMessage());
@@ -94,7 +109,7 @@
             try {
                 // 淇濆瓨鎺ュ彛鏃ュ織
                 apiLogService.save(
-                        "瀹℃牳",
+                        "涓嬫帹",
                         URL+ pushDowmAudit,
                         null,
                         "127.0.0.1",

--
Gitblit v1.9.1