From f23532c49f1741a14b4d28e3fd2747d08212b17a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 15 十二月 2025 08:27:16 +0800
Subject: [PATCH] 许可证修复,rcs请求参数json化

---
 src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
index d743466..67cab6e 100644
--- a/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
@@ -294,7 +294,7 @@
     public int cancelTask(RcsTaskCancel rcsTaskCancel, int rcsFactory){
 
         String url = rcsFactory == 2 ? HX_URL :HIK_URL + "api/robot/controller/task/cancel";
-        String response = sendPost(url, rcsTaskCancel.toString());
+        String response = sendPost(url, JSONObject.toJSONString(rcsTaskCancel));
         if (!StringUtils.isEmpty(response) && response.contains("code")){
             RcsReturn rcsReturn = JSONObject.parseObject(response, RcsReturn.class);
             if("SUCCESS".equals(rcsReturn.getCode())) {
@@ -319,7 +319,7 @@
     private int notifyEqpt(RcsEqptNotify rcsEqptNotify, int rcsFactory){
 
         String url = rcsFactory == 2 ? HX_URL :HIK_URL + "api/wcs/robot/eqpt/notify";
-        String response = sendPost(url, rcsEqptNotify.toString());
+        String response = sendPost(url, JSONObject.toJSONString(rcsEqptNotify));
         if (!StringUtils.isEmpty(response) && response.contains("code")){
             RcsReturn rcsReturn = JSONObject.parseObject(response, RcsReturn.class);
             if("SUCCESS".equals(rcsReturn.getCode())) {
@@ -389,7 +389,7 @@
                         task.setModiUser(defaultUserId);
                         taskService.updateById(task);
                         // 浠诲姟瀹屾垚
-//                        mesService.reporterTask(rcsReporterTask);
+                        mesService.reporterTask(rcsReporterTask);
 
 //                    EntityWrapper<TaskDetl> wapper2 = new EntityWrapper<>();
 //                    wapper2.eq("wrk_no", task.getWrkNo())
@@ -436,11 +436,6 @@
                         }
                     } break;
                     case ARRIVE_ON_STATION: {
-                        // TODO: 濡傛灉浜х嚎鏄繍杈撹捣鐐癸紝鍒欎笉鍙戦�佸埌绔欏畬鎴愶紝鏆傛椂璋冭瘯浣跨敤lG锛屾湭瀹炵幇鍒ゆ柇
-//                        if (rcsReporterTask.getCurrentSeq() == 0 && task.getSourceStaNo().startsWith("LG") || task.getSourceStaNo().startsWith("LL")) {
-//                            break;
-//                        }
-
                         EntityWrapper<TaskDetl> wapper2 = new EntityWrapper<>();
                         wapper2.eq("wrk_no", task.getWrkNo())
                                 .eq("matnr", memo.getString("Itemno"))

--
Gitblit v1.9.1