From d0bbe9df6abe1a903ac0f8371da74aba91d35f7e Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 15 一月 2026 15:21:47 +0800
Subject: [PATCH] 添加备货指示派工单上报

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   57 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 39 insertions(+), 18 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 2f138d3..37bb04e 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -292,8 +292,6 @@
                         .setLocation_type(MatLocType.getMatTag(material.getTagId()  + ""))
                         // 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
                         .setSj_date(Utils.dateToStr(order.getUpdateTime(), "yyyy-MM-dd HH:mm:ss") )
-                        // 涓婃姤鏃讹紝榛樿涓婃姤浜烘槸鏇存柊浜�
-                        .setSj_emp(order.getUpdateBy$())
                         // 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
                         .setPick_qty(detl.getQty().intValue())
                         // 涓婃姤鏃讹紝榛樿鎹熷潖鏁伴噺鏄�0
@@ -311,8 +309,11 @@
             try {
                 List<ReportOrderParam> orderParams = new ArrayList<>();
                 orderParams.add(orderParam);
-                response = kopenApiService.getInDispatchResult(orderParams);
-
+                if (order.getReportOnce() < 4) {
+                    response = kopenApiService.getInDispatchResult(orderParams, order);
+                } else {
+                    return FAIL;
+                }
                 // if (true) {
                 // success = true;
                 // // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
@@ -393,14 +394,14 @@
             XSR response = null;
             boolean success = false;
             try {
-                // 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)) {
+                List<ReportOrderParam> orderParams = new ArrayList<>();
+                orderParams.add(orderParam);
+                if (order.getReportOnce() < 4) {
+                    response = kopenApiService.reportOutDetailsResult(orderParams, order);
+                } else {
+                    return FAIL;
+                }
+
                 if (true) {
                     success = true;
                     // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
@@ -457,7 +458,8 @@
                 itemParam.setPro_komcode(material.getMatnr());
                 // 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
                 itemParam.setPro_id(detl.getSuppCode());
-
+                //todo 鍙拌溅缂栫爜
+                itemParam.setTruck_no("TC310080014");
                 // 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
                 itemParam.setPick_qty(detl.getQty().intValue());
                 reportOrderParams.add(itemParam);
@@ -468,7 +470,7 @@
             pubOrderParamsList.add(pubOrderParams);
             // 璁剧疆娲惧伐鍗曟槑缁�
             stockUpOrderParams.setDetails(pubOrderParamsList);
-            stockUpOrderParams.setUpdate_time(order.getUpdateBy$());
+            stockUpOrderParams.setUpdate_time(order.getUpdateTime$());
 
             XSR response = null;
             boolean success = false;
@@ -481,7 +483,16 @@
                 // .doPost();
                 // JSONObject jsonObject = JSON.parseObject(response);
                 // if (jsonObject.getInteger("code").equals(200)) {
-                if (true) {
+
+                List<StockUpOrderParams> orderParams = new ArrayList<>();
+                orderParams.add(stockUpOrderParams);
+                if (order.getReportOnce() < 4) {
+                    response = kopenApiService.getOutDetailsResult(orderParams, order);
+                } else {
+                    return FAIL;
+                }
+
+                if (response.getSuccess()) {
                     success = true;
                     // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
                     if (!orderService.updateSettle(order.getId(), settle, null)) {
@@ -531,10 +542,11 @@
         adjustParam.setCompany_id(order.getCstmrName())
                 .setWms_id(order.getId() + "")
                 .setType(0 + "")
-                .setCompany_id(order.getCstmrName());
+                .setUpdate_time(order.getUpdateTime$());
+//                .setKopen_id(order.getDefNumber());
 
-        adjustParam.setBsby_no(order.getNumber())
-                .setResason("")
+        adjustParam.setBsby_no(order.getOrderNo())
+                .setReason("")
                 .setReason_name("");
         List<CheckOrderDetl> detls = checkOrderDetlService
                 .selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", order.getId()));
@@ -558,6 +570,15 @@
 
         adjustParams.add(adjustParam);
 
+        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