root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'b_lms' into master_merge

Browse Source
This commit is contained in:
liuxy
2024-06-27 15:08:28 +08:00
parent 2ae476a67a cf0368756e
commit 07452b1630
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java
View File

@@ -301,7 +301,7 @@ public class OutBussManageServiceImpl implements OutBussManageService {
.qty_unit_id(jsonUnit.getLongValue("measure_unit_id")) .qty_unit_id(jsonUnit.getLongValue("measure_unit_id"))
.qty_unit_name(jsonUnit.getString("unit_name")) .qty_unit_name(jsonUnit.getString("unit_name"))
.plan_qty(jsonIvt.getBigDecimal("canuse_qty")) .plan_qty(jsonIvt.getBigDecimal("canuse_qty"))
.real_qty(jsonIvt.getBigDecimal("real_qty")) .real_qty(jsonIvt.getBigDecimal("canuse_qty"))
.work_status(work_status) .work_status(work_status)
.box_no(jsonSub.getString("package_box_sn")) .box_no(jsonSub.getString("package_box_sn"))
.build(); .build();

8
lms/nladmin-system/src/main/java/org/nl/config/WebSocketConfig.java
View File

@@ -31,9 +31,9 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
@Configuration @Configuration
public class WebSocketConfig { public class WebSocketConfig {
// @Bean @Bean
// public ServerEndpointExporter serverEndpointExporter() { public ServerEndpointExporter serverEndpointExporter() {
// return new ServerEndpointExporter(); return new ServerEndpointExporter();
// } }
} }