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(); 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(); + } }