diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 7ef0e1d9b..8d15c8a72 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -692,20 +693,19 @@ public class IoOrderDetailBizController extends BaseController { orderDetailBizRequest.setKeyWords(finishBizRequest.getKeyWords()); List list = orderDetailBizService.filterList(orderDetailBizRequest); -// String value = systemParamConfigService.selectValueByParamKey("order_detail_visible"); -// if (IntUtil.value(value) == 1) { -// list = list.stream() -// .sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode)) -// .collect(Collectors.toList()); -// } -// if (CollUtil.isEmpty(list)){ -// PageInfo pageInfo = new PageInfo<>(list); -// return ResultVOUtils.page(pageInfo); -// } -// List orders = list.stream().map(IoOrderDetailBizResponse::getOrderIdFk).collect(Collectors.toList()); -// finishBizRequest.setOrderIdFks(orders); -// List orderDetailCodeEntities = orderDetailCodeService.finishBizDetail(finishBizRequest); -// ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities); + String value = systemParamConfigService.selectValueByParamKey("order_detail_visible"); + if (IntUtil.value(value) == 1) { + list = list.stream() + .sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode)) + .collect(Collectors.toList()); + } + if (CollUtil.isEmpty(list)){ + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + List orderDetailCodeEntities = orderDetailCodeService.finishBizDetail(orders); + ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities); PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java index ef6e2b6dc..7d9043a3a 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java @@ -58,5 +58,5 @@ public interface IoOrderDetailCodeService { Boolean updateOrderDetailBiz(IoOrderDetailCodeEntity orderDetailCodeEntity); - List finishBizDetail(FilterOrderDetailFinishBizRequest finishBizRequest); + List finishBizDetail( List orders); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index 6a0d20425..4ba833ddc 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -161,11 +161,11 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { } @Override - public List finishBizDetail(FilterOrderDetailFinishBizRequest finishBizRequest) { + public List finishBizDetail(List orders ) { LambdaQueryWrapper lw = new LambdaQueryWrapper<>(); // String keyWords = finishBizRequest.getKeyWords(); // lw.apply(StrUtil.isNotBlank(keyWords),"( coName LIKE concat('%', {0}, '%') or spec LIKE concat('%', {0}, '%') or batchNo LIKE concat('%', {0}, '%')) ",keyWords); - lw.in(CollUtil.isNotEmpty(finishBizRequest.getOrderIdFks()),IoOrderDetailCodeEntity::getOrderIdFk,finishBizRequest.getOrderIdFks()); + lw.in(IoOrderDetailCodeEntity::getOrderIdFk,orders); return ioOrderDetailCodeDao.selectList(lw);