diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index 52ba7750e..7a593d397 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -632,7 +632,7 @@ public class PlanServiceImpl implements PlanService { statusList.add(OrderStatusEnum.SORTED.getStatus()); QueryWrapperX queryWrapperX = new QueryWrapperX<>(); - IPage orderGoodsResps = new PageDTO<>(); + IPage orderGoodsResps; Integer type = 0; if (CollUtil.isNotEmpty(pageReqVO.getRoomId()) || CollUtil.isNotEmpty(pageReqVO.getBodyId())) { @@ -687,7 +687,7 @@ public class PlanServiceImpl implements PlanService { List orderGoodsIdList = planItemMapper.selectNoOrderGoodsIdList(queryWrapperX, getUserOrganId(), type); - mergeOrderGoodsLists(records,orderGoodsIdList); + mergeOrderGoodsLists(records, orderGoodsIdList); return new PageResult<>(orderGoodsResps.getRecords(), orderGoodsResps.getTotal()); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml index 1533759ba..01e2e6356 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml @@ -232,6 +232,8 @@ + + @@ -272,14 +274,15 @@