From 9738a32d9d86d54567b3a86e4ccd6ec203b27bef Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 24 Mar 2026 13:51:47 +0800 Subject: [PATCH] =?UTF-8?q?refactor(controller):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=E8=AF=A6=E6=83=85=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8=E4=B8=AD=E7=9A=84=E9=92=A2=E5=8D=B7=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除 WmsMaterialCoilVo 导入并添加 WmsMaterialCoilBindVo 导入 - 将 boundCoilList 方法返回类型从 WmsMaterialCoilVo 更改为 WmsMaterialCoilBindVo - 调用 queryPageListWithBindInfo 方法替代 queryPageList 方法以获取绑定信息 --- .../klp/controller/WmsDeliveryWaybillDetailController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java index f9c003ef..ca9aa85c 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java @@ -3,6 +3,7 @@ package com.klp.controller; import java.util.List; import java.util.Arrays; +import com.klp.domain.vo.WmsMaterialCoilBindVo; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -20,7 +21,6 @@ import com.klp.common.utils.poi.ExcelUtil; import com.klp.domain.vo.WmsDeliveryWaybillDetailVo; import com.klp.domain.bo.WmsDeliveryWaybillDetailBo; import com.klp.service.IWmsDeliveryWaybillDetailService; -import com.klp.domain.vo.WmsMaterialCoilVo; import com.klp.domain.bo.WmsMaterialCoilBo; import com.klp.service.IWmsMaterialCoilService; import com.klp.common.core.page.TableDataInfo; @@ -115,13 +115,13 @@ public class WmsDeliveryWaybillDetailController extends BaseController { * 查询已发货绑定的钢卷列表 */ @GetMapping("/boundCoilList") - public TableDataInfo boundCoilList(WmsMaterialCoilBo bo, PageQuery pageQuery) { + public TableDataInfo boundCoilList(WmsMaterialCoilBo bo, PageQuery pageQuery) { List boundCoilIds = iWmsDeliveryWaybillDetailService.getBoundCoilIds(); if (boundCoilIds == null || boundCoilIds.isEmpty()) { return new TableDataInfo<>(); } bo.setCoilIds(boundCoilIds.stream().map(String::valueOf).collect(java.util.stream.Collectors.joining(","))); bo.setStatusFirst(true); // 未发货的排在前面 - return iWmsMaterialCoilService.queryPageList(bo, pageQuery); + return iWmsMaterialCoilService.queryPageListWithBindInfo(bo, pageQuery); } }