DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2025-11-14 18:16:20 +08:00
parent 5080a29bd6 a3269487e4
commit 29910f013d
11 changed files with 156 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
klp-wms/src/main/java/com/klp/domain/WmsProduct.java
View File

@@ -95,5 +95,25 @@ public class WmsProduct extends BaseEntity {
//规格
private String specification;
/**
* 材质
*/
private String material;
/**
* 厂家
*/
private String manufacturer;
/**
* 表面处理详情
*/
private String surfaceTreatmentDesc;
/**
* 锌层厚度
*/
private String zincLayer;
}

21
klp-wms/src/main/java/com/klp/domain/WmsRawMaterial.java
View File

@@ -135,5 +135,26 @@ public class WmsRawMaterial extends BaseEntity {
//规格
private String specification;
/**
* 材质
*/
private String material;
/**
* 厂家
*/
private String manufacturer;
/**
* 表面处理详情
*/
private String surfaceTreatmentDesc;
/**
* 锌层厚度
*/
private String zincLayer;
}

23
klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java
View File

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

20
klp-wms/src/main/java/com/klp/domain/bo/WmsRawMaterialBo.java
View File

@@ -152,5 +152,25 @@ public class WmsRawMaterialBo extends BaseEntity {
//规格
private String specification;
/**
* 材质
*/
private String material;
/**
* 厂家
*/
private String manufacturer;
/**
* 表面处理详情
*/
private String surfaceTreatmentDesc;
/**
* 锌层厚度
*/
private String zincLayer;
}

21
klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java
View File

@@ -126,5 +126,26 @@ public class WmsProductVo {
//规格
private String specification;
/**
* 材质
*/
private String material;
/**
* 厂家
*/
private String manufacturer;
/**
* 表面处理详情
*/
private String surfaceTreatmentDesc;
/**
* 锌层厚度
*/
private String zincLayer;
}

20
klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java
View File

@@ -221,5 +221,25 @@ public class WmsRawMaterialVo {
//规格
private String specification;
/**
* 材质
*/
private String material;
/**
* 厂家
*/
private String manufacturer;
/**
* 表面处理详情
*/
private String surfaceTreatmentDesc;
/**
* 锌层厚度
*/
private String zincLayer;
}

12
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -906,6 +906,18 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
if (bo.getRemark() != null && !bo.getRemark().equals(oldCoil.getRemark())) {
changedFields.add("备注: " + oldCoil.getRemark() + " → " + bo.getRemark());
}
if (bo.getQualityStatus() != null && !bo.getQualityStatus().equals(oldCoil.getQualityStatus())) {
changedFields.add("质量状态: " + oldCoil.getQualityStatus() + " → " + bo.getQualityStatus());
}
if (bo.getTrimmingRequirement() != null && !bo.getTrimmingRequirement().equals(oldCoil.getTrimmingRequirement())) {
changedFields.add("切边要求: " + oldCoil.getTrimmingRequirement() + " → " + bo.getTrimmingRequirement());
}
if (bo.getPackingStatus() != null && !bo.getPackingStatus().equals(oldCoil.getPackingStatus())) {
changedFields.add("打包状态: " + oldCoil.getPackingStatus() + " → " + bo.getPackingStatus());
}
if (bo.getPackagingRequirement() != null && !bo.getPackagingRequirement().equals(oldCoil.getPackagingRequirement())) {
changedFields.add("包装要求: " + oldCoil.getPackagingRequirement() + " → " + bo.getPackagingRequirement());
}
newStep.put("changed_fields", String.join("; ", changedFields));
newStep.put("update_time", new java.util.Date());

4
klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
View File

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

5
klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
View File

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

5
klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml
View File

@@ -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>

5
klp-wms/src/main/resources/mapper/klp/WmsRawMaterialMapper.xml
View File

@@ -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>