diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java index c8242be5..b15b5454 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java @@ -1,6 +1,7 @@ package com.klp.domain.bo; import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.klp.common.core.domain.BaseEntity; import com.klp.common.core.validate.AddGroup; @@ -134,8 +135,6 @@ public class WmsMaterialCoilBo extends BaseEntity { //材料类型 private String materialType; - private String itemName; - /** * 质量状态(0=正常,1=待检,2=不合格) @@ -167,6 +166,10 @@ public class WmsMaterialCoilBo extends BaseEntity { */ private String coilIds; + // 筛选类型 + private String selectType; + // 物品名称 + private String itemName; // 材质(两表通用字段名:product.material / raw_material.material) private String itemMaterial; // 厂家(两表通用字段名:product.manufacturer / raw_material.manufacturer) 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 fe4580c6..71d1ba1a 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 @@ -339,7 +339,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType()); // 按 itemType + 细粒度字段筛选(若对应字段非空则拼接条件;为空则不拼) - if (StringUtils.isNotBlank(bo.getItemType())) { + if (StringUtils.isNotBlank(bo.getSelectType())) { List matchedItemIds = new ArrayList<>(); boolean hasAnyItemFilter = StringUtils.isNotBlank(bo.getItemMaterial()) || StringUtils.isNotBlank(bo.getItemManufacturer())