From 93860dbc9e47ef9886c1347ce0bf14e9f0438b2a Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期一, 05 一月 2026 17:20:14 +0800
Subject: [PATCH] 备货派工单优化 库存调整反馈优化

---
 src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java |   83 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index 492bd97..c565ee8 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -589,22 +589,22 @@
             if (Objects.isNull(response) || response.trim().isEmpty()) {
                 return XSR.error("澶栫綉鎺ュ彛鏃犲搷搴旓紒锛�");
             }
-            JSONObject jsonObject = JSONObject.parseObject(response);
-            Integer code = jsonObject.getInteger("code");
-            if (!Objects.isNull(code) && code.equals(200)) {
-//                if (!Objects.isNull(order)) {
-//                    order.setReportOnce(5);
-//                    orderService.updateById(order);
-//                }
+            XSR jsonObject = JSONObject.parseObject(response, XSR.class);
+            if (jsonObject.getSuccess()) {
+                if (!Objects.isNull(order)) {
+                    order.setReportOnce(5);
+                    order.setSettle(5L);
+                    checkOrderService.updateById(order);
+                }
                 return XSR.ok("鍏ュ簱鍗曚笂鎶ュ畬鎴愶紒锛�");
             } else {
-//                if (!Objects.isNull(order)) {
-//                    int reportOnce = order.getReportOnce();
-//                    reportOnce ++;
-//                    order.setReportOnce(reportOnce);
-//                    orderService.updateById(order);
-//                }
-                String msg = jsonObject.getString("message");
+                if (!Objects.isNull(order)) {
+                    int reportOnce = order.getReportOnce();
+                    reportOnce ++;
+                    order.setReportOnce(reportOnce);
+                    checkOrderService.updateById(order);
+                }
+                String msg = jsonObject.getMessage();
                 return XSR.error(Objects.isNull(msg) ? "涓婃姤澶辫触锛侊紒" : msg);
             }
         } catch (Exception e) {
@@ -618,6 +618,59 @@
             return XSR.error(e.getMessage());
         }
 //        return null;
+    }
+
+    /**
+     * 澶囪揣鍗曞弽棣�
+     * @param params
+     * @param order
+     * @return
+     */
+    @Override
+    public XSR getOutDetailsResult(List<StockUpOrderParams> params, Order order) {
+        if (Objects.isNull(params)) {
+            return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        String response = null;
+
+        try {
+            response = new HttpHandler.Builder()
+                    .setUri(url + ":" + port)
+                    .setPath(prefix + "/getOutDetailsResult")
+                    .setJson(JSONObject.toJSONString(params))
+                    .build()
+                    .doPost();
+            if (Objects.isNull(response) || response.trim().isEmpty()) {
+                return XSR.error("澶栫綉鎺ュ彛鏃犲搷搴旓紒锛�");
+            }
+            JSONObject jsonObject = JSONObject.parseObject(response);
+            Integer code = jsonObject.getInteger("code");
+            if (!Objects.isNull(code) && code.equals(200)) {
+                if (!Objects.isNull(order)) {
+                    order.setReportOnce(5);
+                    orderService.updateById(order);
+                }
+                return XSR.ok("鍏ュ簱鍗曚笂鎶ュ畬鎴愶紒锛�");
+            } else {
+                if (!Objects.isNull(order)) {
+                    int reportOnce = order.getReportOnce();
+                    reportOnce ++;
+                    order.setReportOnce(reportOnce);
+                    orderService.updateById(order);
+                }
+                String msg = jsonObject.getString("message");
+                return XSR.error(Objects.isNull(msg) ? "涓婃姤澶辫触锛侊紒" : msg);
+            }
+        } catch (Exception e) {
+            if (!Objects.isNull(order)) {
+                int reportOnce = order.getReportOnce();
+                reportOnce ++;
+                order.setReportOnce(reportOnce);
+                orderService.updateById(order);
+            }
+            log.error(e.getMessage(), e);
+            return XSR.error(e.getMessage());
+        }
     }
 
     /** 鐢熸垚鏂扮殑闆朵欢鎹熸孩鍗� 
@@ -647,7 +700,7 @@
         order.setSettle(Long.valueOf(CommonEnum.COMMON_ENUM_Y.type + ""));
         order.setStatus(CommonEnum.COMMON_ENUM_Y.type);
         order.setOrderTime(params.getUpdate_time());
-        order.setMemo(params.getResason());
+        order.setMemo(params.getReason());
         order.setShipName(params.getReason_name());
         order.setCreateTime(new Date());
         order.setUpdateTime(new Date());

--
Gitblit v1.9.1