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

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<Void> add(@Validated(AddGroup.class) @RequestBody WmsBomBo bo) {
+    public R<WmsBomBo> add(@Validated(AddGroup.class) @RequestBody WmsBomBo bo) {
-        return toAjax(iWmsBomService.insertByBo(bo));
+        return R.ok(iWmsBomService.insertByBo(bo));
     }
 
     /**

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=是）
      */

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=是）
      */

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=是）
      */

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 头，关联产品或原材料

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

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

klp-wms/src/main/resources/mapper/klp/WmsBomMapper.xml

@@ -8,8 +8,6 @@
         <result property="bomId" column="bom_id"/>
         <result property="bomCode" column="bom_code"/>
         <result property="bomName" column="bom_name"/>
-        <result property="parentType" column="parent_type"/>
-        <result property="parentId" column="parent_id"/>
         <result property="isEnabled" column="is_enabled"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createTime" column="create_time"/>