Merge remote-tracking branch 'origin/master'

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

@@ -24,6 +24,7 @@ public class BaseDeviceType extends TenantEntity {
     /**
      * 物料类型ID
      */
+    @TableId(value = "device_type_id", type = IdType.AUTO)
     private Long deviceTypeId;
 
     /**
@@ -61,5 +62,11 @@ public class BaseDeviceType extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 设备大类名称
+     */
+    @TableField(exist = false)
+    private String deviceCategoryName;//join映射字段
+
 
 }

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

@@ -23,7 +23,7 @@ public class BaseDeviceTypeBo extends BaseEntity {
     /**
      * 物料类型ID
      */
-    @NotNull(message = "物料类型ID不能为空", groups = { AddGroup.class, EditGroup.class })
+/*    @NotNull(message = "物料类型ID不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private Long deviceTypeId;
 
     /**
@@ -35,13 +35,13 @@ public class BaseDeviceTypeBo extends BaseEntity {
     /**
      * 设备类型编号
      */
-    @NotBlank(message = "设备类型编号不能为空", groups = { AddGroup.class, EditGroup.class })
+/*    @NotBlank(message = "设备类型编号不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private String deviceTypeCode;
 
     /**
      * 设备类型名称
      */
-    @NotBlank(message = "设备类型名称不能为空", groups = { AddGroup.class, EditGroup.class })
+/*    @NotBlank(message = "设备类型名称不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private String deviceTypeName;
 
     /**
@@ -53,13 +53,13 @@ public class BaseDeviceTypeBo extends BaseEntity {
     /**
      * 设备大类ID（大类ID（关联base_category表category_type为2的））
      */
-    @NotNull(message = "设备大类不能为空", groups = { AddGroup.class, EditGroup.class })
+/*    @NotNull(message = "设备大类不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private Long deviceCategoryId;
 
     /**
      * 激活标识（1是 0否）
      */
-    @NotBlank(message = "激活标识不能为空", groups = { AddGroup.class, EditGroup.class })
+/*    @NotBlank(message = "激活标识不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private String activeFlag;
 
     /**
@@ -68,5 +68,9 @@ public class BaseDeviceTypeBo extends BaseEntity {
 /*    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private String remark;
 
+    /**
+     * 设备大类名称
+     */
+    private String deviceCategoryName;//join映射字段
 
 }

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

@@ -78,5 +78,9 @@ public class BaseDeviceTypeVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
-
+    /**
+     * 设备大类名称
+     */
+    @ExcelProperty(value = "设备大类名称")
+    private String deviceCategoryName;//join映射字段
 }

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

@@ -1,5 +1,6 @@
 package org.dromara.mes.service.impl;
 
+import org.apache.commons.lang3.ObjectUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -9,6 +10,8 @@ import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.mes.domain.BaseDeviceCategory;
+import org.dromara.mes.domain.vo.BaseMaterialTypeVo;
 import org.springframework.stereotype.Service;
 import org.dromara.mes.domain.bo.BaseDeviceTypeBo;
 import org.dromara.mes.domain.vo.BaseDeviceTypeVo;
@@ -73,6 +76,11 @@ public class BaseDeviceTypeServiceImpl implements IBaseDeviceTypeService {
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<BaseDeviceType> lqw = JoinWrappers.lambda(BaseDeviceType.class)
         .selectAll(BaseDeviceType.class)
+
+            // 关联查询设备大类信息
+            .select(BaseDeviceCategory::getDeviceCategoryName)
+            .leftJoin(BaseDeviceCategory.class,BaseDeviceCategory::getDeviceCategoryId,BaseDeviceType::getDeviceCategoryId)
+
         .eq(bo.getDeviceTypeId() != null, BaseDeviceType::getDeviceTypeId, bo.getDeviceTypeId())
         .eq(bo.getParentId() != null, BaseDeviceType::getParentId, bo.getParentId())
         .eq(StringUtils.isNotBlank(bo.getDeviceTypeCode()), BaseDeviceType::getDeviceTypeCode, bo.getDeviceTypeCode())
@@ -94,6 +102,15 @@ public class BaseDeviceTypeServiceImpl implements IBaseDeviceTypeService {
     public Boolean insertByBo(BaseDeviceTypeBo bo) {
         BaseDeviceType add = MapstructUtils.convert(bo, BaseDeviceType.class);
         validEntityBeforeSave(add);
+        //获取父节点信息
+        BaseDeviceTypeVo query = baseMapper.selectVoById(bo.getParentId());
+        if (ObjectUtils.isNotEmpty(query)) {
+            //若父节点不为空，则将父节点的ancestors拼接父节点id拼接成ancestors
+            add.setAncestors(query.getAncestors() + "," + bo.getParentId());
+        }else{
+            //若父节点为空，则ancestors仅有父节点id
+            add.setAncestors(bo.getParentId().toString());
+        }
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setDeviceTypeId(add.getDeviceTypeId());