From fa3e00c4d5e91613e3f2a1f2692cb68635d4ad2d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 七月 2025 08:31:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 89 +++++++++++---------------------------------
1 files changed, 22 insertions(+), 67 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 62b53fa..4c07a88 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
@@ -71,73 +71,29 @@
// }
Date now = new Date();
//鏉′欢鎷兼帴
- JSONObject jsonObjectFBillTypeID = new JSONObject();
- JSONObject jsonObjectFPickerId = new JSONObject();
- if (kingDeeUtilType.pakIn==1){
- jsonObjectFBillTypeID.put("FNUMBER","TLD01_SYS");
- }else {
- jsonObjectFBillTypeID.put("FNUMBER","TLD01_SYS");
- jsonObjectFPickerId.put("FStaffNumber","X0103_GLGW074_1");
- }
+ JSONObject jsonObject=new JSONObject();
+ jsonObject.put("FormId",kingDeeUtilType.correspondingFormId);
- JSONObject jsonObjectFStockOrgId = new JSONObject();
- jsonObjectFStockOrgId.put("FNUMBER","100");
+ JSONObject model=new JSONObject();
+ model.put("fid",order.getPostFeeType());
- JSONObject jsonObjectFOwnerIdHead = new JSONObject();
- jsonObjectFOwnerIdHead.put("FNUMBER","100");
-
- JSONObject jsonObjectFDEPTID = new JSONObject();
- jsonObjectFDEPTID.put("FNUMBER","CX");
-
- List<JSONObject> jsonObjects = new ArrayList<>();
-
- for (OrderDetl orderDetl:orderDetls){
- JSONObject jsonObjectFMATERIALID = new JSONObject();
- jsonObjectFMATERIALID.put("FNUMBER",orderDetl.getMatnr());
-
- JSONObject jsonObjectFSTOCKID = new JSONObject();
- jsonObjectFSTOCKID.put("FNUMBER","CK001");
-
- JSONObject jsonObjectFLOT = new JSONObject();
- jsonObjectFLOT.put("FNUMBER",orderDetl.getBatch());
-
- // 浣跨敤LinkedHashMap鏉ヤ繚鎸佹彃鍏ラ『搴�
- Map<String, Object> orderedMap = new LinkedHashMap<>();
-
- // 鎸夌収鏈熸湜鐨勯『搴忔坊鍔犻敭鍊煎
- orderedMap.put("FMATERIALID", jsonObjectFMATERIALID);
- orderedMap.put("FSTOCKID", jsonObjectFSTOCKID);
- orderedMap.put("FLOT", jsonObjectFLOT);
+ JSONArray fEntitys = new JSONArray();
+ for (OrderDetl orderDetl : orderDetls) {
+ JSONObject fEntity = new JSONObject();
+ fEntity.put("FEntryID",orderDetl.getBeBatch());
+ //瀹屾垚鏁伴噺-宸蹭笂鎶ユ暟閲�
if(orderDetl.getQty().equals(0.0)){
- orderedMap.put("FQty", orderDetl.getQty());
+ fEntity.put(kingDeeUtilType.anfme, orderDetl.getQty());
}else{
- orderedMap.put("FQty", orderDetl.getQty()-orderDetl.getPrice()); // 灏�"FQty"鏀惧埌鏈�鍚�
+ fEntity.put(kingDeeUtilType.anfme, orderDetl.getQty()-orderDetl.getPrice()); // 灏�"FQty"鏀惧埌鏈�鍚�
}
-
- JSONObject jsonObjectEnd = new JSONObject(orderedMap);
-
- jsonObjects.add(jsonObjectEnd);
+ fEntitys.add(fEntity);
}
-
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("FBillTypeID",jsonObjectFBillTypeID);
- if (kingDeeUtilType.pakIn==0){
- jsonObject.put("FPickerId",jsonObjectFPickerId);
- }
- jsonObject.put("FDate",DateUtils.convert(now, DateUtils.yyyyMMdd_F));
- jsonObject.put("FStockOrgId",jsonObjectFStockOrgId);
- jsonObject.put("FOwnerTypeIdHead","BD_OwnerOrg");
- jsonObject.put("FOwnerIdHead",jsonObjectFOwnerIdHead);
- jsonObject.put("FDEPTID",jsonObjectFDEPTID);
- jsonObject.put("FEntity",jsonObjects);
-
- JSONObject jsonObjectModel = new JSONObject();
- jsonObjectModel.put("Model",jsonObject);
-
- JSONObject jsonObject1 = new JSONObject();
- jsonObject1.put("data", jsonObjectModel);
- jsonObject1.put("FormId",kingDeeUtilType.correspondingFormId);
- String add = jsonObject1.toJSONString();
+ model.put("FEntity",fEntitys);
+ JSONObject data= new JSONObject();
+ data.put("Model",model);
+ jsonObject.put("data",data);
+ String add = jsonObject.toJSONString();
//涓婃姤
String response = "";
boolean success = false;
@@ -153,20 +109,19 @@
.setHttps(true)
.build()
.doPost();
- JSONObject data = JSON.parseObject(response);
+// JSONObject data = JSON.parseObject(response);
Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
String bool1=IsSuccess.toString();
boolean bool = false;
- //淇濆瓨瀹屾垚鍘熻鍗�1杞�2 2.淇濆瓨瀹屾垚
+ //淇濆瓨瀹屾垚鍘熻鍗�2杞�3 3.淇濆瓨瀹屾垚
if(bool1.equals("true")){
ObjectMapper objectMapper = new ObjectMapper();
JsonNode rootNode = objectMapper.readTree(response);
bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
- log.info("淇濆瓨bool:"+bool);
- //鎻愪氦瀹屾垚鍘熻鍗�1杞�2 2.涓婃姤瀹屾垚
+ //鎻愪氦瀹屾垚鍘熻鍗�2杞�3 3.涓婃姤瀹屾垚
if(bool){
success = true;
- order.setMemo("2");
+ order.setMemo("3");
order.setUpdateTime(new Date());
orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
@@ -203,7 +158,7 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "淇濆瓨",
+ "3.淇濆瓨",
URL+ outaddressSave,
null,
"127.0.0.1",
--
Gitblit v1.9.1