update mes载具工装关联载具类型

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

@@ -1,9 +1,6 @@
 package org.dromara.mes.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
@@ -41,11 +38,6 @@ public class BaseToolingInfo extends TenantEntity {
      */
     private String toolingName;
 
-    /**
-     * 工装类型（用字典）
-     */
-    private String toolingTypeCode;
-
     /**
      * 工装规格（用字典）
      */
@@ -81,9 +73,21 @@ public class BaseToolingInfo extends TenantEntity {
      */
     private String activeFlag;
 
+    /**
+     * 工装类型ID
+     */
+    private Long toolingTypeId;
+
     /**
      * 删除标志（0代表存在 2代表删除）
      */
     @TableLogic
     private String delFlag;
+
+    /**
+     * 工装类型名称
+     */
+    @TableField(exist = false)
+    private String toolingTypeName;
+
 }

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

@@ -74,5 +74,14 @@ public class BaseToolingInfoBo extends BaseEntity {
      */
     private String activeFlag;
 
+    /**
+     * 工装类型ID
+     */
+    private Long toolingTypeId;
+
+    /**
+     * 工装类型名称
+     */
+    private String toolingTypeName;
 
 }

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

@@ -2,6 +2,7 @@ package org.dromara.mes.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
@@ -53,13 +54,6 @@ public class BaseToolingInfoVo implements Serializable {
     @ExcelProperty(value = "工装名称")
     private String toolingName;
 
-    /**
-     * 工装类型（用字典）
-     */
-    @ExcelProperty(value = "工装类型", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "tooling_type_code")
-    private String toolingTypeCode;
-
     /**
      * 工装规格（用字典）
      */
@@ -133,5 +127,11 @@ public class BaseToolingInfoVo implements Serializable {
     @ExcelProperty(value = "更新时间")
     private Date updateTime;
 
+    /**
+     * 工装类型名称
+     */
+    @ExcelProperty(value = "工装类型名称")
+    private String toolingTypeName;
 
+    private Long toolingTypeId;
 }

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

@@ -10,6 +10,7 @@ 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.BaseToolingType;
 import org.springframework.stereotype.Service;
 import org.dromara.mes.domain.bo.BaseToolingInfoBo;
 import org.dromara.mes.domain.vo.BaseToolingInfoVo;
@@ -40,7 +41,7 @@ public class BaseToolingInfoServiceImpl implements IBaseToolingInfoService {
      * @return 载具工装信息
      */
     @Override
-    public BaseToolingInfoVo queryById(Long toolingId){
+    public BaseToolingInfoVo queryById(Long toolingId) {
         return baseMapper.selectVoById(toolingId);
     }
 
@@ -73,18 +74,19 @@ public class BaseToolingInfoServiceImpl implements IBaseToolingInfoService {
     private MPJLambdaWrapper<BaseToolingInfo> buildQueryWrapper(BaseToolingInfoBo bo) {
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<BaseToolingInfo> lqw = JoinWrappers.lambda(BaseToolingInfo.class)
-        .selectAll(BaseToolingInfo.class)
+            .selectAll(BaseToolingInfo.class)
-        .eq(bo.getToolingId() != null, BaseToolingInfo::getToolingId, bo.getToolingId())
+            .select(BaseToolingType::getToolingTypeName)
-        .eq(StringUtils.isNotBlank(bo.getToolingCode()), BaseToolingInfo::getToolingCode, bo.getToolingCode())
+            .leftJoin(BaseToolingType.class, BaseToolingType::getToolingTypeId, BaseToolingType::getToolingTypeId)
-        .like(StringUtils.isNotBlank(bo.getToolingName()), BaseToolingInfo::getToolingName, bo.getToolingName())
+            .eq(bo.getToolingId() != null, BaseToolingInfo::getToolingId, bo.getToolingId())
-        .eq(StringUtils.isNotBlank(bo.getToolingTypeCode()), BaseToolingInfo::getToolingTypeCode, bo.getToolingTypeCode())
+            .eq(StringUtils.isNotBlank(bo.getToolingCode()), BaseToolingInfo::getToolingCode, bo.getToolingCode())
-        .eq(StringUtils.isNotBlank(bo.getToolingSpecCode()), BaseToolingInfo::getToolingSpecCode, bo.getToolingSpecCode())
+            .like(StringUtils.isNotBlank(bo.getToolingName()), BaseToolingInfo::getToolingName, bo.getToolingName())
-        .eq(StringUtils.isNotBlank(bo.getToolingBarcode()), BaseToolingInfo::getToolingBarcode, bo.getToolingBarcode())
+            .eq(StringUtils.isNotBlank(bo.getToolingSpecCode()), BaseToolingInfo::getToolingSpecCode, bo.getToolingSpecCode())
-        .eq(StringUtils.isNotBlank(bo.getToolingRfidBarcode()), BaseToolingInfo::getToolingRfidBarcode, bo.getToolingRfidBarcode())
+            .eq(StringUtils.isNotBlank(bo.getToolingBarcode()), BaseToolingInfo::getToolingBarcode, bo.getToolingBarcode())
-        .eq(StringUtils.isNotBlank(bo.getMaterialCode()), BaseToolingInfo::getMaterialCode, bo.getMaterialCode())
+            .eq(StringUtils.isNotBlank(bo.getToolingRfidBarcode()), BaseToolingInfo::getToolingRfidBarcode, bo.getToolingRfidBarcode())
-        .eq(bo.getWeight() != null, BaseToolingInfo::getWeight, bo.getWeight())
+            .eq(StringUtils.isNotBlank(bo.getMaterialCode()), BaseToolingInfo::getMaterialCode, bo.getMaterialCode())
-        .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseToolingInfo::getActiveFlag, bo.getActiveFlag())
+            .eq(bo.getWeight() != null, BaseToolingInfo::getWeight, bo.getWeight())
-        .orderByDesc(BaseToolingInfo::getCreateTime);
+            .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseToolingInfo::getActiveFlag, bo.getActiveFlag())
+            .orderByDesc(BaseToolingInfo::getCreateTime);
         return lqw;
     }
 
@@ -121,14 +123,14 @@ public class BaseToolingInfoServiceImpl implements IBaseToolingInfoService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BaseToolingInfo entity){
+    private void validEntityBeforeSave(BaseToolingInfo entity) {
         //TODO 做一些数据校验,如唯一约束
         // 校验编码是否已存在
         if (StringUtils.isNotBlank(entity.getToolingCode())) {
             BaseToolingInfoBo query = new BaseToolingInfoBo();
             query.setToolingCode(entity.getToolingCode());
             MPJLambdaWrapper<BaseToolingInfo> lqw = buildQueryWrapper(query);
-            BaseToolingInfo baseToolingInfo =  baseMapper.selectOne(lqw);
+            BaseToolingInfo baseToolingInfo = baseMapper.selectOne(lqw);
             if (baseToolingInfo != null && !baseToolingInfo.getToolingId().equals(entity.getToolingId())) {
                 throw new ServiceException("编码已存在");
             }
@@ -144,7 +146,7 @@ public class BaseToolingInfoServiceImpl implements IBaseToolingInfoService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;