diff --git a/klp-wms/src/main/java/com/klp/controller/WmsBomController.java b/klp-wms/src/main/java/com/klp/controller/WmsBomController.java index 3e9357ac..580cb7b9 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsBomController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsBomController.java @@ -76,8 +76,8 @@ public class WmsBomController extends BaseController { @Log(title = "BOM 头,关联产品或原材料", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody WmsBomBo bo) { - return toAjax(iWmsBomService.insertByBo(bo)); + public R add(@Validated(AddGroup.class) @RequestBody WmsBomBo bo) { + return R.ok(iWmsBomService.insertByBo(bo)); } /** diff --git a/klp-wms/src/main/java/com/klp/domain/WmsBom.java b/klp-wms/src/main/java/com/klp/domain/WmsBom.java index 256039cf..85e2648b 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsBom.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsBom.java @@ -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=是) */ diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsBomBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsBomBo.java index e9f007c1..9dc383dc 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsBomBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsBomBo.java @@ -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=是) */ diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsBomVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsBomVo.java index 44e71e45..c2bfcf19 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsBomVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsBomVo.java @@ -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=是) */ diff --git a/klp-wms/src/main/java/com/klp/service/IWmsBomService.java b/klp-wms/src/main/java/com/klp/service/IWmsBomService.java index 3018ea4b..0fa28b70 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsBomService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsBomService.java @@ -35,7 +35,7 @@ public interface IWmsBomService { /** * 新增BOM 头,关联产品或原材料 */ - Boolean insertByBo(WmsBomBo bo); + WmsBomBo insertByBo(WmsBomBo bo); /** * 修改BOM 头,关联产品或原材料 diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsBomServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsBomServiceImpl.java index a223f8e2..b64152fd 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsBomServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsBomServiceImpl.java @@ -63,8 +63,6 @@ public class WmsBomServiceImpl implements IWmsBomService { LambdaQueryWrapper 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; } /** diff --git a/klp-wms/src/main/resources/mapper/klp/WmsBomMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsBomMapper.xml index 78a96881..4c88de41 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsBomMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsBomMapper.xml @@ -8,8 +8,6 @@ - -