update mes等同物料加父级物料、BOM版本

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseEqualMaterialInfo.java

@@ -50,17 +50,31 @@ public class BaseEqualMaterialInfo extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 父物料ID
+     */
+    private Long parentId;
+
+    /**
+     * BOM版本
+     */
+    private String materialBomVersion;
+
     /**
      * 物料名称
      */
     @TableField(exist = false)
-    private String materialName;//映射字段
-
+    private String materialName;
 
     /**
      * 等同物料名称
      */
     @TableField(exist = false)
-    private String equalMaterialName;//映射字段
+    private String equalMaterialName;
 
+    /**
+     * 父物料名称
+     */
+    @TableField(exist = false)
+    private String parentName;
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseEqualMaterialInfoBo.java

@@ -2,12 +2,9 @@ package org.dromara.mes.domain.bo;
 
 import org.dromara.mes.domain.BaseEqualMaterialInfo;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
 
 /**
  * 等同物料信息业务对象 base_equal_material_info
@@ -45,5 +42,13 @@ public class BaseEqualMaterialInfoBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 父物料ID
+     */
+    private Long parentId;
 
+    /**
+     * BOM版本
+     */
+    private String materialBomVersion;
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseEqualMaterialInfoVo.java

@@ -13,7 +13,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 
-
 /**
  * 等同物料信息视图对象 base_equal_material_info
  *
@@ -109,4 +108,22 @@ public class BaseEqualMaterialInfoVo implements Serializable {
     @ExcelProperty(value = "物料名称")
     private String equalMaterialName;//映射字段
 
+    /**
+     * 父物料ID
+     */
+    @ExcelProperty(value = "父物料ID")
+    private Long parentId;
+
+    /**
+     * BOM版本
+     */
+    @ExcelProperty(value = "BOM版本")
+    private String materialBomVersion;
+
+    /**
+     * 父物料名称
+     */
+    @ExcelProperty(value = "父物料名称")
+    private String parentName;
+
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseEqualMaterialInfoServiceImpl.java

@@ -43,7 +43,7 @@ public class BaseEqualMaterialInfoServiceImpl implements IBaseEqualMaterialInfoS
      * @return 等同物料信息
      */
     @Override
-    public BaseEqualMaterialInfoVo queryById(Long equalMaterialInfoId){
+    public BaseEqualMaterialInfoVo queryById(Long equalMaterialInfoId) {
         BaseEqualMaterialInfoVo baseEqualMaterialInfoVo = baseMapper.selectVoById(equalMaterialInfoId);
         if (!ObjectUtils.isEmpty(baseEqualMaterialInfoVo)) {
             // 关联物料名称
@@ -94,20 +94,23 @@ public class BaseEqualMaterialInfoServiceImpl implements IBaseEqualMaterialInfoS
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<BaseEqualMaterialInfo> lqw = JoinWrappers.lambda(BaseEqualMaterialInfo.class)
             .selectAll(BaseEqualMaterialInfo.class)
-
             // 关联查询物料名称
             .select("material.material_name as material_name")
             .leftJoin(BaseMaterialInfo.class, "material", on -> on
                 .eq(BaseMaterialInfo::getMaterialId, BaseEqualMaterialInfo::getMaterialId))
-
             // 关联查询等同物料名称
             .select("equal_material.material_name as equal_material_name")
             .leftJoin(BaseMaterialInfo.class, "equal_material", on -> on
                 .eq(BaseMaterialInfo::getMaterialId, BaseEqualMaterialInfo::getEqualMaterialId))
-
+            // 关联查询父级物料名称
+            .select("parent_material.material_name as parent_name")
+            .leftJoin(BaseMaterialInfo.class, "parent_material", on -> on
+                .eq(BaseMaterialInfo::getMaterialId, BaseEqualMaterialInfo::getParentId))
             .eq(bo.getEqualMaterialInfoId() != null, BaseEqualMaterialInfo::getEqualMaterialInfoId, bo.getEqualMaterialInfoId())
             .eq(bo.getMaterialId() != null, BaseEqualMaterialInfo::getMaterialId, bo.getMaterialId())
             .eq(bo.getEqualMaterialId() != null, BaseEqualMaterialInfo::getEqualMaterialId, bo.getEqualMaterialId())
+            .eq(bo.getParentId() != null, BaseEqualMaterialInfo::getParentId, bo.getParentId())
+            .eq(bo.getMaterialBomVersion() != null, BaseEqualMaterialInfo::getMaterialBomVersion, bo.getMaterialBomVersion())
             .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseEqualMaterialInfo::getActiveFlag, bo.getActiveFlag())
             .orderByDesc(BaseEqualMaterialInfo::getCreateTime);
         return lqw;
@@ -146,7 +149,7 @@ public class BaseEqualMaterialInfoServiceImpl implements IBaseEqualMaterialInfoS
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BaseEqualMaterialInfo entity){
+    private void validEntityBeforeSave(BaseEqualMaterialInfo entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -159,7 +162,7 @@ public class BaseEqualMaterialInfoServiceImpl implements IBaseEqualMaterialInfoS
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;