diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductionLineServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductionLineServiceImpl.java index 1c3b6697..f6a32b06 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductionLineServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductionLineServiceImpl.java @@ -19,6 +19,8 @@ import com.klp.service.IWmsProductionLineService; import java.util.List; import java.util.Map; import java.util.Collection; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 产线Service业务层处理 @@ -47,10 +49,8 @@ public class WmsProductionLineServiceImpl implements IWmsProductionLineService { public TableDataInfo queryPageList(WmsProductionLineBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - // 填充负载信息 fillLoadInfo(result.getRecords()); - return TableDataInfo.build(result); } @@ -133,7 +133,7 @@ public class WmsProductionLineServiceImpl implements IWmsProductionLineService { // 批量查询负载信息 List loadInfoList = baseMapper.selectLineLoadInfo(lineIds); Map loadInfoMap = loadInfoList.stream() - .collect(java.util.stream.Collectors.toMap(LineLoadInfo::getLineId, java.util.function.Function.identity())); + .collect(Collectors.toMap(LineLoadInfo::getLineId, Function.identity())); // 填充到VO for (WmsProductionLineVo vo : productionLineList) { LineLoadInfo loadInfo = loadInfoMap.get(vo.getLineId()); diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProductionLineMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProductionLineMapper.xml index 5a3ccd8c..35f0f6b5 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsProductionLineMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsProductionLineMapper.xml @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT line_id AS lineId, COUNT(*) AS planDetailCount, - SUM(DATEDIFF(end_date, start_date) + 1) AS totalPlanDays + SUM(DATEDIFF(end_date, GREATEST(start_date, CURDATE())) + 1) AS totalPlanDays FROM wms_schedule_plan_detail WHERE @@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{lineId} + AND end_date >= CURDATE() AND del_flag = 0 GROUP BY line_id