Merge remote-tracking branch 'origin/0.8.X' into 0.8.X
This commit is contained in:
@@ -55,20 +55,8 @@ public class WmsSchedulePlanDetailServiceImpl implements IWmsSchedulePlanDetailS
|
||||
*/
|
||||
@Override
|
||||
public List<WmsSchedulePlanDetailVo> queryList(WmsSchedulePlanDetailBo bo) {
|
||||
LambdaQueryWrapper<WmsSchedulePlanDetail> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
private LambdaQueryWrapper<WmsSchedulePlanDetail> buildQueryWrapper(WmsSchedulePlanDetailBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<WmsSchedulePlanDetail> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getPlanId() != null, WmsSchedulePlanDetail::getPlanId, bo.getPlanId());
|
||||
lqw.eq(bo.getLineId() != null, WmsSchedulePlanDetail::getLineId, bo.getLineId());
|
||||
lqw.eq(bo.getBatchId() != null, WmsSchedulePlanDetail::getBatchId, bo.getBatchId());
|
||||
lqw.eq(bo.getProductId() != null, WmsSchedulePlanDetail::getProductId, bo.getProductId());
|
||||
lqw.eq(bo.getQuantity() != null, WmsSchedulePlanDetail::getQuantity, bo.getQuantity());
|
||||
lqw.eq(bo.getStartDate() != null, WmsSchedulePlanDetail::getStartDate, bo.getStartDate());
|
||||
lqw.eq(bo.getEndDate() != null, WmsSchedulePlanDetail::getEndDate, bo.getEndDate());
|
||||
return lqw;
|
||||
QueryWrapper<WmsSchedulePlanDetail> lqw = buildQueryWrapperPlus(bo);
|
||||
return baseMapper.selectVoListWithName(lqw);
|
||||
}
|
||||
|
||||
private QueryWrapper<WmsSchedulePlanDetail> buildQueryWrapperPlus(WmsSchedulePlanDetailBo bo) {
|
||||
@@ -78,7 +66,7 @@ public class WmsSchedulePlanDetailServiceImpl implements IWmsSchedulePlanDetailS
|
||||
lqw.eq("wspd.del_flag", 0);
|
||||
lqw.eq( bo.getPlanId()!=null ,"wspd.plan_id", bo.getPlanId());
|
||||
lqw.eq(bo.getLineId()!=null ,"wspd.line_id", bo.getLineId());
|
||||
lqw.eq(bo.getBatchId()!=null ,"wspd.batch_id", bo.getBatchId());
|
||||
lqw.eq(bo.getTaskId()!=null ,"wspd.task_id", bo.getTaskId());
|
||||
lqw.eq(bo.getProductId()!=null ,"wspd.product_id", bo.getProductId());
|
||||
lqw.eq(bo.getQuantity()!=null ,"wspd.quantity", bo.getQuantity());
|
||||
lqw.eq(bo.getStartDate()!=null ,"wspd.start_date", bo.getStartDate());
|
||||
|
||||
Reference in New Issue
Block a user