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

删除bom表中的parent_type和parent_id然后修改对应的CRUD

Browse Source
This commit is contained in:
Joshi
2025-07-29 13:35:41 +08:00
parent 620d16fcb0
commit c60b25538e
7 changed files with 5 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-wms/src/main/java/com/klp/controller/WmsBomController.java
View File

@@ -76,8 +76,8 @@ public class WmsBomController extends BaseController {
@Log(title = "BOM 头，关联产品或原材料", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsBomBo bo) {
return toAjax(iWmsBomService.insertByBo(bo));
public R<WmsBomBo> add(@Validated(AddGroup.class) @RequestBody WmsBomBo bo) {
return R.ok(iWmsBomService.insertByBo(bo));
}
/**

8
klp-wms/src/main/java/com/klp/domain/WmsBom.java
View File

@@ -32,14 +32,6 @@ public class WmsBom extends BaseEntity {
* BOM 名称（可选）
*/
private String bomName;
/**
* 所属类型: PRODUCT 或 RAW_MATERIAL
*/
private String parentType;
/**
* 对应 wms_product.product_id 或 wms_raw_material.raw_material_id
*/
private Long parentId;
/**
* 是否启用（0=否，1=是）
*/

10
klp-wms/src/main/java/com/klp/domain/bo/WmsBomBo.java
View File

@@ -32,16 +32,6 @@ public class WmsBomBo extends BaseEntity {
*/
private String bomName;
/**
* 所属类型: PRODUCT 或 RAW_MATERIAL
*/
private String parentType;
/**
* 对应 wms_product.product_id 或 wms_raw_material.raw_material_id
*/
private Long parentId;
/**
* 是否启用（0=否，1=是）
*/

13
klp-wms/src/main/java/com/klp/domain/vo/WmsBomVo.java
View File

@@ -39,19 +39,6 @@ public class WmsBomVo {
@ExcelDictFormat(readConverterExp = "可=选")
private String bomName;
/**
* 所属类型: PRODUCT 或 RAW_MATERIAL
*/
@ExcelProperty(value = "所属类型: PRODUCT 或 RAW_MATERIAL", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "stock_item_type")
private String parentType;
/**
* 对应 wms_product.product_id 或 wms_raw_material.raw_material_id
*/
@ExcelProperty(value = "对应 wms_product.product_id 或 wms_raw_material.raw_material_id")
private Long parentId;
/**
* 是否启用（0=否，1=是）
*/

2
klp-wms/src/main/java/com/klp/service/IWmsBomService.java
View File

@@ -35,7 +35,7 @@ public interface IWmsBomService {
/**
* 新增BOM 头，关联产品或原材料
*/
Boolean insertByBo(WmsBomBo bo);
WmsBomBo insertByBo(WmsBomBo bo);
/**
* 修改BOM 头，关联产品或原材料

6
klp-wms/src/main/java/com/klp/service/impl/WmsBomServiceImpl.java
View File

@@ -63,8 +63,6 @@ public class WmsBomServiceImpl implements IWmsBomService {
LambdaQueryWrapper<WmsBom> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getBomCode()), WmsBom::getBomCode, bo.getBomCode());
lqw.like(StringUtils.isNotBlank(bo.getBomName()), WmsBom::getBomName, bo.getBomName());
lqw.eq(StringUtils.isNotBlank(bo.getParentType()), WmsBom::getParentType, bo.getParentType());
lqw.eq(bo.getParentId() != null, WmsBom::getParentId, bo.getParentId());
lqw.eq(bo.getIsEnabled() != null, WmsBom::getIsEnabled, bo.getIsEnabled());
return lqw;
}
@@ -73,14 +71,14 @@ public class WmsBomServiceImpl implements IWmsBomService {
* 新增BOM 头，关联产品或原材料
*/
@Override
public Boolean insertByBo(WmsBomBo bo) {
public WmsBomBo insertByBo(WmsBomBo bo) {
WmsBom add = BeanUtil.toBean(bo, WmsBom.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setBomId(add.getBomId());
}
return flag;
return bo;
}
/**