fix: 修复

lh_dev_fifo
chenhc 7 months ago
parent 3e6d01ee90
commit 49e01a34b2

@ -156,11 +156,11 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
if (null == orderDetailResultRequest) { if (null == orderDetailResultRequest) {
return Collections.emptyList(); return Collections.emptyList();
} }
FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); // FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
filterInvSubWarehouseRequest.setLyInvType(true); // filterInvSubWarehouseRequest.setLyInvType(true);
List<InvSubWarehouseResponse> data = invWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest); // List<InvSubWarehouseResponse> data = invWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
List<String> collect = data.stream().map(InvSubWarehouseResponse::getCode).collect(Collectors.toList()); // List<String> collect = data.stream().map(InvSubWarehouseResponse::getCode).collect(Collectors.toList());
orderDetailResultRequest.setFromInvCodes(collect); // orderDetailResultRequest.setFromInvCodes(collect);
if (null != orderDetailResultRequest.getPage() && null != orderDetailResultRequest.getLimit()) { if (null != orderDetailResultRequest.getPage() && null != orderDetailResultRequest.getLimit()) {
PageHelper.offsetPage((orderDetailResultRequest.getPage() - 1) * orderDetailResultRequest.getLimit(), orderDetailResultRequest.getLimit()); PageHelper.offsetPage((orderDetailResultRequest.getPage() - 1) * orderDetailResultRequest.getLimit(), orderDetailResultRequest.getLimit());

@ -387,7 +387,7 @@ FROM
</foreach> </foreach>
</if> </if>
</where> </where>
order by ipd.updateTime desc GROUP BY ipd.id
) t1 ) t1
GROUP BY nameCode,cpmctymc,batchNo,ggxh GROUP BY nameCode,cpmctymc,batchNo,ggxh
</select> </select>

Loading…
Cancel
Save