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-04 16:45:35 +08:00
parent 1084f4b134 10152706e8
commit c2ad9e32b8
8 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,5 +92,8 @@ public class WmsProduct extends BaseEntity {
*/
private String type;
//规格
private String specification;
}

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

@@ -126,11 +126,14 @@ public class WmsRawMaterial extends BaseEntity {
* 单位
*/
private String unit;
/**
* BOM 表头ID
*/
private Long bomId;
//规格
private String specification;
}

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

@@ -93,5 +93,8 @@ public class WmsProductBo extends BaseEntity {
private Long bomId;
//产品类型
private String type;
//规格
private String specification;
}

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

@@ -150,5 +150,7 @@ public class WmsRawMaterialBo extends BaseEntity {
*/
private Long bomId;
//规格
private String specification;
}

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

@@ -123,5 +123,8 @@ public class WmsProductVo {
*/
private List<WmsBomItemVo> bomItems;
//规格
private String specification;
}

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

@@ -218,5 +218,8 @@ public class WmsRawMaterialVo {
* BOM明细信息
*/
private List<WmsBomItemVo> bomItems;
//规格
private String specification;
}

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

@@ -69,10 +69,10 @@ public class WmsProductServiceImpl implements IWmsProductService {
public TableDataInfo<WmsProductVo> queryPageListWithBom(WmsProductBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsProduct> lqw = buildQueryWrapper(bo);
Page<WmsProductVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
// 填充BOM信息
fillBomInfo(result.getRecords());
return TableDataInfo.build(result);
}
@@ -101,6 +101,8 @@ public class WmsProductServiceImpl implements IWmsProductService {
lqw.eq(bo.getIsEnabled() != null, WmsProduct::getIsEnabled, bo.getIsEnabled());
lqw.eq(bo.getBomId() != null, WmsProduct::getBomId, bo.getBomId());
lqw.eq(StringUtils.isNotBlank(bo.getType()), WmsProduct::getType, bo.getType());
//规格模糊匹配
lqw.like(StringUtils.isNotBlank(bo.getSpecification()), WmsProduct::getSpecification, bo.getSpecification());
return lqw;
}
@@ -143,14 +145,14 @@ public class WmsProductServiceImpl implements IWmsProductService {
if ("产品".equals(type)) {
// 产品默认属性（根据截图）
defaultAttrs = Arrays.asList(
new String[]{"规格", "1250 * 0.6"},
new String[]{"规格", "0.6 * 1250"},
new String[]{"材质", "SPCC"},
new String[]{"表面处理", "涂油"}
);
} else {
// 原料默认属性（根据截图）
defaultAttrs = Arrays.asList(
new String[]{"规格", "1265 * 4"},
new String[]{"规格", "4 * 1265"},
new String[]{"材质", "Q195L"},
new String[]{"厂家", "天铁"}
);
@@ -184,7 +186,7 @@ public class WmsProductServiceImpl implements IWmsProductService {
if (productList == null || productList.isEmpty()) {
return;
}
for (WmsProductVo vo : productList) {
if (vo.getBomId() != null) {
// 查询BOM明细

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

@@ -83,10 +83,10 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
public TableDataInfo<WmsRawMaterialVo> queryPageListWithBom(WmsRawMaterialBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsRawMaterial> lqw = buildQueryWrapper(bo);
Page<WmsRawMaterialVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
// 填充BOM信息
fillBomInfo(result.getRecords());
return TableDataInfo.build(result);
}
@@ -211,6 +211,8 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
lqw.eq(StringUtils.isNotBlank(bo.getInspectionResult()), WmsRawMaterial::getInspectionResult, bo.getInspectionResult());
lqw.eq(bo.getIsEnabled() != null, WmsRawMaterial::getIsEnabled, bo.getIsEnabled());
lqw.eq(bo.getBomId() != null, WmsRawMaterial::getBomId, bo.getBomId());
//规格模糊匹配
lqw.like(StringUtils.isNotBlank(bo.getSpecification()), WmsRawMaterial::getSpecification, bo.getSpecification());
return lqw;
}
@@ -253,14 +255,14 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
if ("产品".equals(type)) {
// 产品默认属性（根据截图）
defaultAttrs = Arrays.asList(
new String[]{"规格", "1250 * 0.6"},
new String[]{"规格", "0.6 * 1250"},
new String[]{"材质", "SPCC"},
new String[]{"表面处理", "涂油"}
);
} else {
// 原料默认属性（根据截图）
defaultAttrs = Arrays.asList(
new String[]{"规格", "1265 * 4"},
new String[]{"规格", "4 * 1265"},
new String[]{"材质", "Q195L"},
new String[]{"厂家", "天铁"}
);
@@ -294,7 +296,7 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
if (rawMaterialList == null || rawMaterialList.isEmpty()) {
return;
}
for (WmsRawMaterialVo vo : rawMaterialList) {
if (vo.getBomId() != null) {
// 查询BOM明细