From 198bcba6ba41f1bc905455087a5d4e69ecf1261d Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Fri, 14 Feb 2025 11:23:06 +0800
Subject: [PATCH] no message

---
 .../businessdata/service/impl/KMReServiceImpl.java   | 11 ++++++-----
 .../modules/quartz/utils/TimeNumberUtils.java        | 12 ++++++++++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java
index 9705d20..498d5a1 100644
--- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java
+++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java
@@ -181,10 +181,10 @@ public class KMReServiceImpl implements KMReService {
     @Override
     public String sendAgvTaskCcJson(AgvTask agvTasks) {
         JSONObject jsonObject = new JSONObject(new LinkedHashMap<>());
-
+        String requestId = TimeNumberUtils.getCcCode();
         Map<String, Object> objMap = new LinkedHashMap<>();
         objMap.put("orgId", agvTasks.getId());//库存组织 ID
-        objMap.put("requestId", agvTasks.getId());//请求 id
+        objMap.put("requestId", requestId);//请求 id
         objMap.put("missionCode", agvTasks.getId());//任务编号
         objMap.put("missionType", agvTasks.getJobType());//货 架 ( 托 盘 ) 移动 RACK_MOVE
         objMap.put("viewBoardType", "");//
@@ -233,10 +233,10 @@ public class KMReServiceImpl implements KMReService {
     @Override
     public String sendAgvTaskHjJson(AgvTask agvTasks) {
         JSONObject jsonObject = new JSONObject(new LinkedHashMap<>());
-
+        String requestId = TimeNumberUtils.getHjCode();
         Map<String, Object> objMap = new LinkedHashMap<>();
         objMap.put("orgId", agvTasks.getId());//库存组织 ID
-        objMap.put("requestId", agvTasks.getId());//请求 id
+        objMap.put("requestId", requestId);//请求 id
         objMap.put("missionCode", agvTasks.getId());//任务编号
         objMap.put("missionType", agvTasks.getJobType());//货 架 ( 托 盘 ) 移动 RACK_MOVE
         objMap.put("viewBoardType", "");//IDENTIFY_REQUIRE
@@ -262,9 +262,10 @@ public class KMReServiceImpl implements KMReService {
     @Override
     public String sendAgvTaskGtJson(AgvTask agvTask) {
         JSONObject jsonObject = new JSONObject(new LinkedHashMap<>());
+        String requestId = TimeNumberUtils.getGTTaskCode();
         Map<String, Object> objMap = new LinkedHashMap<>();
         objMap.put("orgId", agvTask.getId());//库存组织 ID(或工厂代码，供应商代码)
-        objMap.put("requestId", agvTask.getId());//请求 id
+        objMap.put("requestId", requestId);//请求 id
         objMap.put("missionCode", agvTask.getId());//任务编号
         objMap.put("missionType", "ROLLER_MOVE");//任务类型 ：滚筒
         objMap.put("viewBoardType", "");//上视识别类型:
diff --git a/youchain-system/src/main/java/com/youchain/modules/quartz/utils/TimeNumberUtils.java b/youchain-system/src/main/java/com/youchain/modules/quartz/utils/TimeNumberUtils.java
index a1df986..b1dbfed 100644
--- a/youchain-system/src/main/java/com/youchain/modules/quartz/utils/TimeNumberUtils.java
+++ b/youchain-system/src/main/java/com/youchain/modules/quartz/utils/TimeNumberUtils.java
@@ -23,12 +23,20 @@ public class TimeNumberUtils {
         return "RK"+datetime +addLeftZero(s, length);
     }
 
-    public static synchronized String getRCCode() {
+    public static synchronized String getCcCode() {
         sequence = sequence >= 999999 ? 1 : sequence + 1;
         String datetime = new SimpleDateFormat("yyMMddHHmmss")
                 .format(new Date());
         String s = Integer.toString(sequence);
-        return "RC"+datetime +addLeftZero(s, length);
+        return "CC"+datetime +addLeftZero(s, length);
+    }
+
+    public static synchronized String getHjCode() {
+        sequence = sequence >= 999999 ? 1 : sequence + 1;
+        String datetime = new SimpleDateFormat("yyMMddHHmmss")
+                .format(new Date());
+        String s = Integer.toString(sequence);
+        return "HJ"+datetime +addLeftZero(s, length);
     }
 
     public static synchronized String getXJTaskCode() {