From 49e01a34b2e6ca479d085481e029c0e5f725f3cc Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Mon, 9 Dec 2024 17:46:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/impl/IoOrderDetailResultServiceImpl.java | 10 +++++----- .../mybatis/mapper/inout/IoOrderDetailResultDao.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java index 72a42bd3f..b4c2400a3 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java @@ -156,11 +156,11 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic if (null == orderDetailResultRequest) { return Collections.emptyList(); } - FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); - filterInvSubWarehouseRequest.setLyInvType(true); - List data = invWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest); - List collect = data.stream().map(InvSubWarehouseResponse::getCode).collect(Collectors.toList()); - orderDetailResultRequest.setFromInvCodes(collect); +// FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); +// filterInvSubWarehouseRequest.setLyInvType(true); +// List data = invWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest); +// List collect = data.stream().map(InvSubWarehouseResponse::getCode).collect(Collectors.toList()); +// orderDetailResultRequest.setFromInvCodes(collect); if (null != orderDetailResultRequest.getPage() && null != orderDetailResultRequest.getLimit()) { PageHelper.offsetPage((orderDetailResultRequest.getPage() - 1) * orderDetailResultRequest.getLimit(), orderDetailResultRequest.getLimit()); diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index 9d89c2dcd..7b5b4bad6 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -387,7 +387,7 @@ FROM - order by ipd.updateTime desc + GROUP BY ipd.id ) t1 GROUP BY nameCode,cpmctymc,batchNo,ggxh