From 5a8389338e7ae54049e2ff7b01e431a568910610 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 01 十一月 2023 14:19:26 +0800
Subject: [PATCH] 药剂Id生成--三位顺序号

---
 igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java
index f03ee24..6ffd693 100644
--- a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java
+++ b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java
@@ -6,8 +6,6 @@
 import com.ld.igds.protocol.fzzy.dto.ReMessage;
 import com.ld.igds.protocol.fzzy.dto.SendMessage;
 
-import org.apache.commons.lang3.RandomUtils;
-
 /**
  * 绯荤粺鎺ュ彛
  */
@@ -68,7 +66,9 @@
         info.setIedId(reMessage.getIedId());
         info.setFunctionId(functionId);
         info.setRespCode("0000");
-        info.setOrderId(RandomUtils.nextInt(4000, 9999) + "");
+        //鍚敤闅忔満鏁板懡浠わ紝鍦↙inux涓細闃诲绾跨▼锛屼笉鎵ц
+//        info.setOrderId(RandomUtils.nextInt(4000, 9999) + "");
+        info.setOrderId(reMessage.getOrderId());
         info.setUserData("0");
         info.setSign("0000");
         info.setContent(object);
@@ -82,7 +82,9 @@
         info.setIedId(deviceSer.getId());
         info.setFunctionId(functionId);
         info.setRespCode("0000");
-        info.setOrderId(RandomUtils.nextInt(4000, 9999) + "");
+        //鍚敤闅忔満鏁板懡浠わ紝鍦↙inux涓細闃诲绾跨▼锛屼笉鎵ц
+//        info.setOrderId(RandomUtils.nextInt(4000, 9999) + "");
+        info.setOrderId(deviceSer.getOrgId());
         info.setUserData("0");
         info.setSign("0000");
 

--
Gitblit v1.9.3