FeiDaBaoKai/wms_server_kate_suzhou
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新：

Browse Source 
1. 修改电子标签库位分配的顺序
This commit is contained in:
梁州 2024-10-30 14:43:41 +08:00
parent 50e820b7ff
commit be2aee9cf8
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java
View File

@ -160,19 +160,20 @@ public class WorkServiceImplements implements IWorkService {
throw new Exception("站台：" + workStation + "没有足够可用的电子标签位!"); throw new Exception("站台：" + workStation + "没有足够可用的电子标签位!");
} }
for (ETagLocation eTagLocation : eTagLocationList) { for (ETagLocation eTagLocation : eTagLocationList) {
if (!boxNoList.isEmpty()) { if (boxNoList.isEmpty()) {
String tempBoxNo = boxNoList.get(0); break;
ELocationConfig eLocationConfig = new ELocationConfig();
eLocationConfig.setWorkOrder(tempBoxNo.split("@")[0]);
eLocationConfig.setWorkCenter(tempBoxNo.split("@")[1]);
eLocationConfig.setWorkStation(workStation);
eLocationConfig.setELocationId(eTagLocation.getELocationId());
eLocationConfig.setOrderBoxNo(tempBoxNo);
// 添加配置
eLocationConfigList.add(eLocationConfig);
// 移除已经分配的盒子
boxNoList.remove(tempBoxNo);
} }
String tempBoxNo = boxNoList.get(0);
ELocationConfig eLocationConfig = new ELocationConfig();
eLocationConfig.setWorkOrder(tempBoxNo.split("@")[0]);
eLocationConfig.setWorkCenter(tempBoxNo.split("@")[1]);
eLocationConfig.setWorkStation(workStation);
eLocationConfig.setELocationId(eTagLocation.getELocationId());
eLocationConfig.setOrderBoxNo(tempBoxNo);
// 添加配置
eLocationConfigList.add(eLocationConfig);
// 移除已经分配的盒子
boxNoList.remove(tempBoxNo);
} }
// 将电子标签库位配置存进数据库 // 将电子标签库位配置存进数据库
eLocationConfigService.saveBatch(eLocationConfigList); eLocationConfigService.saveBatch(eLocationConfigList);
@ -652,7 +653,7 @@ public class WorkServiceImplements implements IWorkService {
List<ELocationConfig> currentBoxELocationList = eLocationConfigList.stream().filter(e -> List<ELocationConfig> currentBoxELocationList = eLocationConfigList.stream().filter(e ->
e.getWorkOrder().equals(workFlow.getWorkOrder()) e.getWorkOrder().equals(workFlow.getWorkOrder())
&& e.getWorkCenter().equals(workFlow.getWorkCenter())).toList(); && e.getWorkCenter().equals(workFlow.getWorkCenter())).toList();
summary.setELocationId(currentBoxELocationList.size() > 0 ? currentBoxELocationList.get(0).getELocationId() : ""); summary.setELocationId(!currentBoxELocationList.isEmpty() ? currentBoxELocationList.get(0).getELocationId() : "");
workSummaryList.add(summary); workSummaryList.add(summary);
// 更新工单表 // 更新工单表
kateOrdersService.update(new LambdaUpdateWrapper<KateOrders>() kateOrdersService.update(new LambdaUpdateWrapper<KateOrders>()
@ -789,6 +790,7 @@ public class WorkServiceImplements implements IWorkService {
} else { } else {
stationConfigQueryWrapper.ne(WorkStationConfig::getModel, "MWL"); stationConfigQueryWrapper.ne(WorkStationConfig::getModel, "MWL");
} }
stationConfigQueryWrapper.orderByAsc(WorkStationConfig::getSmallBox);
List<WorkStationConfig> currentStationConfigsOfNwl = workStationConfigService.list(stationConfigQueryWrapper); List<WorkStationConfig> currentStationConfigsOfNwl = workStationConfigService.list(stationConfigQueryWrapper);
// 没有工站配置 // 没有工站配置
if (currentStationConfigsOfNwl == null || currentStationConfigsOfNwl.isEmpty()) { if (currentStationConfigsOfNwl == null || currentStationConfigsOfNwl.isEmpty()) {

9
src/main/resources/application.yml
View File

@ -46,15 +46,6 @@ server:
enabled: true enabled: true
force: true force: true
swagger:
# swagger配置
enable: true
title: 菲达宝开WMS
description: 菲达宝开WMS
version: 1.0
base-package: com.wms.controller
scan-packages: com.wms.controller
mybatis-plus: mybatis-plus:
mapper-locations: classpath*:mapper/*.xml # mapper.xml扫描包 mapper-locations: classpath*:mapper/*.xml # mapper.xml扫描包
type-aliases-package: com.wms.entity.table # 实体类扫描包 type-aliases-package: com.wms.entity.table # 实体类扫描包