From 590e7ec713c64ded30de8a632ffe684f81285c1d Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Thu, 27 Jun 2024 11:03:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:websocket=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/config/WebSocketConfig.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/config/WebSocketConfig.java b/lms/nladmin-system/src/main/java/org/nl/config/WebSocketConfig.java
index fce25bd45..33fbc159e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/config/WebSocketConfig.java
+++ b/lms/nladmin-system/src/main/java/org/nl/config/WebSocketConfig.java
@@ -31,9 +31,9 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 @Configuration
 public class WebSocketConfig {
 
-//    @Bean
-//    public ServerEndpointExporter serverEndpointExporter() {
-//        return new ServerEndpointExporter();
-//    }
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
 }
 

From cf0368756efe3a4a5e1f06039e5ebc7cfb8f32cd Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 27 Jun 2024 15:05:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E4=BA=8C=E6=9C=9F=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E6=89=93=E5=8D=B0=E6=97=A0=E6=B3=95=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/iostorInv/util/impl/OutBussManageServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java
index acb269bd8..3385a6513 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java
@@ -301,7 +301,7 @@ public class OutBussManageServiceImpl implements OutBussManageService {
                     .qty_unit_id(jsonUnit.getLongValue("measure_unit_id"))
                     .qty_unit_name(jsonUnit.getString("unit_name"))
                     .plan_qty(jsonIvt.getBigDecimal("canuse_qty"))
-                    .real_qty(jsonIvt.getBigDecimal("real_qty"))
+                    .real_qty(jsonIvt.getBigDecimal("canuse_qty"))
                     .work_status(work_status)
                     .box_no(jsonSub.getString("package_box_sn"))
                     .build();