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

update：修改贴标信息

Browse Source
This commit is contained in:
songxiaopeng
2024-05-16 13:46:13 +08:00
parent 8204f7ad92
commit 336f76c476
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -521,7 +521,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String vehicleCode = TaskUtils.defaultVehicleCode(baseRequest.getVehicle_code()); String vehicleCode = TaskUtils.defaultVehicleCode(baseRequest.getVehicle_code());
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getGroupInfo(vehicleCode, SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getGroupInfo(vehicleCode,
GroupBindMaterialStatusEnum.BOUND.getValue()); GroupBindMaterialStatusEnum.UNBOUND.getValue());
String materialId = groupInfo.getMaterial_id(); String materialId = groupInfo.getMaterial_id();
MdBaseMaterial baseMaterial = materialService.getById(materialId); MdBaseMaterial baseMaterial = materialService.getById(materialId);
String singleWeightStr = baseMaterial.getSingle_weight(); String singleWeightStr = baseMaterial.getSingle_weight();

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
View File

@@ -128,9 +128,9 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
lambda.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode) lambda.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode)
.eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, value) .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, value)
.eq(SchBaseVehiclematerialgroup::getIs_delete, false) .eq(SchBaseVehiclematerialgroup::getIs_delete, false)
.orderByDesc(SchBaseVehiclematerialgroup::getCreate_time); .orderByDesc(SchBaseVehiclematerialgroup::getCreate_time)
SchBaseVehiclematerialgroup selectOne = vehiclematerialgroupMapper.selectOne(lambda); .last("limit 1");;
return selectOne; return vehiclematerialgroupMapper.selectOne(lambda);
} }
@Override @Override

4
lms/nladmin-ui/.env.production
View File

@@ -2,6 +2,6 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
VUE_APP_BASE_API = 'http://10.93.41.201:8010' VUE_APP_BASE_API = 'http://192.168.8.162:8010'
# 如果接口是 http 形式， wss 需要改为 ws # 如果接口是 http 形式， wss 需要改为 ws
VUE_APP_WS_API = 'ws://10.93.41.201:8010' VUE_APP_WS_API = 'ws://192.168.8.162:8010'