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); } }