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:
yangsb
2024-05-07 11:25:48 +08:00
parent acc6d2e431
commit 6ab5565fca
2 changed files with 2 additions and 1 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
+2
View File
@@ -247,6 +247,7 @@ public class PlanServiceImpl implements PlanService {
QueryWrapperX<OrderDO> queryWrapperX = new QueryWrapperX<>(); QueryWrapperX<OrderDO> queryWrapperX = new QueryWrapperX<>();
queryWrapperX queryWrapperX
.eqIfPresent("a.id", pageReqVO.getOrderId())
.isNull("opi.id") .isNull("opi.id")
.eqIfPresent("a.customer", pageReqVO.getConsignee()) .eqIfPresent("a.customer", pageReqVO.getConsignee())
.eqIfPresent("a.custom_order_no", pageReqVO.getDefaultId()) .eqIfPresent("a.custom_order_no", pageReqVO.getDefaultId())
@@ -257,6 +258,7 @@ public class PlanServiceImpl implements PlanService {
.eqIfPresent("op.is_door", pageReqVO.getIsDoor()) .eqIfPresent("op.is_door", pageReqVO.getIsDoor())
.betweenIfPresent("op.height", new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()}) .betweenIfPresent("op.height", new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()})
.betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()}) .betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()})
.groupBy("a.id","og.id")
.orderByDesc("a.create_time"); .orderByDesc("a.create_time");
List<Integer> filterTypes = new ArrayList<>(); List<Integer> filterTypes = new ArrayList<>();
if (Objects.nonNull(pageReqVO.getHoleThrough()) && pageReqVO.getHoleThrough()) { if (Objects.nonNull(pageReqVO.getHoleThrough()) && pageReqVO.getHoleThrough()) {
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
-1
View File
@@ -11,7 +11,6 @@
left join order_item oi on a.id = oi.order_id left join order_item oi on a.id = oi.order_id
left join order_plan_item opi on oi.id = opi.item_id left join order_plan_item opi on oi.id = opi.item_id
${ew.customSqlSegment} ${ew.customSqlSegment}
group by a.id, og.id
</select> </select>