From 3f41101ae170f2508910ff8539c09f1940482574 Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期四, 15 一月 2026 16:05:16 +0800
Subject: [PATCH] no message

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   55 +++++++++++++++++++++++++++++++++----------------------
 1 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 0b400ae..a0e4ed2 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -376,7 +376,7 @@
                         // 涓婃姤鏃讹紝榛樿鐩爣浣嶇疆鏄痭ull
                         .setLocation_type(null)
                         // 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
-                        .setSj_date(order.getUpdateBy().toString())
+                        .setSj_date(order.getUpdateTime$())
                         // 涓婃姤鏃讹紝榛樿涓婃姤浜烘槸鏇存柊浜�
                         .setSj_emp(order.getUpdateBy$())
                         // 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
@@ -394,22 +394,14 @@
             XSR response = null;
             boolean success = false;
             try {
-//                List<ReportOrderParam> orderParams = new ArrayList<>();
-//                orderParams.add(orderParam);
-//                if (order.getReportOnce() < 4) {
-//                    response = kopenApiService.getOutDetailsResult(orderParams, order);
-//                } else {
-//                    return FAIL;
-//                }
-                // response = new HttpHandler.Builder()
-                // .setUri(MesConstant.URL)
-                // .setPath(MesConstant.PAKOUT_URL)
-                // .setJson(JSON.toJSONString(pakoutParam))
-                // .build()
-                // .doPost();
-                // JSONObject jsonObject = JSON.parseObject(response);
-                // if (jsonObject.getInteger("code").equals(200)) {
-                if (true) {
+                List<ReportOrderParam> orderParams = new ArrayList<>();
+                orderParams.add(orderParam);
+                if (order.getReportOnce() < 4) {
+                    response = kopenApiService.reportOutDetailsResult(orderParams, order);
+                } else {
+                    return FAIL;
+                }
+                if (response.getSuccess()) {
                     success = true;
                     // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
                     if (!orderService.updateSettle(order.getId(), settle, null)) {
@@ -417,10 +409,22 @@
                     }
                 } else {
                     log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}",
-                            MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT,
-                            JSON.toJSONString(orderParam), JSON.toJSONString(response));
+                            MesConstant.URL + MesConstant.OUT_DETAILS_RESULT,
+                            JSON.toJSONString(orderParams), JSON.toJSONString(response));
                     throw new CoolException("涓婃姤KOPEN绯荤粺澶辫触");
                 }
+//                if (true) {
+//                    success = true;
+//                    // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+//                    if (!orderService.updateSettle(order.getId(), settle, null)) {
+//                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+//                    }
+//                } else {
+//                    log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}",
+//                            MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT,
+//                            JSON.toJSONString(orderParam), JSON.toJSONString(response));
+//                    throw new CoolException("涓婃姤KOPEN绯荤粺澶辫触");
+//                }
             } catch (Exception e) {
                 log.error("fail", e);
                 return FAIL.setMsg(e.getMessage());
@@ -549,8 +553,8 @@
         adjustParam.setCompany_id(order.getCstmrName())
                 .setWms_id(order.getId() + "")
                 .setType(0 + "")
-                .setUpdate_time(order.getUpdateTime$())
-                .setKopen_id(order.getDefNumber());
+                .setUpdate_time(order.getUpdateTime$());
+//                .setKopen_id(order.getDefNumber());
 
         adjustParam.setBsby_no(order.getOrderNo())
                 .setReason("")
@@ -577,7 +581,14 @@
 
         adjustParams.add(adjustParam);
 
-        XSR response = kopenApiService.reportCheckOrder(adjustParams, order);
+        if (order.getReportOnce() < 3) {
+            XSR response = kopenApiService.reportCheckOrder(adjustParams, order);
+            if (response.getSuccess()) {
+                return SUCCESS;
+            } else {
+                return  FAIL;
+            }
+        }
 
         return SUCCESS;
         // TODO Auto-generated method stub

--
Gitblit v1.9.1