|
@@ -503,13 +503,16 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
|
|
|
// 如果没有指定 assigneeType,只查询 dataSource 不为空的订单
|
|
// 如果没有指定 assigneeType,只查询 dataSource 不为空的订单
|
|
|
lqw.isNotNull(OrderMain::getDataSource);
|
|
lqw.isNotNull(OrderMain::getDataSource);
|
|
|
}
|
|
}
|
|
|
|
|
+ if (ObjectUtils.isNotEmpty(bo.getShipmentNo())) {//dms发货单列表只查询有发货单号的订单
|
|
|
|
|
+ lqw.and(wrapper -> wrapper.isNotNull(OrderMain::getShipmentNo));
|
|
|
|
|
+ }
|
|
|
} else if ("srm".equals(platformCode) || "bp".equals(platformCode)) {
|
|
} else if ("srm".equals(platformCode) || "bp".equals(platformCode)) {
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getAssigneeType()), OrderMain::getAssigneeType, bo.getAssigneeType());
|
|
lqw.eq(StringUtils.isNotBlank(bo.getAssigneeType()), OrderMain::getAssigneeType, bo.getAssigneeType());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
lqw.like(StringUtils.isNotBlank(bo.getOrderNo()), OrderMain::getOrderNo, bo.getOrderNo());
|
|
lqw.like(StringUtils.isNotBlank(bo.getOrderNo()), OrderMain::getOrderNo, bo.getOrderNo());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getCustomerCode()), OrderMain::getCustomerCode, bo.getCustomerCode());
|
|
lqw.eq(StringUtils.isNotBlank(bo.getCustomerCode()), OrderMain::getCustomerCode, bo.getCustomerCode());
|
|
|
- lqw.eq(StringUtils.isNotBlank(bo.getShipmentNo()), OrderMain::getShipmentNo, bo.getShipmentNo());
|
|
|
|
|
|
|
+// lqw.eq(StringUtils.isNotBlank(bo.getShipmentNo()), OrderMain::getShipmentNo, bo.getShipmentNo());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getSubOrderNo()), OrderMain::getSubOrderNo, bo.getSubOrderNo());
|
|
lqw.eq(StringUtils.isNotBlank(bo.getSubOrderNo()), OrderMain::getSubOrderNo, bo.getSubOrderNo());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getIsSplitChild()), OrderMain::getIsSplitChild, bo.getIsSplitChild());
|
|
lqw.eq(StringUtils.isNotBlank(bo.getIsSplitChild()), OrderMain::getIsSplitChild, bo.getIsSplitChild());
|
|
|
lqw.eq(bo.getCompanyId() != null, OrderMain::getCompanyId, bo.getCompanyId());
|
|
lqw.eq(bo.getCompanyId() != null, OrderMain::getCompanyId, bo.getCompanyId());
|
|
@@ -553,6 +556,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getIsNeedCheck()), OrderMain::getIsNeedCheck, bo.getIsNeedCheck());
|
|
lqw.eq(StringUtils.isNotBlank(bo.getIsNeedCheck()), OrderMain::getIsNeedCheck, bo.getIsNeedCheck());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getReturnedStatus()), OrderMain::getReturnedStatus, bo.getReturnedStatus());
|
|
lqw.eq(StringUtils.isNotBlank(bo.getReturnedStatus()), OrderMain::getReturnedStatus, bo.getReturnedStatus());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getOrderType()), OrderMain::getOrderType, bo.getOrderType());
|
|
lqw.eq(StringUtils.isNotBlank(bo.getOrderType()), OrderMain::getOrderType, bo.getOrderType());
|
|
|
|
|
+
|
|
|
if (ObjectUtils.isNotEmpty(bo.getDataSource())) {
|
|
if (ObjectUtils.isNotEmpty(bo.getDataSource())) {
|
|
|
if ("1".equals(bo.getDataSource())) {
|
|
if ("1".equals(bo.getDataSource())) {
|
|
|
// dataSource="1" 时,查询 dataSource 为空或 null 的数据
|
|
// dataSource="1" 时,查询 dataSource 为空或 null 的数据
|