|
@@ -386,6 +386,8 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
|
|
|
Assert.notEmpty(endTimeStr, "结束时间不能为空");
|
|
|
Date endTime = DateUtil.endOfDay(DateUtil.parse(endTimeStr));
|
|
|
|
|
|
+ String tech = condition.get("tech");
|
|
|
+
|
|
|
List<StockBackPlanDetails> list = stockBackPlanDetailsService.list(
|
|
|
Wrappers.<StockBackPlanDetails>lambdaQuery()
|
|
|
.between(StockBackPlanDetails::getPlanTime, beginTime, endTime)
|
|
@@ -397,6 +399,7 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
|
|
|
q.in(StockBackPlanDetails::getJobNo, jobNoList);
|
|
|
}
|
|
|
})
|
|
|
+ .eq(ObjectUtil.isNotEmpty(tech), StockBackPlanDetails::getTech, tech)
|
|
|
);
|
|
|
|
|
|
for (StockBackPlanDetails item : list) {
|