refactor(controller): 优化发货单详情控制器中的钢卷绑定列表查询
- 移除 WmsMaterialCoilVo 导入并添加 WmsMaterialCoilBindVo 导入 - 将 boundCoilList 方法返回类型从 WmsMaterialCoilVo 更改为 WmsMaterialCoilBindVo - 调用 queryPageListWithBindInfo 方法替代 queryPageList 方法以获取绑定信息
This commit is contained in:
@@ -3,6 +3,7 @@ package com.klp.controller;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
import com.klp.domain.vo.WmsMaterialCoilBindVo;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import javax.validation.constraints.*;
|
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.vo.WmsDeliveryWaybillDetailVo;
|
||||||
import com.klp.domain.bo.WmsDeliveryWaybillDetailBo;
|
import com.klp.domain.bo.WmsDeliveryWaybillDetailBo;
|
||||||
import com.klp.service.IWmsDeliveryWaybillDetailService;
|
import com.klp.service.IWmsDeliveryWaybillDetailService;
|
||||||
import com.klp.domain.vo.WmsMaterialCoilVo;
|
|
||||||
import com.klp.domain.bo.WmsMaterialCoilBo;
|
import com.klp.domain.bo.WmsMaterialCoilBo;
|
||||||
import com.klp.service.IWmsMaterialCoilService;
|
import com.klp.service.IWmsMaterialCoilService;
|
||||||
import com.klp.common.core.page.TableDataInfo;
|
import com.klp.common.core.page.TableDataInfo;
|
||||||
@@ -115,13 +115,13 @@ public class WmsDeliveryWaybillDetailController extends BaseController {
|
|||||||
* 查询已发货绑定的钢卷列表
|
* 查询已发货绑定的钢卷列表
|
||||||
*/
|
*/
|
||||||
@GetMapping("/boundCoilList")
|
@GetMapping("/boundCoilList")
|
||||||
public TableDataInfo<WmsMaterialCoilVo> boundCoilList(WmsMaterialCoilBo bo, PageQuery pageQuery) {
|
public TableDataInfo<WmsMaterialCoilBindVo> boundCoilList(WmsMaterialCoilBo bo, PageQuery pageQuery) {
|
||||||
List<Long> boundCoilIds = iWmsDeliveryWaybillDetailService.getBoundCoilIds();
|
List<Long> boundCoilIds = iWmsDeliveryWaybillDetailService.getBoundCoilIds();
|
||||||
if (boundCoilIds == null || boundCoilIds.isEmpty()) {
|
if (boundCoilIds == null || boundCoilIds.isEmpty()) {
|
||||||
return new TableDataInfo<>();
|
return new TableDataInfo<>();
|
||||||
}
|
}
|
||||||
bo.setCoilIds(boundCoilIds.stream().map(String::valueOf).collect(java.util.stream.Collectors.joining(",")));
|
bo.setCoilIds(boundCoilIds.stream().map(String::valueOf).collect(java.util.stream.Collectors.joining(",")));
|
||||||
bo.setStatusFirst(true); // 未发货的排在前面
|
bo.setStatusFirst(true); // 未发货的排在前面
|
||||||
return iWmsMaterialCoilService.queryPageList(bo, pageQuery);
|
return iWmsMaterialCoilService.queryPageListWithBindInfo(bo, pageQuery);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user