From 391dd89a6583e0f1eceaf1297fd852e3da32bf68 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 17 四月 2025 16:39:30 +0800
Subject: [PATCH] 出库作业里面显示冻结/未冻结

---
 src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
index 72e286f..d6a5165 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
@@ -21,6 +21,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Slf4j
@@ -56,15 +57,15 @@
         param.setcCusName(order.getCstmrName());
         param.setcAccount(order.getNumber());
         param.setcMemo(order.getMemo());
-        param.setType(order.getDocType$());
-        param.setdDate(Utils.getDateStr(order.getCreateTime()));
+        param.setType(Cools.isEmpty(order.getDocType$()) ? "" : order.getDocType$());
+        param.setdDate(Utils.getDateStr(new Date()));
         param.setAllocation(order.getItemName());
 
 
         List<OpenOrderPakoutParam.Body> bodyList = new ArrayList<>();
         param.setaDDBody(bodyList);
 
-        for(OrderDetl orderDetl : orderDetlList){
+        for (OrderDetl orderDetl : orderDetlList) {
             OpenOrderPakoutParam.Body body = new OpenOrderPakoutParam.Body();
             body.setiQuantity(orderDetl.getQty());
             body.setcInvCode(orderDetl.getMatnr());
@@ -74,16 +75,15 @@
 
         doHttpRequest(param, "涓婃姤ERP鍑哄簱鍗曟嵁", url, orderReportPath, null, "127.0.0.1");
 
-        orderService.updateSettle(order.getId(),6L,0L);
-
+        orderService.updateSettle(order.getId(), 6L, 0L);
 
 
     }
 
-    private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
+    private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
         String response = "";
         boolean success = false;
-        log.error(JSONObject.toJSONString(requestParam));
+        log.info(JSONObject.toJSONString(requestParam));
         try {
             response = new HttpHandler.Builder()
                     .setUri(url)
@@ -91,22 +91,22 @@
                     .setJson(JSONObject.toJSONString(requestParam))
                     .build()
                     .doPost();
+            log.info("涓婃姤ERP鍑哄簱鍗曟嵁璇锋眰杩斿洖鎶ユ枃锛歿}", response);
             JSONObject jsonObject = JSON.parseObject(response);
-
-            if(Cools.isEmpty(jsonObject.get("ErrorCode"))){
+            if (Cools.isEmpty(jsonObject.get("ErrorCode"))) {
                 throw new CoolException(jsonObject.get("ErrorMsg").toString());
             }
 
-            int code = Integer.parseInt(jsonObject.get("ErrorCode").toString()) ;
-            if(code == 0){
+            int code = Integer.parseInt(jsonObject.get("ErrorCode").toString());
+            if (code == 0) {
                 throw new CoolException(jsonObject.get("ErrorMsg").toString());
             }
             success = true;
             return code;
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error(e.getMessage());
             throw new CoolException("璋冪敤鎺ュ彛鍝嶅簲閿欒");
-        }finally {
+        } finally {
             apiLogService.save(
                     namespace,
                     url + path,

--
Gitblit v1.9.1