diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java index df353d15..b0639b38 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import java.util.Arrays; +import com.klp.domain.vo.WmsMaterialCoilExportVo; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -51,8 +52,8 @@ public class WmsMaterialCoilController extends BaseController { @Log(title = "钢卷物料表", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WmsMaterialCoilBo bo, HttpServletResponse response) { - List list = iWmsMaterialCoilService.queryExportList(bo); - ExcelUtil.exportExcel(list, "钢卷物料表", com.klp.domain.vo.WmsMaterialCoilExportVo.class, response); + List list = iWmsMaterialCoilService.queryExportList(bo); + ExcelUtil.exportExcel(list, "钢卷物料表", WmsMaterialCoilExportVo.class, response); } /** diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java index b45ab20b..94eb37a4 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java @@ -25,11 +25,7 @@ public class WmsMaterialCoilExportVo { @ExcelProperty(value = "类型") private String itemTypeDesc; - /** - * 物品ID - */ - @ExcelProperty(value = "物品ID") - private Long itemId; + /** * 逻辑库区 @@ -150,4 +146,10 @@ public class WmsMaterialCoilExportVo { */ @ExcelProperty(value = "锌层") private String zincLayer; + + /** + * 物品ID + */ + @ExcelProperty(value = "物品ID") + private Long itemId; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 5b66a20f..d9475de6 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -11,16 +11,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.klp.common.helper.LoginHelper; import com.klp.common.utils.StringUtils; import com.klp.domain.bo.*; +import com.klp.domain.vo.*; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.klp.domain.vo.WmsMaterialCoilVo; -import com.klp.domain.vo.WmsGenerateRecordVo; -import com.klp.domain.vo.WmsWarehouseVo; -import com.klp.domain.vo.WmsRawMaterialVo; -import com.klp.domain.vo.WmsBomItemVo; import com.klp.domain.WmsMaterialCoil; -import com.klp.domain.vo.WmsStockVo; import com.klp.mapper.WmsMaterialCoilMapper; import com.klp.mapper.WmsStockMapper; import com.klp.mapper.WmsGenerateRecordMapper; @@ -32,8 +27,6 @@ import com.klp.service.IWmsActualWarehouseService; import com.klp.service.IWmsRawMaterialService; import com.klp.service.IWmsBomItemService; import com.klp.service.IWmsProductService; -import com.klp.domain.vo.WmsActualWarehouseVo; -import com.klp.domain.vo.WmsProductVo; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.*; @@ -1591,7 +1584,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { * 查询钢卷导出数据列表 */ @Override - public List queryExportList(WmsMaterialCoilBo bo) { + public List queryExportList(WmsMaterialCoilBo bo) { QueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectExportList(lqw); }