diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java index 3dfbd35ed..a01ebf5b7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java @@ -241,18 +241,6 @@ public interface OrderMapper extends BaseMapperX { List selectGoodsListByGoodsId(@Param(Constants.WRAPPER) QueryWrapperX queryWrapperX); - - default List selectOrderList(List orderIds, Long organId) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(OrderDO::getOrganId, organId) - .eq(OrderDO::getDeleted, false) - .inIfPresent(OrderDO::getId,orderIds) - .eq(OrderDO::getStatus, OrderStatusEnum.FINISH_PRODUCTION.getStatus())); - - } - - - default List selectOrderPackList(List orderIds, Long organId) { return selectList(new LambdaQueryWrapperX() .eq(OrderDO::getOrganId, organId) @@ -296,7 +284,7 @@ public interface OrderMapper extends BaseMapperX { - List selectOrderIds(@Param("createTime") String createTime, @Param("organId") Long organId, @Param("orderId") Long orderId); + List selectOrderIdsTrue(@Param("createTime") String createTime, @Param("organId") Long organId, @Param("orderId") Long orderId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java index 004c39861..3bb03897b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java @@ -904,7 +904,7 @@ public class PackServiceImpl implements PackService { AssertUtils.notEmpty(order, ORDER_DATE_ERROR); List packRespVOList = Boolean.TRUE.equals(isUp) ? - ordersMapper.selectOrderIds(order.getCreateTime().toString(), getUserOrganId(), order.getId()) : + ordersMapper.selectOrderIdsTrue(order.getCreateTime().toString(), getUserOrganId(), order.getId()) : ordersMapper.selectOrderIdsFalse(order.getCreateTime().toString(), getUserOrganId(), order.getId()); if (packRespVOList.isEmpty()) { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml index c1d788a50..63bffb46c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml @@ -438,6 +438,34 @@ + + + + + +