From 1b88d2343f08f6bd3ac3250b5d532cfe80f5f37b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 05 十一月 2024 08:24:00 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java |   57 ++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 36 insertions(+), 21 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 bd043cb..dc0bc36 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
@@ -69,20 +69,26 @@
         }
         KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
 
+        if (kingDeeUtilType.entryId>1){
+            Order order1 = orderService.selectById(order.getId());
+            order1.setUpdateTime(new Date());
+            orderService.updateById(order1);
+            return SUCCESS;
+        }
         //鏉′欢鎷兼帴
         log.info("鏉′欢鎷兼帴");
         String entryIds = null;
-//        if (kingDeeUtilType.entryId==1){
-//            List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-//            for (OrderDetl orderDetl:orderDetls){
-//                if (Cools.isEmpty(entryIds)){
-//                    entryIds = orderDetl.getOrigin();
-//                }else {
-//                    entryIds = entryIds+"," +orderDetl.getOrigin();
-//                }
-//            }
-//            orderNoS = "";
-//        }
+        if (kingDeeUtilType.entryId==1){
+            List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+            for (OrderDetl orderDetl:orderDetls){
+                if (Cools.isEmpty(entryIds)){
+                    entryIds = orderDetl.getBeBatch().toString();
+                }else {
+                    entryIds = entryIds+"," +orderDetl.getBeBatch();
+                }
+            }
+            orderNoS = "";
+        }
         if (Cools.isEmpty(entryIds)){
             entryIds = "";
         }
@@ -117,20 +123,29 @@
                     .doPost();
 //            JSONObject data = JSON.parseObject(response);
             log.info("涓嬫帹response:"+response);
-//            Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
-//            String bool=IsSuccess.toString();
-            ObjectMapper objectMapper =  new ObjectMapper();
-            JsonNode rootNode = objectMapper.readTree(response);
-            boolean bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
-            log.info("涓嬫帹bool:"+bool);
+            Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
+            String bool1=IsSuccess.toString();
+            boolean bool = false;
+            if (bool1.equals("true")){
+                ObjectMapper objectMapper =  new ObjectMapper();
+                JsonNode rootNode = objectMapper.readTree(response);
+                bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
 
-            //涓嬫帹瀹屾垚鍘熻鍗�4杞�6  6.涓婃姤瀹屾垚
-            if(bool){
-                success = true;
-                order.setSettle(6L);
+                //涓嬫帹瀹屾垚鍘熻鍗�4杞�6  6.涓婃姤瀹屾垚
+                if(bool){
+                    success = true;
+                    order.setSettle(6L);
+                    order.setUpdateTime(new Date());
+                    orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+                }
+            }
+
+            if (!bool1.equals("true") || !bool){
+                order.setSettle(7L);
                 order.setUpdateTime(new Date());
                 orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
             }
+
         } catch (Exception e) {
             log.info("涓嬫帹error:"+response);
             log.error("fail", e);

--
Gitblit v1.9.1