Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

未排单查询接口修改

Browse Source
This commit is contained in:
liuzhaotian
2025-01-09 11:59:42 +08:00
parent d95d02f9bd
commit c3c0afea96
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+9 -2
View File
@@ -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_CUSTOM_ORDER_NO = "o.custom_order_no";
private static final String FIELD_ADDRESS = "o.address"; private static final String FIELD_ADDRESS = "o.address";
private static final String FIELD_ORDER_DATE = "o.order_date"; 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 @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@@ -649,12 +651,13 @@ public class PlanServiceImpl implements PlanService {
.eq(FIELD_ORGAN_ID,getUserOrganId()) .eq(FIELD_ORGAN_ID,getUserOrganId())
.eq(FIELD_DELETED,false) .eq(FIELD_DELETED,false)
.in(FIELD_STATUS,statusList) .in(FIELD_STATUS,statusList)
.eq(FIELD_OP_DELETED,false)
.isNull(FIELD_PLAN_ID) .isNull(FIELD_PLAN_ID)
.isNotNull(FIELD_OP_ID)
.inIfPresent("og.goods_id",goodsId) .inIfPresent("og.goods_id",goodsId)
.inIfPresent("o.id",pageReqVO.getOrderIds()) .inIfPresent("o.id",pageReqVO.getOrderIds())
.likeIfPresent("o.id", pageReqVO.getOrderId() != null ? pageReqVO.getOrderId() : null) .likeIfPresent("o.id", pageReqVO.getOrderId() != null ? pageReqVO.getOrderId() : null)
.likeIfPresent(FIELD_CUSTOMER, pageReqVO.getConsignee()) .likeIfPresent(FIELD_CUSTOMER, pageReqVO.getConsignee())
.likeIfPresent(FIELD_CUSTOM_ORDER_NO, pageReqVO.getDefaultId()) .likeIfPresent(FIELD_CUSTOM_ORDER_NO, pageReqVO.getDefaultId())
.likeIfPresent(FIELD_ADDRESS, pageReqVO.getConsigneeAddress()) .likeIfPresent(FIELD_ADDRESS, pageReqVO.getConsigneeAddress())
@@ -686,7 +689,7 @@ public class PlanServiceImpl implements PlanService {
queryWrapperX2 queryWrapperX2
.eq("op.organ_id",getUserOrganId()) .eq("op.organ_id",getUserOrganId())
.in("op.order_id",orderIds) .in("op.order_id",orderIds)
.eq("op.deleted",false) .eq(FIELD_OP_DELETED,false)
.eq("op.is_optimized",false) .eq("op.is_optimized",false)
.inIfPresent("op.goods_id",ids) .inIfPresent("op.goods_id",ids)
.isNull(FIELD_PLAN_ID); .isNull(FIELD_PLAN_ID);
@@ -730,7 +733,9 @@ public class PlanServiceImpl implements PlanService {
.eq(FIELD_ORGAN_ID, getUserOrganId()) .eq(FIELD_ORGAN_ID, getUserOrganId())
.eq(FIELD_DELETED, false) .eq(FIELD_DELETED, false)
.in(FIELD_STATUS, statusList) .in(FIELD_STATUS, statusList)
.eq(FIELD_OP_DELETED,false)
.isNull(FIELD_PLAN_ID) .isNull(FIELD_PLAN_ID)
.isNotNull(FIELD_OP_ID)
.in("o.id", pageReqVO.getOrderIds()) .in("o.id", pageReqVO.getOrderIds())
.inIfPresent("oi.room_id",pageReqVO.getRoomId()) .inIfPresent("oi.room_id",pageReqVO.getRoomId())
@@ -749,7 +754,9 @@ public class PlanServiceImpl implements PlanService {
.eq(FIELD_ORGAN_ID, getUserOrganId()) .eq(FIELD_ORGAN_ID, getUserOrganId())
.eq(FIELD_DELETED, false) .eq(FIELD_DELETED, false)
.in(FIELD_STATUS, statusList) .in(FIELD_STATUS, statusList)
.eq(FIELD_OP_DELETED,false)
.isNull(FIELD_PLAN_ID) .isNull(FIELD_PLAN_ID)
.isNotNull(FIELD_OP_ID)
.inIfPresent("o.id", pageReqVO.getOrderIds()) .inIfPresent("o.id", pageReqVO.getOrderIds())
.likeIfPresent("o.id", pageReqVO.getOrderId()) .likeIfPresent("o.id", pageReqVO.getOrderId())