diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetSchedule.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetSchedule.java index 09993bf8..5ccf9ebb 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetSchedule.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetSchedule.java @@ -420,8 +420,15 @@ public class ChanjetSchedule { in(MaterialDO::getCode,materialCodeList); }}); + List tplusLastestStockDOList = tplusLastestStockMapper.selectList(new LambdaUpdateWrapper(){{ + in(TplusLastestStockDO::getInventoryCode,materialCodeList); + }}); + // 无存货信息,物料信息从物料表取 for (MaterialDO aDo : materialDOList) { + List tplusLastestStockDOs = + tplusLastestStockDOList.stream().filter(to->to.getInventoryCode().equals(aDo.getCode()) && to.getWarehouseId().equals(warehouseId.toString())).collect(Collectors.toList()); + QueryCurrentStockResVO resVO = new QueryCurrentStockResVO(); resVO.setInventoryCode(aDo.getCode()) .setInventoryName(aDo.getName()) @@ -430,7 +437,7 @@ public class ChanjetSchedule { .setUnitID(aDo.getUnit()) .setUnitName(aDo.getUnit()) .setInventoryID(aDo.getId()) - .setAvailableQuantity("0"); + .setAvailableQuantity(tplusLastestStockDOs.size()==0?"0":tplusLastestStockDOs.get(0).getAvailableQuantity()); dataList.add(resVO); }