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 |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 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 af4cb64..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
@@ -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);
 
@@ -153,18 +157,35 @@
             Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
             String bool1=IsSuccess.toString();
             boolean bool = false;
-            //淇濆瓨瀹屾垚鍘熻鍗�5杞�6 6.淇濆瓨瀹屾垚
+            //淇濆瓨瀹屾垚鍘熻鍗�1杞�2 2.淇濆瓨瀹屾垚
             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);
-                //鎻愪氦瀹屾垚鍘熻鍗�5杞�6  6.涓婃姤瀹屾垚
+                //鎻愪氦瀹屾垚鍘熻鍗�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()));
+                        }
+
+                    }
+
                 }
             }
 

--
Gitblit v1.9.1