From 277ce0556ebe4bd91af10f3e4e8b69bab78947d7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 十一月 2024 12:11:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java | 61 +++++++++++++++++++-----------
1 files changed, 38 insertions(+), 23 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..95b6e28 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
@@ -60,29 +60,35 @@
String[] split = orderNo.split("-");
String orderNoS = split[0];
//鐧诲綍閲戣澏r
- log.info("鐧诲綍閲戣澏");
+// log.info("鐧诲綍閲戣澏");
ReturnT<String> start = loginAuthenticationHandler.start();
- log.info("鐧诲綍閲戣澏:start:"+start);
+// log.info("鐧诲綍閲戣澏:start:"+start);
DocType docType = docTypeService.selectById(order.getDocType());
if (null == docType) {
return SUCCESS;
}
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