From c3c0afea96bf00df1639522759c54790b4b68c6e Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Thu, 9 Jan 2025 11:59:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E6=8E=92=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/executor/service/plan/PlanServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 1b2c81f75..6f37e9cf1 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 @@ -142,6 +142,8 @@ public class PlanServiceImpl implements PlanService { private static final String FIELD_CUSTOM_ORDER_NO = "o.custom_order_no"; private static final String FIELD_ADDRESS = "o.address"; private static final String FIELD_ORDER_DATE = "o.order_date"; + private static final String FIELD_OP_ID = "op.id"; + private static final String FIELD_OP_DELETED = "op.deleted"; @Override @Transactional(rollbackFor = Exception.class) @@ -649,12 +651,13 @@ public class PlanServiceImpl implements PlanService { .eq(FIELD_ORGAN_ID,getUserOrganId()) .eq(FIELD_DELETED,false) .in(FIELD_STATUS,statusList) + .eq(FIELD_OP_DELETED,false) .isNull(FIELD_PLAN_ID) + .isNotNull(FIELD_OP_ID) .inIfPresent("og.goods_id",goodsId) .inIfPresent("o.id",pageReqVO.getOrderIds()) .likeIfPresent("o.id", pageReqVO.getOrderId() != null ? pageReqVO.getOrderId() : null) - .likeIfPresent(FIELD_CUSTOMER, pageReqVO.getConsignee()) .likeIfPresent(FIELD_CUSTOM_ORDER_NO, pageReqVO.getDefaultId()) .likeIfPresent(FIELD_ADDRESS, pageReqVO.getConsigneeAddress()) @@ -686,7 +689,7 @@ public class PlanServiceImpl implements PlanService { queryWrapperX2 .eq("op.organ_id",getUserOrganId()) .in("op.order_id",orderIds) - .eq("op.deleted",false) + .eq(FIELD_OP_DELETED,false) .eq("op.is_optimized",false) .inIfPresent("op.goods_id",ids) .isNull(FIELD_PLAN_ID); @@ -730,7 +733,9 @@ public class PlanServiceImpl implements PlanService { .eq(FIELD_ORGAN_ID, getUserOrganId()) .eq(FIELD_DELETED, false) .in(FIELD_STATUS, statusList) + .eq(FIELD_OP_DELETED,false) .isNull(FIELD_PLAN_ID) + .isNotNull(FIELD_OP_ID) .in("o.id", pageReqVO.getOrderIds()) .inIfPresent("oi.room_id",pageReqVO.getRoomId()) @@ -749,7 +754,9 @@ public class PlanServiceImpl implements PlanService { .eq(FIELD_ORGAN_ID, getUserOrganId()) .eq(FIELD_DELETED, false) .in(FIELD_STATUS, statusList) + .eq(FIELD_OP_DELETED,false) .isNull(FIELD_PLAN_ID) + .isNotNull(FIELD_OP_ID) .inIfPresent("o.id", pageReqVO.getOrderIds()) .likeIfPresent("o.id", pageReqVO.getOrderId())