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

代码更新：

Browse Source 
1. 修复大屏显示完成情况不对的问题
2. 修复卡outsideVehicles的问题。
This commit is contained in:
梁州 2024-10-24 16:51:52 +08:00
parent ce34d2564f
commit 85abc5b176
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/wms/controller/MonitorController.java
View File

@ -174,7 +174,7 @@ public class MonitorController {
}
}
total.add(currentStationWorkFlowList.size());
complete.add(finishingRows/currentStationWorkFlowList.size());
complete.add((finishingRows * 100)/currentStationWorkFlowList.size());
}
} catch (Exception e) {
total = Collections.emptyList();

19
src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java
View File

@ -327,8 +327,7 @@ public class WmsTaskServiceImplements implements IWmsTaskService {
.last("limit 1"));
if (stock == null) {
// 没有库存
outsideVehicle.setRemainNum(BigDecimal.ZERO);
outsideVehiclesService.updateById(outsideVehicle);
outsideVehiclesService.removeById(outsideVehicle);
} else {
// 库存状态为正常
if (Objects.equals(stock.getStockStatus(), StockStatus.OK.getCode())) {
@ -375,8 +374,24 @@ public class WmsTaskServiceImplements implements IWmsTaskService {
.eq(OutsideVehicles::getGoodsId, goodsId)
.ne(OutsideVehicles::getOutStatus, 2));
if (!outsideVehiclesList.isEmpty()) {
boolean canCallStock = true;
// 判断这些outsideVehicles对应的库存是不是都是0
for (OutsideVehicles outsideVehicle : outsideVehiclesList) {
Stock stock = stockService.getOne(new LambdaQueryWrapper<Stock>()
.eq(Stock::getVehicleId, outsideVehicle.getVehicleId())
.apply("goods_related ->> '$.goodsId' = {0}" + MYSQL_JSON_CI, goodsId)
.apply("goods_related ->> '$.remainNum' > 0")
.last("limit 1"));
if (stock != null) {
canCallStock = false;
break;
}
}
// 不能呼叫库存
if (!canCallStock) {
return needNum;
}
}
// 查询库存，判断数量是否充足
List<Stock> stockList = stockService.list(new LambdaQueryWrapper<Stock>()
.eq(Stock::getStockStatus, StockStatus.OK.getCode())