From b59c16db71fbe29770d3dfffe3cb468857c2eca2 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 30 十二月 2024 09:27:12 +0800
Subject: [PATCH] 完善金蝶上报流程
---
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 56 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
index 20975cc..62b53fa 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
@@ -66,17 +66,17 @@
return SUCCESS;
}
KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
- if (kingDeeUtilType.entryId!=2){
- return SUCCESS;
- }
+// if (kingDeeUtilType.entryId!=2){
+// return SUCCESS;
+// }
Date now = new Date();
//鏉′欢鎷兼帴
JSONObject jsonObjectFBillTypeID = new JSONObject();
JSONObject jsonObjectFPickerId = new JSONObject();
if (kingDeeUtilType.pakIn==1){
- jsonObjectFBillTypeID.put("FNUMBER","QTRKD01_SYS");
+ jsonObjectFBillTypeID.put("FNUMBER","TLD01_SYS");
}else {
- jsonObjectFBillTypeID.put("FNUMBER","QTCKD01_SYS");
+ jsonObjectFBillTypeID.put("FNUMBER","TLD01_SYS");
jsonObjectFPickerId.put("FStaffNumber","X0103_GLGW074_1");
}
@@ -108,7 +108,11 @@
orderedMap.put("FMATERIALID", jsonObjectFMATERIALID);
orderedMap.put("FSTOCKID", jsonObjectFSTOCKID);
orderedMap.put("FLOT", jsonObjectFLOT);
- orderedMap.put("FQty", orderDetl.getQty()); // 灏�"FQty"鏀惧埌鏈�鍚�
+ if(orderDetl.getQty().equals(0.0)){
+ orderedMap.put("FQty", orderDetl.getQty());
+ }else{
+ orderedMap.put("FQty", orderDetl.getQty()-orderDetl.getPrice()); // 灏�"FQty"鏀惧埌鏈�鍚�
+ }
JSONObject jsonObjectEnd = new JSONObject(orderedMap);
@@ -152,25 +156,45 @@
JSONObject data = JSON.parseObject(response);
Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
String bool1=IsSuccess.toString();
- //淇濆瓨瀹屾垚鍘熻鍗�8杞�6
+ boolean bool = false;
+ //淇濆瓨瀹屾垚鍘熻鍗�1杞�2 2.淇濆瓨瀹屾垚
if(bool1.equals("true")){
ObjectMapper objectMapper = new ObjectMapper();
JsonNode rootNode = objectMapper.readTree(response);
- boolean bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
- log.info("瀹℃牳bool:"+bool);
- //鎻愪氦瀹屾垚鍘熻鍗�4杞�6 6.涓婃姤瀹屾垚
+ bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
+ log.info("淇濆瓨bool:"+bool);
+ //鎻愪氦瀹屾垚鍘熻鍗�1杞�2 2.涓婃姤瀹屾垚
if(bool){
success = true;
- order.setSettle(6L);
+ order.setMemo("2");
order.setUpdateTime(new Date());
orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+
+ for(OrderDetl orderDetl:orderDetls){
+ orderDetl.setPrice(orderDetl.getQty());
+ orderDetl.setUpdateTime(new Date());
+ if(Cools.isEmpty(orderDetl.getBatch())){
+ orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>()
+ .eq("order_no",order.getOrderNo())
+ .eq("matnr",orderDetl.getMatnr()));
+ }else{
+ orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>()
+ .eq("order_no",order.getOrderNo())
+ .eq("matnr",orderDetl.getMatnr())
+ .eq("batch",orderDetl.getBatch()));
+ }
+
+ }
+
}
- }else {
- success = false;
- order.setSettle(7L);
- 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.error("fail", e);
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
--
Gitblit v1.9.1