feat(wms): 添加产品和原材料的材质、厂家、表面处理及锌层厚度字段
- 在WmsProduct和WmsRawMaterial实体类中新增material、manufacturer、 surfaceTreatmentDesc和zincLayer字段 - 更新对应的BO和VO类,同步添加上述四个字段 - 修改Mapper XML文件,增加新字段的映射配置 - 在Service实现类中,为新字段添加查询条件支持 - 导入必要的MyBatis注解以支持字段映射
This commit is contained in:
@@ -95,5 +95,25 @@ public class WmsProduct extends BaseEntity {
|
||||
//规格
|
||||
private String specification;
|
||||
|
||||
/**
|
||||
* 材质
|
||||
*/
|
||||
private String material;
|
||||
|
||||
/**
|
||||
* 厂家
|
||||
*/
|
||||
private String manufacturer;
|
||||
|
||||
/**
|
||||
* 表面处理详情
|
||||
*/
|
||||
private String surfaceTreatmentDesc;
|
||||
|
||||
/**
|
||||
* 锌层厚度
|
||||
*/
|
||||
private String zincLayer;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -135,5 +135,26 @@ public class WmsRawMaterial extends BaseEntity {
|
||||
//规格
|
||||
private String specification;
|
||||
|
||||
|
||||
/**
|
||||
* 材质
|
||||
*/
|
||||
private String material;
|
||||
|
||||
/**
|
||||
* 厂家
|
||||
*/
|
||||
private String manufacturer;
|
||||
|
||||
/**
|
||||
* 表面处理详情
|
||||
*/
|
||||
private String surfaceTreatmentDesc;
|
||||
|
||||
/**
|
||||
* 锌层厚度
|
||||
*/
|
||||
private String zincLayer;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.klp.domain.bo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
@@ -96,5 +97,27 @@ public class WmsProductBo extends BaseEntity {
|
||||
|
||||
//规格
|
||||
private String specification;
|
||||
|
||||
|
||||
/**
|
||||
* 材质
|
||||
*/
|
||||
private String material;
|
||||
|
||||
/**
|
||||
* 厂家
|
||||
*/
|
||||
private String manufacturer;
|
||||
|
||||
/**
|
||||
* 表面处理详情
|
||||
*/
|
||||
private String surfaceTreatmentDesc;
|
||||
|
||||
/**
|
||||
* 锌层厚度
|
||||
*/
|
||||
private String zincLayer;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -152,5 +152,25 @@ public class WmsRawMaterialBo extends BaseEntity {
|
||||
|
||||
//规格
|
||||
private String specification;
|
||||
|
||||
/**
|
||||
* 材质
|
||||
*/
|
||||
private String material;
|
||||
|
||||
/**
|
||||
* 厂家
|
||||
*/
|
||||
private String manufacturer;
|
||||
|
||||
/**
|
||||
* 表面处理详情
|
||||
*/
|
||||
private String surfaceTreatmentDesc;
|
||||
|
||||
/**
|
||||
* 锌层厚度
|
||||
*/
|
||||
private String zincLayer;
|
||||
}
|
||||
|
||||
|
||||
@@ -126,5 +126,26 @@ public class WmsProductVo {
|
||||
|
||||
//规格
|
||||
private String specification;
|
||||
|
||||
|
||||
/**
|
||||
* 材质
|
||||
*/
|
||||
private String material;
|
||||
|
||||
/**
|
||||
* 厂家
|
||||
*/
|
||||
private String manufacturer;
|
||||
|
||||
/**
|
||||
* 表面处理详情
|
||||
*/
|
||||
private String surfaceTreatmentDesc;
|
||||
|
||||
/**
|
||||
* 锌层厚度
|
||||
*/
|
||||
private String zincLayer;
|
||||
}
|
||||
|
||||
|
||||
@@ -221,5 +221,25 @@ public class WmsRawMaterialVo {
|
||||
|
||||
//规格
|
||||
private String specification;
|
||||
|
||||
/**
|
||||
* 材质
|
||||
*/
|
||||
private String material;
|
||||
|
||||
/**
|
||||
* 厂家
|
||||
*/
|
||||
private String manufacturer;
|
||||
|
||||
/**
|
||||
* 表面处理详情
|
||||
*/
|
||||
private String surfaceTreatmentDesc;
|
||||
|
||||
/**
|
||||
* 锌层厚度
|
||||
*/
|
||||
private String zincLayer;
|
||||
}
|
||||
|
||||
|
||||
@@ -103,6 +103,10 @@ public class WmsProductServiceImpl implements IWmsProductService {
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getType()), WmsProduct::getType, bo.getType());
|
||||
//规格模糊匹配
|
||||
lqw.like(StringUtils.isNotBlank(bo.getSpecification()), WmsProduct::getSpecification, bo.getSpecification());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getMaterial()), WmsProduct::getMaterial, bo.getMaterial());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSurfaceTreatmentDesc()), WmsProduct::getSurfaceTreatmentDesc, bo.getSurfaceTreatmentDesc());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getManufacturer()), WmsProduct::getManufacturer, bo.getManufacturer());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getZincLayer()), WmsProduct::getZincLayer, bo.getZincLayer());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.klp.domain.WmsProduct;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.domain.bo.WmsRawMaterialBo;
|
||||
@@ -204,6 +205,10 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
|
||||
lqw.eq(bo.getBomId() != null, WmsRawMaterial::getBomId, bo.getBomId());
|
||||
//规格模糊匹配
|
||||
lqw.like(StringUtils.isNotBlank(bo.getSpecification()), WmsRawMaterial::getSpecification, bo.getSpecification());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getMaterial()), WmsRawMaterial::getMaterial, bo.getMaterial());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSurfaceTreatmentDesc()), WmsRawMaterial::getSurfaceTreatmentDesc, bo.getSurfaceTreatmentDesc());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getManufacturer()), WmsRawMaterial::getManufacturer, bo.getManufacturer());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getZincLayer()), WmsRawMaterial::getZincLayer, bo.getZincLayer());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
|
||||
@@ -26,6 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="bomId" column="bom_id"/>
|
||||
<result property="type" column="type"/>
|
||||
<result property="specification" column="specification"/>
|
||||
<result property="material" column="material"/>
|
||||
<result property="manufacturer" column="manufacturer"/>
|
||||
<result property="surfaceTreatmentDesc" column="surface_treatment_desc"/>
|
||||
<result property="zincLayer" column="zinc_layer"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
|
||||
@@ -36,6 +36,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="unit" column="unit"/>
|
||||
<result property="bomId" column="bom_id"/>
|
||||
<result property="specification" column="specification"/>
|
||||
<result property="material" column="material"/>
|
||||
<result property="manufacturer" column="manufacturer"/>
|
||||
<result property="surfaceTreatmentDesc" column="surface_treatment_desc"/>
|
||||
<result property="zincLayer" column="zinc_layer"/>
|
||||
</resultMap>
|
||||
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user