优化代码生成

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/CommonFieldsSet.java

@@ -0,0 +1,60 @@
+package com.ruoyi.gen.config;
+
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.reflect.ReflectUtils;
+import com.ruoyi.common.core.web.domain.ExtBaseEntity;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 共通字段设定
+ *
+ * @author Alan Scipio
+ * created on 2024/2/18
+ */
+public class CommonFieldsSet {
+
+    private static final List<String> COMMON_FIELDS = new ArrayList<>();
+
+    static {
+        Field[] fields = ReflectUtils.getFieldsDeep(ExtBaseEntity.class);
+        for (Field field : fields) {
+            //跳过静态字段
+            if (Modifier.isStatic(field.getModifiers())) {
+                continue;
+            }
+            //将驼峰命名转换为下划线命名
+            String columnName = StringUtils.toUnderScoreCase(field.getName());
+            COMMON_FIELDS.add(columnName);
+        }
+
+        //从属部门ID也相当于是共通字段
+        COMMON_FIELDS.add("DEPT_ID");
+        //备注字段默认都是共通字段
+        COMMON_FIELDS.add("remark*");
+    }
+
+    public static boolean isCommonField(String columnName) {
+        for (String commonField : COMMON_FIELDS) {
+            //如果字段名相同则是共通字段,不区分大小写
+            if (commonField.equalsIgnoreCase(columnName)) {
+                return true;
+            } else if (commonField.endsWith("*")) {
+                //如果字段名以*结尾则是通配符,不区分大小写
+                String prefix = commonField.substring(0, commonField.length() - 1);
+                if (columnName.toLowerCase().startsWith(prefix.toLowerCase())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public static List<String> getCommonFields() {
+        return COMMON_FIELDS;
+    }
+
+}

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java

@@ -12,96 +12,145 @@ import java.util.List;
 
 /**
  * 业务表 gen_table
- * 
+ *
  * @author ruoyi
  */
-public class GenTable extends BaseEntity
-{
+public class GenTable extends BaseEntity {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
     private Long tableId;
 
-    /** 表名称 */
+    /**
+     * 表名称
+     */
     @NotBlank(message = "表名称不能为空")
     private String tableName;
 
-    /** 表描述 */
+    /**
+     * 表描述
+     */
     @NotBlank(message = "表描述不能为空")
     private String tableComment;
 
-    /** 关联父表的表名 */
+    /**
+     * 关联父表的表名
+     */
     private String subTableName;
 
-    /** 本表关联父表的外键名 */
+    /**
+     * 本表关联父表的外键名
+     */
     private String subTableFkName;
 
-    /** 实体类名称(首字母大写) */
+    /**
+     * 实体类名称(首字母大写)
+     */
     @NotBlank(message = "实体类名称不能为空")
     private String className;
 
-    /** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */
+    /**
+     * 使用的模板（crud单表操作 tree树表操作 sub主子表操作）
+     */
     private String tplCategory;
 
-    /** 前端类型（element-ui模版 element-plus模版） */
+    /**
+     * 前端类型（element-ui模版 element-plus模版）
+     */
     private String tplWebType;
 
-    /** 后端类型（MyBaitsDynamicSQL模板，常规模板） */
+    /**
+     * 后端类型（MyBaitsDynamicSQL模板，常规模板）
+     */
     private String tplBackendType;
 
-    /** 生成包路径 */
+    /**
+     * 生成包路径
+     */
     @NotBlank(message = "生成包路径不能为空")
     private String packageName;
 
-    /** 生成模块名 */
+    /**
+     * 生成模块名
+     */
     @NotBlank(message = "生成模块名不能为空")
     private String moduleName;
 
-    /** 生成业务名 */
+    /**
+     * 生成业务名
+     */
     @NotBlank(message = "生成业务名不能为空")
     private String businessName;
 
-    /** 生成功能名 */
+    /**
+     * 生成功能名
+     */
     @NotBlank(message = "生成功能名不能为空")
     private String functionName;
 
-    /** 生成作者 */
+    /**
+     * 生成作者
+     */
     @NotBlank(message = "作者不能为空")
     private String functionAuthor;
 
-    /** 生成代码方式（0zip压缩包 1自定义路径） */
+    /**
+     * 生成代码方式（0zip压缩包 1自定义路径）
+     */
     private String genType;
 
-    /** 生成路径（不填默认项目路径） */
+    /**
+     * 生成路径（不填默认项目路径）
+     */
     private String genPath;
 
-    /** 主键信息 */
+    /**
+     * 主键信息
+     */
     private GenTableColumn pkColumn;
 
-    /** 子表信息 */
+    /**
+     * 子表信息
+     */
     private GenTable subTable;
 
-    /** 表列信息 */
+    /**
+     * 表列信息
+     */
     @Valid
     private List<GenTableColumn> columns;
 
-    /** 其它生成选项 */
+    /**
+     * 其它生成选项
+     */
     private String options;
 
-    /** 树编码字段 */
+    /**
+     * 树编码字段
+     */
     private String treeCode;
 
-    /** 树父编码字段 */
+    /**
+     * 树父编码字段
+     */
     private String treeParentCode;
 
-    /** 树名称字段 */
+    /**
+     * 树名称字段
+     */
     private String treeName;
 
-    /** 上级菜单ID字段 */
+    /**
+     * 上级菜单ID字段
+     */
     private String parentMenuId;
 
-    /** 上级菜单名称字段 */
+    /**
+     * 上级菜单名称字段
+     */
     private String parentMenuName;
 
     public String getTplBackendType() {
@@ -112,283 +161,228 @@ public class GenTable extends BaseEntity
         this.tplBackendType = tplBackendType;
     }
 
-    public Long getTableId()
-    {
+    public Long getTableId() {
         return tableId;
     }
 
-    public void setTableId(Long tableId)
-    {
+    public void setTableId(Long tableId) {
         this.tableId = tableId;
     }
 
-    public String getTableName()
-    {
+    public String getTableName() {
         return tableName;
     }
 
-    public void setTableName(String tableName)
-    {
+    public void setTableName(String tableName) {
         this.tableName = tableName;
     }
 
-    public String getTableComment()
-    {
+    public String getTableComment() {
         return tableComment;
     }
 
-    public void setTableComment(String tableComment)
-    {
+    public void setTableComment(String tableComment) {
         this.tableComment = tableComment;
     }
 
-    public String getSubTableName()
-    {
+    public String getSubTableName() {
         return subTableName;
     }
 
-    public void setSubTableName(String subTableName)
-    {
+    public void setSubTableName(String subTableName) {
         this.subTableName = subTableName;
     }
 
-    public String getSubTableFkName()
-    {
+    public String getSubTableFkName() {
         return subTableFkName;
     }
 
-    public void setSubTableFkName(String subTableFkName)
-    {
+    public void setSubTableFkName(String subTableFkName) {
         this.subTableFkName = subTableFkName;
     }
 
-    public String getClassName()
-    {
+    public String getClassName() {
         return className;
     }
 
-    public void setClassName(String className)
-    {
+    public void setClassName(String className) {
         this.className = className;
     }
 
-    public String getTplCategory()
-    {
+    public String getTplCategory() {
         return tplCategory;
     }
 
-    public void setTplCategory(String tplCategory)
-    {
+    public void setTplCategory(String tplCategory) {
         this.tplCategory = tplCategory;
     }
 
-    public String getTplWebType()
-    {
+    public String getTplWebType() {
         return tplWebType;
     }
 
-    public void setTplWebType(String tplWebType)
-    {
+    public void setTplWebType(String tplWebType) {
         this.tplWebType = tplWebType;
     }
 
-    public String getPackageName()
-    {
+    public String getPackageName() {
         return packageName;
     }
 
-    public void setPackageName(String packageName)
-    {
+    public void setPackageName(String packageName) {
         this.packageName = packageName;
     }
 
-    public String getModuleName()
-    {
+    public String getModuleName() {
         return moduleName;
     }
 
-    public void setModuleName(String moduleName)
-    {
+    public void setModuleName(String moduleName) {
         this.moduleName = moduleName;
     }
 
-    public String getBusinessName()
-    {
+    public String getBusinessName() {
         return businessName;
     }
 
-    public void setBusinessName(String businessName)
-    {
+    public void setBusinessName(String businessName) {
         this.businessName = businessName;
     }
 
-    public String getFunctionName()
-    {
+    public String getFunctionName() {
         return functionName;
     }
 
-    public void setFunctionName(String functionName)
-    {
+    public void setFunctionName(String functionName) {
         this.functionName = functionName;
     }
 
-    public String getFunctionAuthor()
-    {
+    public String getFunctionAuthor() {
         return functionAuthor;
     }
 
-    public void setFunctionAuthor(String functionAuthor)
-    {
+    public void setFunctionAuthor(String functionAuthor) {
         this.functionAuthor = functionAuthor;
     }
 
-    public String getGenType()
-    {
+    public String getGenType() {
         return genType;
     }
 
-    public void setGenType(String genType)
-    {
+    public void setGenType(String genType) {
         this.genType = genType;
     }
 
-    public String getGenPath()
-    {
+    public String getGenPath() {
         return genPath;
     }
 
-    public void setGenPath(String genPath)
-    {
+    public void setGenPath(String genPath) {
         this.genPath = genPath;
     }
 
-    public GenTableColumn getPkColumn()
-    {
+    public GenTableColumn getPkColumn() {
         return pkColumn;
     }
 
-    public void setPkColumn(GenTableColumn pkColumn)
-    {
+    public void setPkColumn(GenTableColumn pkColumn) {
         this.pkColumn = pkColumn;
     }
 
-    public GenTable getSubTable()
-    {
+    public GenTable getSubTable() {
         return subTable;
     }
 
-    public void setSubTable(GenTable subTable)
-    {
+    public void setSubTable(GenTable subTable) {
         this.subTable = subTable;
     }
-    public List<GenTableColumn> getColumns()
-    {
+
+    public List<GenTableColumn> getColumns() {
         return columns;
     }
 
-    public void setColumns(List<GenTableColumn> columns)
-    {
+    public void setColumns(List<GenTableColumn> columns) {
         this.columns = columns;
     }
 
-    public String getOptions()
-    {
+    public String getOptions() {
         return options;
     }
 
-    public void setOptions(String options)
-    {
+    public void setOptions(String options) {
         this.options = options;
     }
 
-    public String getTreeCode()
-    {
+    public String getTreeCode() {
         return treeCode;
     }
 
-    public void setTreeCode(String treeCode)
-    {
+    public void setTreeCode(String treeCode) {
         this.treeCode = treeCode;
     }
 
-    public String getTreeParentCode()
-    {
+    public String getTreeParentCode() {
         return treeParentCode;
     }
 
-    public void setTreeParentCode(String treeParentCode)
-    {
+    public void setTreeParentCode(String treeParentCode) {
         this.treeParentCode = treeParentCode;
     }
 
-    public String getTreeName()
-    {
+    public String getTreeName() {
         return treeName;
     }
 
-    public void setTreeName(String treeName)
-    {
+    public void setTreeName(String treeName) {
         this.treeName = treeName;
     }
 
-    public String getParentMenuId()
-    {
+    public String getParentMenuId() {
         return parentMenuId;
     }
 
-    public void setParentMenuId(String parentMenuId)
-    {
+    public void setParentMenuId(String parentMenuId) {
         this.parentMenuId = parentMenuId;
     }
 
-    public String getParentMenuName()
-    {
+    public String getParentMenuName() {
         return parentMenuName;
     }
 
-    public void setParentMenuName(String parentMenuName)
-    {
+    public void setParentMenuName(String parentMenuName) {
         this.parentMenuName = parentMenuName;
     }
 
-    public boolean isSub()
-    {
+    public boolean isSub() {
         return isSub(this.tplCategory);
     }
 
-    public static boolean isSub(String tplCategory)
-    {
+    public static boolean isSub(String tplCategory) {
         return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
     }
-    public boolean isTree()
-    {
+
+    public boolean isTree() {
         return isTree(this.tplCategory);
     }
 
-    public static boolean isTree(String tplCategory)
-    {
+    public static boolean isTree(String tplCategory) {
         return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
     }
 
-    public boolean isCrud()
-    {
+    public boolean isCrud() {
         return isCrud(this.tplCategory);
     }
 
-    public static boolean isCrud(String tplCategory)
-    {
+    public static boolean isCrud(String tplCategory) {
         return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
     }
 
-    public boolean isSuperColumn(String javaField)
-    {
+    public boolean isSuperColumn(String javaField) {
         return isSuperColumn(this.tplCategory, javaField);
     }
 
-    public static boolean isSuperColumn(String tplCategory, String javaField)
-    {
-        if (isTree(tplCategory))
-        {
+    public static boolean isSuperColumn(String tplCategory, String javaField) {
+        if (isTree(tplCategory)) {
             return StringUtils.equalsAnyIgnoreCase(javaField,
                     ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
         }

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java

@@ -3,7 +3,7 @@ package com.ruoyi.gen.service;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.gen.domain.GenTableColumn;
 import com.ruoyi.gen.mapper.GenTableColumnMapper;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.List;
  */
 @Service
 public class GenTableColumnServiceImpl implements IGenTableColumnService {
-    @Autowired
+    @Resource
     private GenTableColumnMapper genTableColumnMapper;
 
     /**

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java

@@ -15,6 +15,7 @@ import com.ruoyi.gen.mapper.GenTableMapper;
 import com.ruoyi.gen.util.GenUtils;
 import com.ruoyi.gen.util.VelocityInitializer;
 import com.ruoyi.gen.util.VelocityUtils;
+import jakarta.annotation.Resource;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.velocity.Template;
@@ -22,7 +23,6 @@ import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -47,10 +47,10 @@ import java.util.zip.ZipOutputStream;
 public class GenTableServiceImpl implements IGenTableService {
     private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class);
 
-    @Autowired
+    @Resource
     private GenTableMapper genTableMapper;
 
-    @Autowired
+    @Resource
     private GenTableColumnMapper genTableColumnMapper;
 
     /**

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java

@@ -2,6 +2,7 @@ package com.ruoyi.gen.util;
 
 import com.ruoyi.common.core.constant.GenConstants;
 import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.gen.config.CommonFieldsSet;
 import com.ruoyi.gen.config.GenConfig;
 import com.ruoyi.gen.domain.GenTable;
 import com.ruoyi.gen.domain.GenTableColumn;
@@ -68,19 +69,21 @@ public class GenUtils {
             }
         }
 
-        // 插入字段（默认所有字段都需要插入）
-        column.setIsInsert(GenConstants.REQUIRE);
+        // 插入字段（默认所有字段都需要插入，除了共通字段）
+        if (!CommonFieldsSet.isCommonField(columnName)) {
+            column.setIsInsert(GenConstants.REQUIRE);
+        }
 
         // 编辑字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk()) {
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk() && !CommonFieldsSet.isCommonField(columnName)) {
             column.setIsEdit(GenConstants.REQUIRE);
         }
         // 列表字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk()) {
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk() && !CommonFieldsSet.isCommonField(columnName)) {
             column.setIsList(GenConstants.REQUIRE);
         }
         // 查询字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) {
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk() && !CommonFieldsSet.isCommonField(columnName)) {
             column.setIsQuery(GenConstants.REQUIRE);
         }
 

ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gen.mapper.GenTableColumnMapper">
 
-    <resultMap type="GenTableColumn" id="GenTableColumnResult">
+    <resultMap type="com.ruoyi.gen.domain.GenTableColumn" id="GenTableColumnResult">
         <id     property="columnId"       column="column_id"      />
         <result property="tableId"        column="table_id"       />
         <result property="columnName"     column="column_name"    />
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
     </sql>
 
-    <select id="selectGenTableColumnListByTableId" parameterType="GenTableColumn" resultMap="GenTableColumnResult">
+    <select id="selectGenTableColumnListByTableId" parameterType="com.ruoyi.gen.domain.GenTableColumn" resultMap="GenTableColumnResult">
         <include refid="selectGenTableColumnVo"/>
         where table_id = #{tableId}
         order by sort
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by ordinal_position
 	</select>
 
-    <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
+    <insert id="insertGenTableColumn" parameterType="com.ruoyi.gen.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
         insert into gen_table_column (
 			<if test="tableId != null and tableId != ''">table_id,</if>
 			<if test="columnName != null and columnName != ''">column_name,</if>
@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          )
     </insert>
 
-    <update id="updateGenTableColumn" parameterType="GenTableColumn">
+    <update id="updateGenTableColumn" parameterType="com.ruoyi.gen.domain.GenTableColumn">
         update gen_table_column
         <set>
             <if test="columnComment != null">column_comment = #{columnComment},</if>

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl-dynamic.java.vm

@@ -22,7 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import ${packageName}.domain.${subClassName};
 #end
 import com.ruoyi.common.core.web.domain.ExtBaseEntity;
-import com.ruoyi.common.security.utils.SecurityUtilsExt
+import com.ruoyi.common.security.utils.SecurityUtilsExt;
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.mapper.${ClassName}DynamicSqlSupport;
@@ -91,7 +91,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
         #end
         ## 对like条件的特殊处理
         #if ($column.queryType == "LIKE")
-            .and(${ClassName}DynamicSqlSupport.$column.javaField, SqlBuilder.${conditionFuncName}(${className}.get${column.javaFieldUpper}() == null ? null : "%" + ${className}.get${column.javaFieldUpper}() + "%")
+            .and(${ClassName}DynamicSqlSupport.$column.javaField, SqlBuilder.${conditionFuncName}(${className}.get${column.javaFieldUpper}() == null ? null : "%" + ${className}.get${column.javaFieldUpper}() + "%"))
         #else
             .and(${ClassName}DynamicSqlSupport.$column.javaField, SqlBuilder.${conditionFuncName}(${className}.get${column.javaFieldUpper}()))
         #end
@@ -114,11 +114,11 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Override
     public int insert${ClassName}(${ClassName} ${className})
     {
-#foreach ($column in $columns)
-#if($column.javaField == 'createTime')
-        ${className}.setCreateTime(DateUtils.getNowDate());
-#end
-#end
+###foreach ($column in $columns)
+###if($column.javaField == 'createTime')
+##        ${className}.setCreateTime(DateUtils.getNowDate());
+###end
+###end
 #if($table.sub)
         int rows = ${className}Mapper.insertSelective(${className});
         insert${subClassName}(${className});
@@ -140,11 +140,11 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Override
     public int update${ClassName}(${ClassName} ${className})
     {
-#foreach ($column in $columns)
-#if($column.javaField == 'updateTime')
-        ${className}.setUpdateTime(DateUtils.getNowDate());
-#end
-#end
+###foreach ($column in $columns)
+###if($column.javaField == 'updateTime')
+##        ${className}.setUpdateTime(DateUtils.getNowDate());
+###end
+###end
 #if($table.sub)
         ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
         insert${subClassName}(${className});
@@ -169,11 +169,11 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 #end
 ##        return ${className}Mapper.delete(dsl -> dsl.where(${ClassName}DynamicSqlSupport.${pkColumn.javaField}, SqlBuilder.isIn(${pkColumn.javaField}s)));
         String userId = SecurityUtilsExt.getUserIdStr();
-        UpdateStatementProvider provider = SqlBuilder.update(UnitInfoDynamicSqlSupport.${className})
+        UpdateStatementProvider provider = SqlBuilder.update(${ClassName}DynamicSqlSupport.${className})
                 .set(${ClassName}DynamicSqlSupport.deleteFlag).equalTo(ExtBaseEntity.DELETED)
                 .set(${ClassName}DynamicSqlSupport.updateTime).equalTo(DateUtils.getNowDate())
                 .set(${ClassName}DynamicSqlSupport.updateBy).equalTo(userId)
-                .where(${ClassName}DynamicSqlSupport.unitCode, SqlBuilder.isIn(${pkColumn.javaField}s))
+                .where(${ClassName}DynamicSqlSupport.${pkColumn.javaField}, SqlBuilder.isIn(${pkColumn.javaField}s))
                 .build()
                 .render(RenderingStrategies.MYBATIS3);
         return ${className}Mapper.update(provider);

ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm

@@ -108,7 +108,7 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange" show-overflow-tooltip="true">
       <el-table-column type="selection" width="55" align="center" />
 #foreach($column in $columns)
 #set($javaField=$column.javaField)

ruoyi-modules/ruoyi-system/src/test/resources/generatorConfig.xml

@@ -10,9 +10,9 @@
         <plugin type="org.mybatis.generator.plugins.SerializablePlugin"/>
         <plugin type="org.mybatis.generator.plugins.ToStringPlugin"/>
 
-        <commentGenerator>
+        <commentGenerator type="com.ruoyi.common.datasource.mybatis.gen.MyCommentGenerator">
             <property name="suppressAllComments" value="false"/>
-            <property name="suppressDate" value="true"/>
+            <property name="suppressDate" value="false"/>
             <property name="addRemarkComments" value="true"/>
         </commentGenerator>
 

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/GoodsTypeController.java

@@ -0,0 +1,91 @@
+package com.ruoyi.wms.controller;
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.wms.domain.GoodsType;
+import com.ruoyi.wms.service.IGoodsTypeService;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 物品类型管理Controller
+ *
+ * @author ryas
+ * created on 2024-02-18
+ */
+@RestController
+@RequestMapping("/GoodsType")
+public class GoodsTypeController extends BaseController {
+    @Autowired
+    private IGoodsTypeService goodsTypeService;
+
+    /**
+     * 查询物品类型管理列表
+     */
+    @RequiresPermissions("wms:GoodsType:list")
+    @GetMapping("/list")
+    public TableDataInfo list(GoodsType goodsType) {
+        startPage();
+        List<GoodsType> list = goodsTypeService.selectGoodsTypeList(goodsType);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出物品类型管理列表
+     */
+    @RequiresPermissions("wms:GoodsType:export")
+    @Log(title = "物品类型管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, GoodsType goodsType) {
+        List<GoodsType> list = goodsTypeService.selectGoodsTypeList(goodsType);
+        ExcelUtil<GoodsType> util = new ExcelUtil<>(GoodsType.class);
+        util.exportExcel(response, list, "物品类型管理数据");
+    }
+
+    /**
+     * 获取物品类型管理详细信息
+     */
+    @RequiresPermissions("wms:GoodsType:query")
+    @GetMapping(value = "/{goodsTypeCd}")
+    public AjaxResult getInfo(@PathVariable("goodsTypeCd") String goodsTypeCd) {
+        return success(goodsTypeService.selectGoodsTypeByGoodsTypeCd(goodsTypeCd));
+    }
+
+    /**
+     * 新增物品类型管理
+     */
+    @RequiresPermissions("wms:GoodsType:add")
+    @Log(title = "物品类型管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody GoodsType goodsType) {
+        return toAjax(goodsTypeService.insertGoodsType(goodsType));
+    }
+
+    /**
+     * 修改物品类型管理
+     */
+    @RequiresPermissions("wms:GoodsType:edit")
+    @Log(title = "物品类型管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody GoodsType goodsType) {
+        return toAjax(goodsTypeService.updateGoodsType(goodsType));
+    }
+
+    /**
+     * 删除物品类型管理
+     */
+    @RequiresPermissions("wms:GoodsType:remove")
+    @Log(title = "物品类型管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{goodsTypeCds}")
+    public AjaxResult remove(@PathVariable String[] goodsTypeCds) {
+        return toAjax(goodsTypeService.deleteGoodsTypeByGoodsTypeCds(goodsTypeCds));
+    }
+}

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/UnitInfoController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.wms.controller;
 
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -8,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.wms.domain.UnitInfo;
 import com.ruoyi.wms.service.IUnitInfoService;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -36,19 +38,17 @@ public class UnitInfoController extends BaseController {
         return getDataTable(list);
     }
 
-    //TODO 如果要启用导出功能，需要在domain实体类的字段上添加注解：@com.ruoyi.common.core.annotation.Excel(name = "字段名")
-    /*
+    /**
      * 导出单位信息管理列表
      */
-//    @RequiresPermissions("wms:UnitInfo:export")
-//    @Log(title = "单位信息管理", businessType = BusinessType.EXPORT)
-//    @PostMapping("/export")
-//    public void export(HttpServletResponse response, UnitInfo unitInfo)
-//    {
-//        List<UnitInfo> list = unitInfoService.selectUnitInfoList(unitInfo);
-//        ExcelUtil<UnitInfo> util = new ExcelUtil<>(UnitInfo.class);
-//        util.exportExcel(response, list, "单位信息管理数据");
-//    }
+    @RequiresPermissions("wms:UnitInfo:export")
+    @Log(title = "单位信息管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, UnitInfo unitInfo) {
+        List<UnitInfo> list = unitInfoService.selectUnitInfoList(unitInfo);
+        ExcelUtil<UnitInfo> util = new ExcelUtil<>(UnitInfo.class);
+        util.exportExcel(response, list, "单位信息管理数据");
+    }
 
     /**
      * 获取单位信息管理详细信息

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/WarehouseInfoController.java

@@ -0,0 +1,91 @@
+package com.ruoyi.wms.controller;
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.wms.domain.WarehouseInfo;
+import com.ruoyi.wms.service.IWarehouseInfoService;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 仓库基础信息Controller
+ *
+ * @author ryas
+ * created on 2024-02-18
+ */
+@RestController
+@RequestMapping("/WarehouseInfo")
+public class WarehouseInfoController extends BaseController {
+    @Autowired
+    private IWarehouseInfoService warehouseInfoService;
+
+    /**
+     * 查询仓库基础信息列表
+     */
+    @RequiresPermissions("wms:WarehouseInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo list(WarehouseInfo warehouseInfo) {
+        startPage();
+        List<WarehouseInfo> list = warehouseInfoService.selectWarehouseInfoList(warehouseInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出仓库基础信息列表
+     */
+    @RequiresPermissions("wms:WarehouseInfo:export")
+    @Log(title = "仓库基础信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, WarehouseInfo warehouseInfo) {
+        List<WarehouseInfo> list = warehouseInfoService.selectWarehouseInfoList(warehouseInfo);
+        ExcelUtil<WarehouseInfo> util = new ExcelUtil<>(WarehouseInfo.class);
+        util.exportExcel(response, list, "仓库基础信息数据");
+    }
+
+    /**
+     * 获取仓库基础信息详细信息
+     */
+    @RequiresPermissions("wms:WarehouseInfo:query")
+    @GetMapping(value = "/{whsCd}")
+    public AjaxResult getInfo(@PathVariable("whsCd") String whsCd) {
+        return success(warehouseInfoService.selectWarehouseInfoByWhsCd(whsCd));
+    }
+
+    /**
+     * 新增仓库基础信息
+     */
+    @RequiresPermissions("wms:WarehouseInfo:add")
+    @Log(title = "仓库基础信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody WarehouseInfo warehouseInfo) {
+        return toAjax(warehouseInfoService.insertWarehouseInfo(warehouseInfo));
+    }
+
+    /**
+     * 修改仓库基础信息
+     */
+    @RequiresPermissions("wms:WarehouseInfo:edit")
+    @Log(title = "仓库基础信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody WarehouseInfo warehouseInfo) {
+        return toAjax(warehouseInfoService.updateWarehouseInfo(warehouseInfo));
+    }
+
+    /**
+     * 删除仓库基础信息
+     */
+    @RequiresPermissions("wms:WarehouseInfo:remove")
+    @Log(title = "仓库基础信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{whsCds}")
+    public AjaxResult remove(@PathVariable String[] whsCds) {
+        return toAjax(warehouseInfoService.deleteWarehouseInfoByWhsCds(whsCds));
+    }
+}

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/GoodsType.java

@@ -0,0 +1,149 @@
+package com.ruoyi.wms.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.ExtBaseEntity;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * This class was generated by MyBatis Generator.
+ *
+ * <ul>
+ *   <li> Table: WMS_M_GOODS_TYPE_INFO </li>
+ *   <li> Remarks: 物品类型表 </li>
+ * </ul>
+ *
+ * @author ryas
+ * created on 2024-02-18
+ */
+public class GoodsType extends ExtBaseEntity implements Serializable {
+    /**
+     *   物品类型编码
+     */
+    @Excel(name = "物品类型编码")
+    private String goodsTypeCd;
+
+    /**
+     *   从属部门ID
+     */
+    private Integer deptId;
+
+    /**
+     *   物品类型名称
+     */
+    @Excel(name = "物品类型名称")
+    private String goodsTypeName;
+
+    /**
+     *   备注1
+     */
+    @Excel(name = "备注")
+    private String remark1;
+
+    /**
+     *   备注2
+     */
+    private String remark2;
+
+    /**
+     *   备注3
+     */
+    private String remark3;
+
+    /**
+     *   备注4
+     */
+    private String remark4;
+
+    /**
+     *   备注5
+     */
+    private String remark5;
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    public String getGoodsTypeCd() {
+        return goodsTypeCd;
+    }
+
+    public void setGoodsTypeCd(String goodsTypeCd) {
+        this.goodsTypeCd = goodsTypeCd == null ? null : goodsTypeCd.trim();
+    }
+
+    public Integer getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Integer deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getGoodsTypeName() {
+        return goodsTypeName;
+    }
+
+    public void setGoodsTypeName(String goodsTypeName) {
+        this.goodsTypeName = goodsTypeName == null ? null : goodsTypeName.trim();
+    }
+
+    public String getRemark1() {
+        return remark1;
+    }
+
+    public void setRemark1(String remark1) {
+        this.remark1 = remark1 == null ? null : remark1.trim();
+    }
+
+    public String getRemark2() {
+        return remark2;
+    }
+
+    public void setRemark2(String remark2) {
+        this.remark2 = remark2 == null ? null : remark2.trim();
+    }
+
+    public String getRemark3() {
+        return remark3;
+    }
+
+    public void setRemark3(String remark3) {
+        this.remark3 = remark3 == null ? null : remark3.trim();
+    }
+
+    public String getRemark4() {
+        return remark4;
+    }
+
+    public void setRemark4(String remark4) {
+        this.remark4 = remark4 == null ? null : remark4.trim();
+    }
+
+    public String getRemark5() {
+        return remark5;
+    }
+
+    public void setRemark5(String remark5) {
+        this.remark5 = remark5 == null ? null : remark5.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", goodsTypeCd=").append(goodsTypeCd);
+        sb.append(", deptId=").append(deptId);
+        sb.append(", goodsTypeName=").append(goodsTypeName);
+        sb.append(", remark1=").append(remark1);
+        sb.append(", remark2=").append(remark2);
+        sb.append(", remark3=").append(remark3);
+        sb.append(", remark4=").append(remark4);
+        sb.append(", remark5=").append(remark5);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/UnitInfo.java

@@ -1,147 +1,138 @@
 package com.ruoyi.wms.domain;
 
+import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.ExtBaseEntity;
-import jakarta.annotation.Generated;
 import java.io.Serializable;
 
 /**
- * Database Table Remarks:
- *   单位基础信息表
- *
  * This class was generated by MyBatis Generator.
- * This class corresponds to the database table SF_WMS_M_UNIT_INFO
+ *
+ * <ul>
+ *   <li> Table: WMS_M_UNIT_INFO </li>
+ *   <li> Remarks: 单位基础信息表 </li>
+ * </ul>
+ *
+ * @author ryas
+ * created on 2024-02-18
  */
 public class UnitInfo extends ExtBaseEntity implements Serializable {
     /**
-     * Database Column Remarks:
      *   单位代码
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.UNIT_CODE")
+    @Excel(name = "单位代码")
     private String unitCode;
 
     /**
-     * Database Column Remarks:
+     *   从属部门ID
+     */
+    private Integer deptId;
+
+    /**
      *   单位名称
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.UNIT_NAME")
+    @Excel(name = "单位名称")
     private String unitName;
 
     /**
-     * Database Column Remarks:
      *   备注1
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_1")
+    @Excel(name = "备注")
     private String remark1;
 
     /**
-     * Database Column Remarks:
      *   备注2
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_2")
     private String remark2;
 
     /**
-     * Database Column Remarks:
      *   备注3
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_3")
     private String remark3;
 
     /**
-     * Database Column Remarks:
      *   备注4
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_4")
     private String remark4;
 
     /**
-     * Database Column Remarks:
      *   备注5
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_5")
     private String remark5;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     private static final long serialVersionUID = 1L;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.UNIT_CODE")
     public String getUnitCode() {
         return unitCode;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.UNIT_CODE")
     public void setUnitCode(String unitCode) {
         this.unitCode = unitCode == null ? null : unitCode.trim();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.UNIT_NAME")
+    public Integer getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Integer deptId) {
+        this.deptId = deptId;
+    }
+
     public String getUnitName() {
         return unitName;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.UNIT_NAME")
     public void setUnitName(String unitName) {
         this.unitName = unitName == null ? null : unitName.trim();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_1")
     public String getRemark1() {
         return remark1;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_1")
     public void setRemark1(String remark1) {
         this.remark1 = remark1 == null ? null : remark1.trim();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_2")
     public String getRemark2() {
         return remark2;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_2")
     public void setRemark2(String remark2) {
         this.remark2 = remark2 == null ? null : remark2.trim();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_3")
     public String getRemark3() {
         return remark3;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_3")
     public void setRemark3(String remark3) {
         this.remark3 = remark3 == null ? null : remark3.trim();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_4")
     public String getRemark4() {
         return remark4;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_4")
     public void setRemark4(String remark4) {
         this.remark4 = remark4 == null ? null : remark4.trim();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_5")
     public String getRemark5() {
         return remark5;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_5")
     public void setRemark5(String remark5) {
         this.remark5 = remark5 == null ? null : remark5.trim();
     }
 
     @Override
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(getClass().getSimpleName());
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", unitCode=").append(unitCode);
+        sb.append(", deptId=").append(deptId);
         sb.append(", unitName=").append(unitName);
         sb.append(", remark1=").append(remark1);
         sb.append(", remark2=").append(remark2);

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/WarehouseInfo.java

@@ -0,0 +1,328 @@
+package com.ruoyi.wms.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.ExtBaseEntity;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * This class was generated by MyBatis Generator.
+ *
+ * <ul>
+ *   <li> Table: WMS_M_WAREHOUSE_INFO </li>
+ *   <li> Remarks: 仓库基础信息表 </li>
+ * </ul>
+ *
+ * @author ryas
+ * created on 2024-02-18
+ */
+public class WarehouseInfo extends ExtBaseEntity implements Serializable {
+    /**
+     * 仓库代码
+     */
+    @Excel(name = "仓库代码")
+    private String whsCd;
+
+    /**
+     * 从属部门ID
+     */
+    private Integer deptId;
+
+    /**
+     * 仓库名称
+     */
+    @Excel(name = "仓库名称")
+    private String whsName;
+
+    /**
+     * 仓库类型代码
+     */
+    private String whsTypeCd;
+
+    /**
+     * 缩写
+     */
+    @Excel(name = "缩写")
+    private String abbr;
+
+    /**
+     * 地址1
+     */
+    @Excel(name = "地址1")
+    private String addr1;
+
+    /**
+     * 地址2
+     */
+    @Excel(name = "地址2")
+    private String addr2;
+
+    /**
+     * 地址3
+     */
+    @Excel(name = "地址3")
+    private String addr3;
+
+    /**
+     * 联系电话
+     */
+    @Excel(name = "联系电话")
+    private String phoneNo;
+
+    /**
+     * 邮编
+     */
+    @Excel(name = "邮编")
+    private String zipCd;
+
+    /**
+     * 联系邮箱
+     */
+    @Excel(name = "联系邮箱")
+    private String email;
+
+    /**
+     * 传真号
+     */
+    @Excel(name = "传真号")
+    private String faxNo;
+
+    /**
+     * 负责人
+     */
+    @Excel(name = "负责人")
+    private String respPerson;
+
+    /**
+     * 区域
+     */
+    @Excel(name = "区域")
+    private String area;
+
+    /**
+     * 租赁费用
+     */
+    @Excel(name = "租赁费用")
+    private BigDecimal rentalFee;
+
+    /**
+     * 存储费用
+     */
+    @Excel(name = "存储费用")
+    private BigDecimal storingFee;
+
+    private String remark1;
+
+    private String remark2;
+
+    private String remark3;
+
+    private String remark4;
+
+    private String remark5;
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    public String getWhsCd() {
+        return whsCd;
+    }
+
+    public void setWhsCd(String whsCd) {
+        this.whsCd = whsCd == null ? null : whsCd.trim();
+    }
+
+    public Integer getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Integer deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getWhsName() {
+        return whsName;
+    }
+
+    public void setWhsName(String whsName) {
+        this.whsName = whsName == null ? null : whsName.trim();
+    }
+
+    public String getWhsTypeCd() {
+        return whsTypeCd;
+    }
+
+    public void setWhsTypeCd(String whsTypeCd) {
+        this.whsTypeCd = whsTypeCd == null ? null : whsTypeCd.trim();
+    }
+
+    public String getAbbr() {
+        return abbr;
+    }
+
+    public void setAbbr(String abbr) {
+        this.abbr = abbr == null ? null : abbr.trim();
+    }
+
+    public String getAddr1() {
+        return addr1;
+    }
+
+    public void setAddr1(String addr1) {
+        this.addr1 = addr1 == null ? null : addr1.trim();
+    }
+
+    public String getAddr2() {
+        return addr2;
+    }
+
+    public void setAddr2(String addr2) {
+        this.addr2 = addr2 == null ? null : addr2.trim();
+    }
+
+    public String getAddr3() {
+        return addr3;
+    }
+
+    public void setAddr3(String addr3) {
+        this.addr3 = addr3 == null ? null : addr3.trim();
+    }
+
+    public String getPhoneNo() {
+        return phoneNo;
+    }
+
+    public void setPhoneNo(String phoneNo) {
+        this.phoneNo = phoneNo == null ? null : phoneNo.trim();
+    }
+
+    public String getZipCd() {
+        return zipCd;
+    }
+
+    public void setZipCd(String zipCd) {
+        this.zipCd = zipCd == null ? null : zipCd.trim();
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email == null ? null : email.trim();
+    }
+
+    public String getFaxNo() {
+        return faxNo;
+    }
+
+    public void setFaxNo(String faxNo) {
+        this.faxNo = faxNo == null ? null : faxNo.trim();
+    }
+
+    public String getRespPerson() {
+        return respPerson;
+    }
+
+    public void setRespPerson(String respPerson) {
+        this.respPerson = respPerson == null ? null : respPerson.trim();
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area == null ? null : area.trim();
+    }
+
+    public BigDecimal getRentalFee() {
+        return rentalFee;
+    }
+
+    public void setRentalFee(BigDecimal rentalFee) {
+        this.rentalFee = rentalFee;
+    }
+
+    public BigDecimal getStoringFee() {
+        return storingFee;
+    }
+
+    public void setStoringFee(BigDecimal storingFee) {
+        this.storingFee = storingFee;
+    }
+
+    public String getRemark1() {
+        return remark1;
+    }
+
+    public void setRemark1(String remark1) {
+        this.remark1 = remark1 == null ? null : remark1.trim();
+    }
+
+    public String getRemark2() {
+        return remark2;
+    }
+
+    public void setRemark2(String remark2) {
+        this.remark2 = remark2 == null ? null : remark2.trim();
+    }
+
+    public String getRemark3() {
+        return remark3;
+    }
+
+    public void setRemark3(String remark3) {
+        this.remark3 = remark3 == null ? null : remark3.trim();
+    }
+
+    public String getRemark4() {
+        return remark4;
+    }
+
+    public void setRemark4(String remark4) {
+        this.remark4 = remark4 == null ? null : remark4.trim();
+    }
+
+    public String getRemark5() {
+        return remark5;
+    }
+
+    public void setRemark5(String remark5) {
+        this.remark5 = remark5 == null ? null : remark5.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", whsCd=").append(whsCd);
+        sb.append(", deptId=").append(deptId);
+        sb.append(", whsName=").append(whsName);
+        sb.append(", whsTypeCd=").append(whsTypeCd);
+        sb.append(", abbr=").append(abbr);
+        sb.append(", addr1=").append(addr1);
+        sb.append(", addr2=").append(addr2);
+        sb.append(", addr3=").append(addr3);
+        sb.append(", phoneNo=").append(phoneNo);
+        sb.append(", zipCd=").append(zipCd);
+        sb.append(", email=").append(email);
+        sb.append(", faxNo=").append(faxNo);
+        sb.append(", respPerson=").append(respPerson);
+        sb.append(", area=").append(area);
+        sb.append(", rentalFee=").append(rentalFee);
+        sb.append(", storingFee=").append(storingFee);
+        sb.append(", remark1=").append(remark1);
+        sb.append(", remark2=").append(remark2);
+        sb.append(", remark3=").append(remark3);
+        sb.append(", remark4=").append(remark4);
+        sb.append(", remark5=").append(remark5);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/GoodsTypeDynamicSqlSupport.java

@@ -0,0 +1,121 @@
+package com.ruoyi.wms.mapper;
+
+import java.sql.JDBCType;
+import java.util.Date;
+import org.mybatis.dynamic.sql.AliasableSqlTable;
+import org.mybatis.dynamic.sql.SqlColumn;
+
+public final class GoodsTypeDynamicSqlSupport {
+    public static final GoodsType goodsType = new GoodsType();
+
+    /**
+     *   物品类型编码
+     */
+    public static final SqlColumn<String> goodsTypeCd = goodsType.goodsTypeCd;
+
+    /**
+     *   从属部门ID
+     */
+    public static final SqlColumn<Integer> deptId = goodsType.deptId;
+
+    /**
+     *   物品类型名称
+     */
+    public static final SqlColumn<String> goodsTypeName = goodsType.goodsTypeName;
+
+    /**
+     *   备注1
+     */
+    public static final SqlColumn<String> remark1 = goodsType.remark1;
+
+    /**
+     *   备注2
+     */
+    public static final SqlColumn<String> remark2 = goodsType.remark2;
+
+    /**
+     *   备注3
+     */
+    public static final SqlColumn<String> remark3 = goodsType.remark3;
+
+    /**
+     *   备注4
+     */
+    public static final SqlColumn<String> remark4 = goodsType.remark4;
+
+    /**
+     *   备注5
+     */
+    public static final SqlColumn<String> remark5 = goodsType.remark5;
+
+    /**
+     *   更新次数
+     */
+    public static final SqlColumn<Integer> updateCount = goodsType.updateCount;
+
+    /**
+     *   更新次数
+     */
+    public static final SqlColumn<Integer> deleteFlag = goodsType.deleteFlag;
+
+    /**
+     *   创建者
+     */
+    public static final SqlColumn<String> createBy = goodsType.createBy;
+
+    /**
+     *   创建时间
+     */
+    public static final SqlColumn<Date> createTime = goodsType.createTime;
+
+    /**
+     *   更新者
+     */
+    public static final SqlColumn<String> updateBy = goodsType.updateBy;
+
+    /**
+     *   更新时间
+     */
+    public static final SqlColumn<Date> updateTime = goodsType.updateTime;
+
+    /**
+     *   备注
+     */
+    public static final SqlColumn<String> remark = goodsType.remark;
+
+    public static final class GoodsType extends AliasableSqlTable<GoodsType> {
+        public final SqlColumn<String> goodsTypeCd = column("GOODS_TYPE_CD", JDBCType.VARCHAR);
+
+        public final SqlColumn<Integer> deptId = column("DEPT_ID", JDBCType.INTEGER);
+
+        public final SqlColumn<String> goodsTypeName = column("GOODS_TYPE_NAME", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> remark1 = column("REMARK_1", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> remark2 = column("REMARK_2", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> remark3 = column("REMARK_3", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> remark4 = column("REMARK_4", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> remark5 = column("REMARK_5", JDBCType.VARCHAR);
+
+        public final SqlColumn<Integer> updateCount = column("UPDATE_COUNT", JDBCType.INTEGER);
+
+        public final SqlColumn<Integer> deleteFlag = column("DELETE_FLAG", JDBCType.INTEGER);
+
+        public final SqlColumn<String> createBy = column("create_by", JDBCType.VARCHAR);
+
+        public final SqlColumn<Date> createTime = column("create_time", JDBCType.TIMESTAMP);
+
+        public final SqlColumn<String> updateBy = column("update_by", JDBCType.VARCHAR);
+
+        public final SqlColumn<Date> updateTime = column("update_time", JDBCType.TIMESTAMP);
+
+        public final SqlColumn<String> remark = column("remark", JDBCType.VARCHAR);
+
+        public GoodsType() {
+            super("WMS_M_GOODS_TYPE_INFO", GoodsType::new);
+        }
+    }
+}

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/GoodsTypeMapper.java

@@ -0,0 +1,231 @@
+package com.ruoyi.wms.mapper;
+
+import com.ruoyi.common.security.utils.SecurityUtilsExt;
+import com.ruoyi.wms.domain.GoodsType;
+import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.type.JdbcType;
+import org.mybatis.dynamic.sql.BasicColumn;
+import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
+import org.mybatis.dynamic.sql.select.CountDSLCompleter;
+import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
+import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
+import org.mybatis.dynamic.sql.update.UpdateDSL;
+import org.mybatis.dynamic.sql.update.UpdateDSLCompleter;
+import org.mybatis.dynamic.sql.update.UpdateModel;
+import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
+import org.mybatis.dynamic.sql.util.mybatis3.*;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+import static com.ruoyi.wms.mapper.GoodsTypeDynamicSqlSupport.*;
+import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
+
+@Mapper
+public interface GoodsTypeMapper extends CommonCountMapper, CommonDeleteMapper, CommonInsertMapper<GoodsType>, CommonUpdateMapper {
+    BasicColumn[] selectList = BasicColumn.columnList(goodsTypeCd, deptId, goodsTypeName, remark1, remark2, remark3, remark4, remark5, updateCount, deleteFlag, createBy, createTime, updateBy, updateTime, remark);
+
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @Results(id="GoodsTypeResult", value = {
+        @Result(column="GOODS_TYPE_CD", property="goodsTypeCd", jdbcType=JdbcType.VARCHAR, id=true),
+        @Result(column="DEPT_ID", property="deptId", jdbcType=JdbcType.INTEGER),
+        @Result(column="GOODS_TYPE_NAME", property="goodsTypeName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="REMARK_1", property="remark1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="REMARK_2", property="remark2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="REMARK_3", property="remark3", jdbcType=JdbcType.VARCHAR),
+        @Result(column="REMARK_4", property="remark4", jdbcType=JdbcType.VARCHAR),
+        @Result(column="REMARK_5", property="remark5", jdbcType=JdbcType.VARCHAR),
+        @Result(column="UPDATE_COUNT", property="updateCount", jdbcType=JdbcType.INTEGER),
+        @Result(column="DELETE_FLAG", property="deleteFlag", jdbcType=JdbcType.INTEGER),
+        @Result(column="create_by", property="createBy", jdbcType=JdbcType.VARCHAR),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="update_by", property="updateBy", jdbcType=JdbcType.VARCHAR),
+        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR)
+    })
+    List<GoodsType> selectMany(SelectStatementProvider selectStatement);
+
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @ResultMap("GoodsTypeResult")
+    Optional<GoodsType> selectOne(SelectStatementProvider selectStatement);
+
+    default long count(CountDSLCompleter completer) {
+        return MyBatis3Utils.countFrom(this::count, goodsType, completer);
+    }
+
+    default int delete(DeleteDSLCompleter completer) {
+        return MyBatis3Utils.deleteFrom(this::delete, goodsType, completer);
+    }
+
+    default int deleteByPrimaryKey(String goodsTypeCd_) {
+        return delete(c -> 
+            c.where(goodsTypeCd, isEqualTo(goodsTypeCd_))
+        );
+    }
+
+    default int insert(GoodsType row) {
+        row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
+        return MyBatis3Utils.insert(this::insert, row, goodsType, c ->
+            c.map(goodsTypeCd).toProperty("goodsTypeCd")
+            .map(deptId).toProperty("deptId")
+            .map(goodsTypeName).toProperty("goodsTypeName")
+            .map(remark1).toProperty("remark1")
+            .map(remark2).toProperty("remark2")
+            .map(remark3).toProperty("remark3")
+            .map(remark4).toProperty("remark4")
+            .map(remark5).toProperty("remark5")
+            .map(updateCount).toProperty("updateCount")
+            .map(deleteFlag).toProperty("deleteFlag")
+            .map(createBy).toProperty("createBy")
+            .map(createTime).toProperty("createTime")
+            .map(updateBy).toProperty("updateBy")
+            .map(updateTime).toProperty("updateTime")
+            .map(remark).toProperty("remark")
+        );
+    }
+
+    default int insertMultiple(Collection<GoodsType> records) {
+        for (GoodsType row : records) {
+            row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
+        }
+        return MyBatis3Utils.insertMultiple(this::insertMultiple, records, goodsType, c ->
+            c.map(goodsTypeCd).toProperty("goodsTypeCd")
+            .map(deptId).toProperty("deptId")
+            .map(goodsTypeName).toProperty("goodsTypeName")
+            .map(remark1).toProperty("remark1")
+            .map(remark2).toProperty("remark2")
+            .map(remark3).toProperty("remark3")
+            .map(remark4).toProperty("remark4")
+            .map(remark5).toProperty("remark5")
+            .map(updateCount).toProperty("updateCount")
+            .map(deleteFlag).toProperty("deleteFlag")
+            .map(createBy).toProperty("createBy")
+            .map(createTime).toProperty("createTime")
+            .map(updateBy).toProperty("updateBy")
+            .map(updateTime).toProperty("updateTime")
+            .map(remark).toProperty("remark")
+        );
+    }
+
+    default int insertSelective(GoodsType row) {
+        row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
+        return MyBatis3Utils.insert(this::insert, row, goodsType, c ->
+            c.map(goodsTypeCd).toPropertyWhenPresent("goodsTypeCd", row::getGoodsTypeCd)
+            .map(deptId).toPropertyWhenPresent("deptId", row::getDeptId)
+            .map(goodsTypeName).toPropertyWhenPresent("goodsTypeName", row::getGoodsTypeName)
+            .map(remark1).toPropertyWhenPresent("remark1", row::getRemark1)
+            .map(remark2).toPropertyWhenPresent("remark2", row::getRemark2)
+            .map(remark3).toPropertyWhenPresent("remark3", row::getRemark3)
+            .map(remark4).toPropertyWhenPresent("remark4", row::getRemark4)
+            .map(remark5).toPropertyWhenPresent("remark5", row::getRemark5)
+            .map(updateCount).toPropertyWhenPresent("updateCount", row::getUpdateCount)
+            .map(deleteFlag).toPropertyWhenPresent("deleteFlag", row::getDeleteFlag)
+            .map(createBy).toPropertyWhenPresent("createBy", row::getCreateBy)
+            .map(createTime).toPropertyWhenPresent("createTime", row::getCreateTime)
+            .map(updateBy).toPropertyWhenPresent("updateBy", row::getUpdateBy)
+            .map(updateTime).toPropertyWhenPresent("updateTime", row::getUpdateTime)
+            .map(remark).toPropertyWhenPresent("remark", row::getRemark)
+        );
+    }
+
+    default Optional<GoodsType> selectOne(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectOne(this::selectOne, selectList, goodsType, completer);
+    }
+
+    default List<GoodsType> select(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectList(this::selectMany, selectList, goodsType, completer);
+    }
+
+    default List<GoodsType> selectDistinct(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectDistinct(this::selectMany, selectList, goodsType, completer);
+    }
+
+    default Optional<GoodsType> selectByPrimaryKey(String goodsTypeCd_) {
+        return selectOne(c ->
+            c.where(goodsTypeCd, isEqualTo(goodsTypeCd_))
+        );
+    }
+
+    default int update(UpdateDSLCompleter completer) {
+        return MyBatis3Utils.update(this::update, goodsType, completer);
+    }
+
+    static UpdateDSL<UpdateModel> updateAllColumns(GoodsType row, UpdateDSL<UpdateModel> dsl) {
+        return dsl.set(goodsTypeCd).equalTo(row::getGoodsTypeCd)
+                .set(deptId).equalTo(row::getDeptId)
+                .set(goodsTypeName).equalTo(row::getGoodsTypeName)
+                .set(remark1).equalTo(row::getRemark1)
+                .set(remark2).equalTo(row::getRemark2)
+                .set(remark3).equalTo(row::getRemark3)
+                .set(remark4).equalTo(row::getRemark4)
+                .set(remark5).equalTo(row::getRemark5)
+                .set(updateCount).equalTo(row::getUpdateCount)
+                .set(deleteFlag).equalTo(row::getDeleteFlag)
+                .set(createBy).equalTo(row::getCreateBy)
+                .set(createTime).equalTo(row::getCreateTime)
+                .set(updateBy).equalTo(row::getUpdateBy)
+                .set(updateTime).equalTo(row::getUpdateTime)
+                .set(remark).equalTo(row::getRemark);
+    }
+
+    static UpdateDSL<UpdateModel> updateSelectiveColumns(GoodsType row, UpdateDSL<UpdateModel> dsl) {
+        row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr());
+        return dsl.set(goodsTypeCd).equalToWhenPresent(row::getGoodsTypeCd)
+                .set(deptId).equalToWhenPresent(row::getDeptId)
+                .set(goodsTypeName).equalToWhenPresent(row::getGoodsTypeName)
+                .set(remark1).equalToWhenPresent(row::getRemark1)
+                .set(remark2).equalToWhenPresent(row::getRemark2)
+                .set(remark3).equalToWhenPresent(row::getRemark3)
+                .set(remark4).equalToWhenPresent(row::getRemark4)
+                .set(remark5).equalToWhenPresent(row::getRemark5)
+                .set(updateCount).equalToWhenPresent(row::getUpdateCount)
+                .set(deleteFlag).equalToWhenPresent(row::getDeleteFlag)
+                .set(createBy).equalToWhenPresent(row::getCreateBy)
+                .set(createTime).equalToWhenPresent(row::getCreateTime)
+                .set(updateBy).equalToWhenPresent(row::getUpdateBy)
+                .set(updateTime).equalToWhenPresent(row::getUpdateTime)
+                .set(remark).equalToWhenPresent(row::getRemark);
+    }
+
+    default int updateByPrimaryKey(GoodsType row) {
+        return update(c ->
+            c.set(deptId).equalTo(row::getDeptId)
+            .set(goodsTypeName).equalTo(row::getGoodsTypeName)
+            .set(remark1).equalTo(row::getRemark1)
+            .set(remark2).equalTo(row::getRemark2)
+            .set(remark3).equalTo(row::getRemark3)
+            .set(remark4).equalTo(row::getRemark4)
+            .set(remark5).equalTo(row::getRemark5)
+            .set(updateCount).equalTo(row::getUpdateCount)
+            .set(deleteFlag).equalTo(row::getDeleteFlag)
+            .set(createBy).equalTo(row::getCreateBy)
+            .set(createTime).equalTo(row::getCreateTime)
+            .set(updateBy).equalTo(row::getUpdateBy)
+            .set(updateTime).equalTo(row::getUpdateTime)
+            .set(remark).equalTo(row::getRemark)
+            .where(goodsTypeCd, isEqualTo(row::getGoodsTypeCd))
+        );
+    }
+
+    default int updateByPrimaryKeySelective(GoodsType row) {
+        row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr());
+        return update(c ->
+            c.set(deptId).equalToWhenPresent(row::getDeptId)
+            .set(goodsTypeName).equalToWhenPresent(row::getGoodsTypeName)
+            .set(remark1).equalToWhenPresent(row::getRemark1)
+            .set(remark2).equalToWhenPresent(row::getRemark2)
+            .set(remark3).equalToWhenPresent(row::getRemark3)
+            .set(remark4).equalToWhenPresent(row::getRemark4)
+            .set(remark5).equalToWhenPresent(row::getRemark5)
+            .set(updateCount).equalToWhenPresent(row::getUpdateCount)
+            .set(deleteFlag).equalToWhenPresent(row::getDeleteFlag)
+            .set(createBy).equalToWhenPresent(row::getCreateBy)
+            .set(createTime).equalToWhenPresent(row::getCreateTime)
+            .set(updateBy).equalToWhenPresent(row::getUpdateBy)
+            .set(updateTime).equalToWhenPresent(row::getUpdateTime)
+            .set(remark).equalToWhenPresent(row::getRemark)
+            .where(goodsTypeCd, isEqualTo(row::getGoodsTypeCd))
+        );
+    }
+}

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/UnitInfoDynamicSqlSupport.java

@@ -1,117 +1,94 @@
 package com.ruoyi.wms.mapper;
 
-import jakarta.annotation.Generated;
-import java.sql.JDBCType;
-import java.util.Date;
 import org.mybatis.dynamic.sql.AliasableSqlTable;
 import org.mybatis.dynamic.sql.SqlColumn;
 
+import java.sql.JDBCType;
+import java.util.Date;
+
 public final class UnitInfoDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     public static final UnitInfo unitInfo = new UnitInfo();
 
     /**
-     * Database Column Remarks:
      *   单位代码
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.UNIT_CODE")
     public static final SqlColumn<String> unitCode = unitInfo.unitCode;
 
     /**
-     * Database Column Remarks:
+     *   从属部门ID
+     */
+    public static final SqlColumn<Integer> deptId = unitInfo.deptId;
+
+    /**
      *   单位名称
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.UNIT_NAME")
     public static final SqlColumn<String> unitName = unitInfo.unitName;
 
     /**
-     * Database Column Remarks:
      *   备注1
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_1")
     public static final SqlColumn<String> remark1 = unitInfo.remark1;
 
     /**
-     * Database Column Remarks:
      *   备注2
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_2")
     public static final SqlColumn<String> remark2 = unitInfo.remark2;
 
     /**
-     * Database Column Remarks:
      *   备注3
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_3")
     public static final SqlColumn<String> remark3 = unitInfo.remark3;
 
     /**
-     * Database Column Remarks:
      *   备注4
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_4")
     public static final SqlColumn<String> remark4 = unitInfo.remark4;
 
     /**
-     * Database Column Remarks:
      *   备注5
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.REMARK_5")
     public static final SqlColumn<String> remark5 = unitInfo.remark5;
 
     /**
-     * Database Column Remarks:
      *   更新次数
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.UPDATE_COUNT")
     public static final SqlColumn<Integer> updateCount = unitInfo.updateCount;
 
     /**
-     * Database Column Remarks:
      *   删除标志
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.DELETE_FLAG")
     public static final SqlColumn<Integer> deleteFlag = unitInfo.deleteFlag;
 
     /**
-     * Database Column Remarks:
      *   创建者
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.create_by")
     public static final SqlColumn<String> createBy = unitInfo.createBy;
 
     /**
-     * Database Column Remarks:
      *   创建时间
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.create_time")
     public static final SqlColumn<Date> createTime = unitInfo.createTime;
 
     /**
-     * Database Column Remarks:
      *   更新者
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.update_by")
     public static final SqlColumn<String> updateBy = unitInfo.updateBy;
 
     /**
-     * Database Column Remarks:
      *   更新时间
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.update_time")
     public static final SqlColumn<Date> updateTime = unitInfo.updateTime;
 
     /**
-     * Database Column Remarks:
      *   备注
      */
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: SF_WMS_M_UNIT_INFO.remark")
     public static final SqlColumn<String> remark = unitInfo.remark;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     public static final class UnitInfo extends AliasableSqlTable<UnitInfo> {
         public final SqlColumn<String> unitCode = column("UNIT_CODE", JDBCType.VARCHAR);
 
+        public final SqlColumn<Integer> deptId = column("DEPT_ID", JDBCType.INTEGER);
+
         public final SqlColumn<String> unitName = column("UNIT_NAME", JDBCType.VARCHAR);
 
         public final SqlColumn<String> remark1 = column("REMARK_1", JDBCType.VARCHAR);
@@ -139,7 +116,7 @@ public final class UnitInfoDynamicSqlSupport {
         public final SqlColumn<String> remark = column("remark", JDBCType.VARCHAR);
 
         public UnitInfo() {
-            super("SF_WMS_M_UNIT_INFO", UnitInfo::new);
+            super("WMS_M_UNIT_INFO", UnitInfo::new);
         }
     }
 }

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/UnitInfoMapper.java

@@ -1,9 +1,18 @@
 package com.ruoyi.wms.mapper;
 
+import static com.ruoyi.wms.mapper.UnitInfoDynamicSqlSupport.*;
+import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
+
 import com.ruoyi.common.security.utils.SecurityUtilsExt;
 import com.ruoyi.wms.domain.UnitInfo;
-import jakarta.annotation.Generated;
-import org.apache.ibatis.annotations.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.type.JdbcType;
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
@@ -14,24 +23,20 @@ import org.mybatis.dynamic.sql.update.UpdateDSL;
 import org.mybatis.dynamic.sql.update.UpdateDSLCompleter;
 import org.mybatis.dynamic.sql.update.UpdateModel;
 import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
-import org.mybatis.dynamic.sql.util.mybatis3.*;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-
-import static com.ruoyi.wms.mapper.UnitInfoDynamicSqlSupport.*;
-import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonCountMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
 
 @Mapper
 public interface UnitInfoMapper extends CommonCountMapper, CommonDeleteMapper, CommonInsertMapper<UnitInfo>, CommonUpdateMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
-    BasicColumn[] selectList = BasicColumn.columnList(unitCode, unitName, remark1, remark2, remark3, remark4, remark5, updateCount, deleteFlag, createBy, createTime, updateBy, updateTime, remark);
+    BasicColumn[] selectList = BasicColumn.columnList(unitCode, deptId, unitName, remark1, remark2, remark3, remark4, remark5, updateCount, deleteFlag, createBy, createTime, updateBy, updateTime, remark);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @Results(id="UnitInfoResult", value = {
         @Result(column="UNIT_CODE", property="unitCode", jdbcType=JdbcType.VARCHAR, id=true),
+        @Result(column="DEPT_ID", property="deptId", jdbcType=JdbcType.INTEGER),
         @Result(column="UNIT_NAME", property="unitName", jdbcType=JdbcType.VARCHAR),
         @Result(column="REMARK_1", property="remark1", jdbcType=JdbcType.VARCHAR),
         @Result(column="REMARK_2", property="remark2", jdbcType=JdbcType.VARCHAR),
@@ -48,33 +53,29 @@ public interface UnitInfoMapper extends CommonCountMapper, CommonDeleteMapper, C
     })
     List<UnitInfo> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ResultMap("UnitInfoResult")
     Optional<UnitInfo> selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     default long count(CountDSLCompleter completer) {
         return MyBatis3Utils.countFrom(this::count, unitInfo, completer);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     default int delete(DeleteDSLCompleter completer) {
         return MyBatis3Utils.deleteFrom(this::delete, unitInfo, completer);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     default int deleteByPrimaryKey(String unitCode_) {
         return delete(c -> 
             c.where(unitCode, isEqualTo(unitCode_))
         );
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     default int insert(UnitInfo row) {
         row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
         return MyBatis3Utils.insert(this::insert, row, unitInfo, c ->
             c.map(unitCode).toProperty("unitCode")
+            .map(deptId).toProperty("deptId")
             .map(unitName).toProperty("unitName")
             .map(remark1).toProperty("remark1")
             .map(remark2).toProperty("remark2")
@@ -91,13 +92,13 @@ public interface UnitInfoMapper extends CommonCountMapper, CommonDeleteMapper, C
         );
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     default int insertMultiple(Collection<UnitInfo> records) {
         for (UnitInfo row : records) {
             row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
         }
         return MyBatis3Utils.insertMultiple(this::insertMultiple, records, unitInfo, c ->
             c.map(unitCode).toProperty("unitCode")
+            .map(deptId).toProperty("deptId")
             .map(unitName).toProperty("unitName")
             .map(remark1).toProperty("remark1")
             .map(remark2).toProperty("remark2")
@@ -114,11 +115,11 @@ public interface UnitInfoMapper extends CommonCountMapper, CommonDeleteMapper, C
         );
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     default int insertSelective(UnitInfo row) {
         row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
         return MyBatis3Utils.insert(this::insert, row, unitInfo, c ->
             c.map(unitCode).toPropertyWhenPresent("unitCode", row::getUnitCode)
+            .map(deptId).toPropertyWhenPresent("deptId", row::getDeptId)
             .map(unitName).toPropertyWhenPresent("unitName", row::getUnitName)
             .map(remark1).toPropertyWhenPresent("remark1", row::getRemark1)
             .map(remark2).toPropertyWhenPresent("remark2", row::getRemark2)
@@ -135,36 +136,31 @@ public interface UnitInfoMapper extends CommonCountMapper, CommonDeleteMapper, C
         );
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     default Optional<UnitInfo> selectOne(SelectDSLCompleter completer) {
         return MyBatis3Utils.selectOne(this::selectOne, selectList, unitInfo, completer);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     default List<UnitInfo> select(SelectDSLCompleter completer) {
         return MyBatis3Utils.selectList(this::selectMany, selectList, unitInfo, completer);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     default List<UnitInfo> selectDistinct(SelectDSLCompleter completer) {
         return MyBatis3Utils.selectDistinct(this::selectMany, selectList, unitInfo, completer);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     default Optional<UnitInfo> selectByPrimaryKey(String unitCode_) {
         return selectOne(c ->
             c.where(unitCode, isEqualTo(unitCode_))
         );
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     default int update(UpdateDSLCompleter completer) {
         return MyBatis3Utils.update(this::update, unitInfo, completer);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     static UpdateDSL<UpdateModel> updateAllColumns(UnitInfo row, UpdateDSL<UpdateModel> dsl) {
         return dsl.set(unitCode).equalTo(row::getUnitCode)
+                .set(deptId).equalTo(row::getDeptId)
                 .set(unitName).equalTo(row::getUnitName)
                 .set(remark1).equalTo(row::getRemark1)
                 .set(remark2).equalTo(row::getRemark2)
@@ -180,10 +176,10 @@ public interface UnitInfoMapper extends CommonCountMapper, CommonDeleteMapper, C
                 .set(remark).equalTo(row::getRemark);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     static UpdateDSL<UpdateModel> updateSelectiveColumns(UnitInfo row, UpdateDSL<UpdateModel> dsl) {
         row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr());
         return dsl.set(unitCode).equalToWhenPresent(row::getUnitCode)
+                .set(deptId).equalToWhenPresent(row::getDeptId)
                 .set(unitName).equalToWhenPresent(row::getUnitName)
                 .set(remark1).equalToWhenPresent(row::getRemark1)
                 .set(remark2).equalToWhenPresent(row::getRemark2)
@@ -199,10 +195,10 @@ public interface UnitInfoMapper extends CommonCountMapper, CommonDeleteMapper, C
                 .set(remark).equalToWhenPresent(row::getRemark);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     default int updateByPrimaryKey(UnitInfo row) {
         return update(c ->
-            c.set(unitName).equalTo(row::getUnitName)
+            c.set(deptId).equalTo(row::getDeptId)
+            .set(unitName).equalTo(row::getUnitName)
             .set(remark1).equalTo(row::getRemark1)
             .set(remark2).equalTo(row::getRemark2)
             .set(remark3).equalTo(row::getRemark3)
@@ -219,11 +215,11 @@ public interface UnitInfoMapper extends CommonCountMapper, CommonDeleteMapper, C
         );
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: SF_WMS_M_UNIT_INFO")
     default int updateByPrimaryKeySelective(UnitInfo row) {
         row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr());
         return update(c ->
-            c.set(unitName).equalToWhenPresent(row::getUnitName)
+            c.set(deptId).equalToWhenPresent(row::getDeptId)
+            .set(unitName).equalToWhenPresent(row::getUnitName)
             .set(remark1).equalToWhenPresent(row::getRemark1)
             .set(remark2).equalToWhenPresent(row::getRemark2)
             .set(remark3).equalToWhenPresent(row::getRemark3)

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/WarehouseInfoDynamicSqlSupport.java

@@ -0,0 +1,198 @@
+package com.ruoyi.wms.mapper;
+
+import java.math.BigDecimal;
+import java.sql.JDBCType;
+import java.util.Date;
+import org.mybatis.dynamic.sql.AliasableSqlTable;
+import org.mybatis.dynamic.sql.SqlColumn;
+
+public final class WarehouseInfoDynamicSqlSupport {
+    public static final WarehouseInfo warehouseInfo = new WarehouseInfo();
+
+    /**
+     *   仓库代码
+     */
+    public static final SqlColumn<String> whsCd = warehouseInfo.whsCd;
+
+    /**
+     *   从属部门ID
+     */
+    public static final SqlColumn<Integer> deptId = warehouseInfo.deptId;
+
+    /**
+     *   仓库名称
+     */
+    public static final SqlColumn<String> whsName = warehouseInfo.whsName;
+
+    /**
+     *   仓库类型代码
+     */
+    public static final SqlColumn<String> whsTypeCd = warehouseInfo.whsTypeCd;
+
+    /**
+     *   缩写
+     */
+    public static final SqlColumn<String> abbr = warehouseInfo.abbr;
+
+    /**
+     *   地址1
+     */
+    public static final SqlColumn<String> addr1 = warehouseInfo.addr1;
+
+    /**
+     *   地址2
+     */
+    public static final SqlColumn<String> addr2 = warehouseInfo.addr2;
+
+    /**
+     *   地址3
+     */
+    public static final SqlColumn<String> addr3 = warehouseInfo.addr3;
+
+    /**
+     *   联系电话
+     */
+    public static final SqlColumn<String> phoneNo = warehouseInfo.phoneNo;
+
+    /**
+     *   邮编
+     */
+    public static final SqlColumn<String> zipCd = warehouseInfo.zipCd;
+
+    /**
+     *   联系邮箱
+     */
+    public static final SqlColumn<String> email = warehouseInfo.email;
+
+    /**
+     *   传真号
+     */
+    public static final SqlColumn<String> faxNo = warehouseInfo.faxNo;
+
+    /**
+     *   负责人
+     */
+    public static final SqlColumn<String> respPerson = warehouseInfo.respPerson;
+
+    /**
+     *   区域
+     */
+    public static final SqlColumn<String> area = warehouseInfo.area;
+
+    /**
+     *   租赁费用
+     */
+    public static final SqlColumn<BigDecimal> rentalFee = warehouseInfo.rentalFee;
+
+    /**
+     *   存储费用
+     */
+    public static final SqlColumn<BigDecimal> storingFee = warehouseInfo.storingFee;
+
+    public static final SqlColumn<String> remark1 = warehouseInfo.remark1;
+
+    public static final SqlColumn<String> remark2 = warehouseInfo.remark2;
+
+    public static final SqlColumn<String> remark3 = warehouseInfo.remark3;
+
+    public static final SqlColumn<String> remark4 = warehouseInfo.remark4;
+
+    public static final SqlColumn<String> remark5 = warehouseInfo.remark5;
+
+    /**
+     *   更新次数
+     */
+    public static final SqlColumn<Integer> updateCount = warehouseInfo.updateCount;
+
+    /**
+     *   删除标志
+     */
+    public static final SqlColumn<Integer> deleteFlag = warehouseInfo.deleteFlag;
+
+    /**
+     *   创建者
+     */
+    public static final SqlColumn<String> createBy = warehouseInfo.createBy;
+
+    /**
+     *   创建时间
+     */
+    public static final SqlColumn<Date> createTime = warehouseInfo.createTime;
+
+    /**
+     *   更新者
+     */
+    public static final SqlColumn<String> updateBy = warehouseInfo.updateBy;
+
+    /**
+     *   更新时间
+     */
+    public static final SqlColumn<Date> updateTime = warehouseInfo.updateTime;
+
+    /**
+     *   备注
+     */
+    public static final SqlColumn<String> remark = warehouseInfo.remark;
+
+    public static final class WarehouseInfo extends AliasableSqlTable<WarehouseInfo> {
+        public final SqlColumn<String> whsCd = column("WHS_CD", JDBCType.VARCHAR);
+
+        public final SqlColumn<Integer> deptId = column("DEPT_ID", JDBCType.INTEGER);
+
+        public final SqlColumn<String> whsName = column("WHS_NAME", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> whsTypeCd = column("WHS_TYPE_CD", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> abbr = column("ABBR", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> addr1 = column("ADDR_1", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> addr2 = column("ADDR_2", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> addr3 = column("ADDR_3", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> phoneNo = column("PHONE_NO", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> zipCd = column("ZIP_CD", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> email = column("EMAIL", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> faxNo = column("FAX_NO", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> respPerson = column("RESP_PERSON", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> area = column("AREA", JDBCType.VARCHAR);
+
+        public final SqlColumn<BigDecimal> rentalFee = column("RENTAL_FEE", JDBCType.DECIMAL);
+
+        public final SqlColumn<BigDecimal> storingFee = column("STORING_FEE", JDBCType.DECIMAL);
+
+        public final SqlColumn<String> remark1 = column("REMARK_1", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> remark2 = column("REMARK_2", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> remark3 = column("REMARK_3", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> remark4 = column("REMARK_4", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> remark5 = column("REMARK_5", JDBCType.VARCHAR);
+
+        public final SqlColumn<Integer> updateCount = column("UPDATE_COUNT", JDBCType.INTEGER);
+
+        public final SqlColumn<Integer> deleteFlag = column("DELETE_FLAG", JDBCType.INTEGER);
+
+        public final SqlColumn<String> createBy = column("create_by", JDBCType.VARCHAR);
+
+        public final SqlColumn<Date> createTime = column("create_time", JDBCType.TIMESTAMP);
+
+        public final SqlColumn<String> updateBy = column("update_by", JDBCType.VARCHAR);
+
+        public final SqlColumn<Date> updateTime = column("update_time", JDBCType.TIMESTAMP);
+
+        public final SqlColumn<String> remark = column("remark", JDBCType.VARCHAR);
+
+        public WarehouseInfo() {
+            super("WMS_M_WAREHOUSE_INFO", WarehouseInfo::new);
+        }
+    }
+}

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/WarehouseInfoMapper.java

@@ -0,0 +1,335 @@
+package com.ruoyi.wms.mapper;
+
+import com.ruoyi.common.security.utils.SecurityUtilsExt;
+import com.ruoyi.wms.domain.WarehouseInfo;
+import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.type.JdbcType;
+import org.mybatis.dynamic.sql.BasicColumn;
+import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
+import org.mybatis.dynamic.sql.select.CountDSLCompleter;
+import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
+import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
+import org.mybatis.dynamic.sql.update.UpdateDSL;
+import org.mybatis.dynamic.sql.update.UpdateDSLCompleter;
+import org.mybatis.dynamic.sql.update.UpdateModel;
+import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
+import org.mybatis.dynamic.sql.util.mybatis3.*;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+import static com.ruoyi.wms.mapper.WarehouseInfoDynamicSqlSupport.*;
+import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
+
+@Mapper
+public interface WarehouseInfoMapper extends CommonCountMapper, CommonDeleteMapper, CommonInsertMapper<WarehouseInfo>, CommonUpdateMapper {
+    BasicColumn[] selectList = BasicColumn.columnList(whsCd, deptId, whsName, whsTypeCd, abbr, addr1, addr2, addr3, phoneNo, zipCd, email, faxNo, respPerson, area, rentalFee, storingFee, remark1, remark2, remark3, remark4, remark5, updateCount, deleteFlag, createBy, createTime, updateBy, updateTime, remark);
+
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @Results(id="WarehouseInfoResult", value = {
+        @Result(column="WHS_CD", property="whsCd", jdbcType=JdbcType.VARCHAR, id=true),
+        @Result(column="DEPT_ID", property="deptId", jdbcType=JdbcType.INTEGER),
+        @Result(column="WHS_NAME", property="whsName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="WHS_TYPE_CD", property="whsTypeCd", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ABBR", property="abbr", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ADDR_1", property="addr1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ADDR_2", property="addr2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ADDR_3", property="addr3", jdbcType=JdbcType.VARCHAR),
+        @Result(column="PHONE_NO", property="phoneNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ZIP_CD", property="zipCd", jdbcType=JdbcType.VARCHAR),
+        @Result(column="EMAIL", property="email", jdbcType=JdbcType.VARCHAR),
+        @Result(column="FAX_NO", property="faxNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="RESP_PERSON", property="respPerson", jdbcType=JdbcType.VARCHAR),
+        @Result(column="AREA", property="area", jdbcType=JdbcType.VARCHAR),
+        @Result(column="RENTAL_FEE", property="rentalFee", jdbcType=JdbcType.DECIMAL),
+        @Result(column="STORING_FEE", property="storingFee", jdbcType=JdbcType.DECIMAL),
+        @Result(column="REMARK_1", property="remark1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="REMARK_2", property="remark2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="REMARK_3", property="remark3", jdbcType=JdbcType.VARCHAR),
+        @Result(column="REMARK_4", property="remark4", jdbcType=JdbcType.VARCHAR),
+        @Result(column="REMARK_5", property="remark5", jdbcType=JdbcType.VARCHAR),
+        @Result(column="UPDATE_COUNT", property="updateCount", jdbcType=JdbcType.INTEGER),
+        @Result(column="DELETE_FLAG", property="deleteFlag", jdbcType=JdbcType.INTEGER),
+        @Result(column="create_by", property="createBy", jdbcType=JdbcType.VARCHAR),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="update_by", property="updateBy", jdbcType=JdbcType.VARCHAR),
+        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR)
+    })
+    List<WarehouseInfo> selectMany(SelectStatementProvider selectStatement);
+
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @ResultMap("WarehouseInfoResult")
+    Optional<WarehouseInfo> selectOne(SelectStatementProvider selectStatement);
+
+    default long count(CountDSLCompleter completer) {
+        return MyBatis3Utils.countFrom(this::count, warehouseInfo, completer);
+    }
+
+    default int delete(DeleteDSLCompleter completer) {
+        return MyBatis3Utils.deleteFrom(this::delete, warehouseInfo, completer);
+    }
+
+    default int deleteByPrimaryKey(String whsCd_) {
+        return delete(c -> 
+            c.where(whsCd, isEqualTo(whsCd_))
+        );
+    }
+
+    default int insert(WarehouseInfo row) {
+        row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
+        return MyBatis3Utils.insert(this::insert, row, warehouseInfo, c ->
+            c.map(whsCd).toProperty("whsCd")
+            .map(deptId).toProperty("deptId")
+            .map(whsName).toProperty("whsName")
+            .map(whsTypeCd).toProperty("whsTypeCd")
+            .map(abbr).toProperty("abbr")
+            .map(addr1).toProperty("addr1")
+            .map(addr2).toProperty("addr2")
+            .map(addr3).toProperty("addr3")
+            .map(phoneNo).toProperty("phoneNo")
+            .map(zipCd).toProperty("zipCd")
+            .map(email).toProperty("email")
+            .map(faxNo).toProperty("faxNo")
+            .map(respPerson).toProperty("respPerson")
+            .map(area).toProperty("area")
+            .map(rentalFee).toProperty("rentalFee")
+            .map(storingFee).toProperty("storingFee")
+            .map(remark1).toProperty("remark1")
+            .map(remark2).toProperty("remark2")
+            .map(remark3).toProperty("remark3")
+            .map(remark4).toProperty("remark4")
+            .map(remark5).toProperty("remark5")
+            .map(updateCount).toProperty("updateCount")
+            .map(deleteFlag).toProperty("deleteFlag")
+            .map(createBy).toProperty("createBy")
+            .map(createTime).toProperty("createTime")
+            .map(updateBy).toProperty("updateBy")
+            .map(updateTime).toProperty("updateTime")
+            .map(remark).toProperty("remark")
+        );
+    }
+
+    default int insertMultiple(Collection<WarehouseInfo> records) {
+        for (WarehouseInfo row : records) {
+            row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
+        }
+        return MyBatis3Utils.insertMultiple(this::insertMultiple, records, warehouseInfo, c ->
+            c.map(whsCd).toProperty("whsCd")
+            .map(deptId).toProperty("deptId")
+            .map(whsName).toProperty("whsName")
+            .map(whsTypeCd).toProperty("whsTypeCd")
+            .map(abbr).toProperty("abbr")
+            .map(addr1).toProperty("addr1")
+            .map(addr2).toProperty("addr2")
+            .map(addr3).toProperty("addr3")
+            .map(phoneNo).toProperty("phoneNo")
+            .map(zipCd).toProperty("zipCd")
+            .map(email).toProperty("email")
+            .map(faxNo).toProperty("faxNo")
+            .map(respPerson).toProperty("respPerson")
+            .map(area).toProperty("area")
+            .map(rentalFee).toProperty("rentalFee")
+            .map(storingFee).toProperty("storingFee")
+            .map(remark1).toProperty("remark1")
+            .map(remark2).toProperty("remark2")
+            .map(remark3).toProperty("remark3")
+            .map(remark4).toProperty("remark4")
+            .map(remark5).toProperty("remark5")
+            .map(updateCount).toProperty("updateCount")
+            .map(deleteFlag).toProperty("deleteFlag")
+            .map(createBy).toProperty("createBy")
+            .map(createTime).toProperty("createTime")
+            .map(updateBy).toProperty("updateBy")
+            .map(updateTime).toProperty("updateTime")
+            .map(remark).toProperty("remark")
+        );
+    }
+
+    default int insertSelective(WarehouseInfo row) {
+        row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
+        return MyBatis3Utils.insert(this::insert, row, warehouseInfo, c ->
+            c.map(whsCd).toPropertyWhenPresent("whsCd", row::getWhsCd)
+            .map(deptId).toPropertyWhenPresent("deptId", row::getDeptId)
+            .map(whsName).toPropertyWhenPresent("whsName", row::getWhsName)
+            .map(whsTypeCd).toPropertyWhenPresent("whsTypeCd", row::getWhsTypeCd)
+            .map(abbr).toPropertyWhenPresent("abbr", row::getAbbr)
+            .map(addr1).toPropertyWhenPresent("addr1", row::getAddr1)
+            .map(addr2).toPropertyWhenPresent("addr2", row::getAddr2)
+            .map(addr3).toPropertyWhenPresent("addr3", row::getAddr3)
+            .map(phoneNo).toPropertyWhenPresent("phoneNo", row::getPhoneNo)
+            .map(zipCd).toPropertyWhenPresent("zipCd", row::getZipCd)
+            .map(email).toPropertyWhenPresent("email", row::getEmail)
+            .map(faxNo).toPropertyWhenPresent("faxNo", row::getFaxNo)
+            .map(respPerson).toPropertyWhenPresent("respPerson", row::getRespPerson)
+            .map(area).toPropertyWhenPresent("area", row::getArea)
+            .map(rentalFee).toPropertyWhenPresent("rentalFee", row::getRentalFee)
+            .map(storingFee).toPropertyWhenPresent("storingFee", row::getStoringFee)
+            .map(remark1).toPropertyWhenPresent("remark1", row::getRemark1)
+            .map(remark2).toPropertyWhenPresent("remark2", row::getRemark2)
+            .map(remark3).toPropertyWhenPresent("remark3", row::getRemark3)
+            .map(remark4).toPropertyWhenPresent("remark4", row::getRemark4)
+            .map(remark5).toPropertyWhenPresent("remark5", row::getRemark5)
+            .map(updateCount).toPropertyWhenPresent("updateCount", row::getUpdateCount)
+            .map(deleteFlag).toPropertyWhenPresent("deleteFlag", row::getDeleteFlag)
+            .map(createBy).toPropertyWhenPresent("createBy", row::getCreateBy)
+            .map(createTime).toPropertyWhenPresent("createTime", row::getCreateTime)
+            .map(updateBy).toPropertyWhenPresent("updateBy", row::getUpdateBy)
+            .map(updateTime).toPropertyWhenPresent("updateTime", row::getUpdateTime)
+            .map(remark).toPropertyWhenPresent("remark", row::getRemark)
+        );
+    }
+
+    default Optional<WarehouseInfo> selectOne(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectOne(this::selectOne, selectList, warehouseInfo, completer);
+    }
+
+    default List<WarehouseInfo> select(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectList(this::selectMany, selectList, warehouseInfo, completer);
+    }
+
+    default List<WarehouseInfo> selectDistinct(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectDistinct(this::selectMany, selectList, warehouseInfo, completer);
+    }
+
+    default Optional<WarehouseInfo> selectByPrimaryKey(String whsCd_) {
+        return selectOne(c ->
+            c.where(whsCd, isEqualTo(whsCd_))
+        );
+    }
+
+    default int update(UpdateDSLCompleter completer) {
+        return MyBatis3Utils.update(this::update, warehouseInfo, completer);
+    }
+
+    static UpdateDSL<UpdateModel> updateAllColumns(WarehouseInfo row, UpdateDSL<UpdateModel> dsl) {
+        return dsl.set(whsCd).equalTo(row::getWhsCd)
+                .set(deptId).equalTo(row::getDeptId)
+                .set(whsName).equalTo(row::getWhsName)
+                .set(whsTypeCd).equalTo(row::getWhsTypeCd)
+                .set(abbr).equalTo(row::getAbbr)
+                .set(addr1).equalTo(row::getAddr1)
+                .set(addr2).equalTo(row::getAddr2)
+                .set(addr3).equalTo(row::getAddr3)
+                .set(phoneNo).equalTo(row::getPhoneNo)
+                .set(zipCd).equalTo(row::getZipCd)
+                .set(email).equalTo(row::getEmail)
+                .set(faxNo).equalTo(row::getFaxNo)
+                .set(respPerson).equalTo(row::getRespPerson)
+                .set(area).equalTo(row::getArea)
+                .set(rentalFee).equalTo(row::getRentalFee)
+                .set(storingFee).equalTo(row::getStoringFee)
+                .set(remark1).equalTo(row::getRemark1)
+                .set(remark2).equalTo(row::getRemark2)
+                .set(remark3).equalTo(row::getRemark3)
+                .set(remark4).equalTo(row::getRemark4)
+                .set(remark5).equalTo(row::getRemark5)
+                .set(updateCount).equalTo(row::getUpdateCount)
+                .set(deleteFlag).equalTo(row::getDeleteFlag)
+                .set(createBy).equalTo(row::getCreateBy)
+                .set(createTime).equalTo(row::getCreateTime)
+                .set(updateBy).equalTo(row::getUpdateBy)
+                .set(updateTime).equalTo(row::getUpdateTime)
+                .set(remark).equalTo(row::getRemark);
+    }
+
+    static UpdateDSL<UpdateModel> updateSelectiveColumns(WarehouseInfo row, UpdateDSL<UpdateModel> dsl) {
+        row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr());
+        return dsl.set(whsCd).equalToWhenPresent(row::getWhsCd)
+                .set(deptId).equalToWhenPresent(row::getDeptId)
+                .set(whsName).equalToWhenPresent(row::getWhsName)
+                .set(whsTypeCd).equalToWhenPresent(row::getWhsTypeCd)
+                .set(abbr).equalToWhenPresent(row::getAbbr)
+                .set(addr1).equalToWhenPresent(row::getAddr1)
+                .set(addr2).equalToWhenPresent(row::getAddr2)
+                .set(addr3).equalToWhenPresent(row::getAddr3)
+                .set(phoneNo).equalToWhenPresent(row::getPhoneNo)
+                .set(zipCd).equalToWhenPresent(row::getZipCd)
+                .set(email).equalToWhenPresent(row::getEmail)
+                .set(faxNo).equalToWhenPresent(row::getFaxNo)
+                .set(respPerson).equalToWhenPresent(row::getRespPerson)
+                .set(area).equalToWhenPresent(row::getArea)
+                .set(rentalFee).equalToWhenPresent(row::getRentalFee)
+                .set(storingFee).equalToWhenPresent(row::getStoringFee)
+                .set(remark1).equalToWhenPresent(row::getRemark1)
+                .set(remark2).equalToWhenPresent(row::getRemark2)
+                .set(remark3).equalToWhenPresent(row::getRemark3)
+                .set(remark4).equalToWhenPresent(row::getRemark4)
+                .set(remark5).equalToWhenPresent(row::getRemark5)
+                .set(updateCount).equalToWhenPresent(row::getUpdateCount)
+                .set(deleteFlag).equalToWhenPresent(row::getDeleteFlag)
+                .set(createBy).equalToWhenPresent(row::getCreateBy)
+                .set(createTime).equalToWhenPresent(row::getCreateTime)
+                .set(updateBy).equalToWhenPresent(row::getUpdateBy)
+                .set(updateTime).equalToWhenPresent(row::getUpdateTime)
+                .set(remark).equalToWhenPresent(row::getRemark);
+    }
+
+    default int updateByPrimaryKey(WarehouseInfo row) {
+        return update(c ->
+            c.set(deptId).equalTo(row::getDeptId)
+            .set(whsName).equalTo(row::getWhsName)
+            .set(whsTypeCd).equalTo(row::getWhsTypeCd)
+            .set(abbr).equalTo(row::getAbbr)
+            .set(addr1).equalTo(row::getAddr1)
+            .set(addr2).equalTo(row::getAddr2)
+            .set(addr3).equalTo(row::getAddr3)
+            .set(phoneNo).equalTo(row::getPhoneNo)
+            .set(zipCd).equalTo(row::getZipCd)
+            .set(email).equalTo(row::getEmail)
+            .set(faxNo).equalTo(row::getFaxNo)
+            .set(respPerson).equalTo(row::getRespPerson)
+            .set(area).equalTo(row::getArea)
+            .set(rentalFee).equalTo(row::getRentalFee)
+            .set(storingFee).equalTo(row::getStoringFee)
+            .set(remark1).equalTo(row::getRemark1)
+            .set(remark2).equalTo(row::getRemark2)
+            .set(remark3).equalTo(row::getRemark3)
+            .set(remark4).equalTo(row::getRemark4)
+            .set(remark5).equalTo(row::getRemark5)
+            .set(updateCount).equalTo(row::getUpdateCount)
+            .set(deleteFlag).equalTo(row::getDeleteFlag)
+            .set(createBy).equalTo(row::getCreateBy)
+            .set(createTime).equalTo(row::getCreateTime)
+            .set(updateBy).equalTo(row::getUpdateBy)
+            .set(updateTime).equalTo(row::getUpdateTime)
+            .set(remark).equalTo(row::getRemark)
+            .where(whsCd, isEqualTo(row::getWhsCd))
+        );
+    }
+
+    default int updateByPrimaryKeySelective(WarehouseInfo row) {
+        row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr());
+        return update(c ->
+            c.set(deptId).equalToWhenPresent(row::getDeptId)
+            .set(whsName).equalToWhenPresent(row::getWhsName)
+            .set(whsTypeCd).equalToWhenPresent(row::getWhsTypeCd)
+            .set(abbr).equalToWhenPresent(row::getAbbr)
+            .set(addr1).equalToWhenPresent(row::getAddr1)
+            .set(addr2).equalToWhenPresent(row::getAddr2)
+            .set(addr3).equalToWhenPresent(row::getAddr3)
+            .set(phoneNo).equalToWhenPresent(row::getPhoneNo)
+            .set(zipCd).equalToWhenPresent(row::getZipCd)
+            .set(email).equalToWhenPresent(row::getEmail)
+            .set(faxNo).equalToWhenPresent(row::getFaxNo)
+            .set(respPerson).equalToWhenPresent(row::getRespPerson)
+            .set(area).equalToWhenPresent(row::getArea)
+            .set(rentalFee).equalToWhenPresent(row::getRentalFee)
+            .set(storingFee).equalToWhenPresent(row::getStoringFee)
+            .set(remark1).equalToWhenPresent(row::getRemark1)
+            .set(remark2).equalToWhenPresent(row::getRemark2)
+            .set(remark3).equalToWhenPresent(row::getRemark3)
+            .set(remark4).equalToWhenPresent(row::getRemark4)
+            .set(remark5).equalToWhenPresent(row::getRemark5)
+            .set(updateCount).equalToWhenPresent(row::getUpdateCount)
+            .set(deleteFlag).equalToWhenPresent(row::getDeleteFlag)
+            .set(createBy).equalToWhenPresent(row::getCreateBy)
+            .set(createTime).equalToWhenPresent(row::getCreateTime)
+            .set(updateBy).equalToWhenPresent(row::getUpdateBy)
+            .set(updateTime).equalToWhenPresent(row::getUpdateTime)
+            .set(remark).equalToWhenPresent(row::getRemark)
+            .where(whsCd, isEqualTo(row::getWhsCd))
+        );
+    }
+}

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IGoodsTypeService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.wms.service;
+
+import java.util.List;
+
+import com.ruoyi.wms.domain .GoodsType;
+
+/**
+ * 物品类型管理Service接口
+ *
+ * @author ryas
+ * created on 2024-02-18
+ */
+public interface IGoodsTypeService {
+    /**
+     * 查询物品类型管理
+     *
+     * @param goodsTypeCd 物品类型管理主键
+     * @return 物品类型管理
+     */
+    GoodsType selectGoodsTypeByGoodsTypeCd(String goodsTypeCd);
+
+    /**
+     * 查询物品类型管理列表
+     *
+     * @param goodsType 物品类型管理
+     * @return 物品类型管理集合
+     */
+    List<GoodsType> selectGoodsTypeList(GoodsType goodsType);
+
+    /**
+     * 新增物品类型管理
+     *
+     * @param goodsType 物品类型管理
+     * @return 结果
+     */
+    int insertGoodsType(GoodsType goodsType);
+
+    /**
+     * 修改物品类型管理
+     *
+     * @param goodsType 物品类型管理
+     * @return 结果
+     */
+    int updateGoodsType(GoodsType goodsType);
+
+    /**
+     * 批量删除物品类型管理
+     *
+     * @param goodsTypeCds 需要删除的物品类型管理主键集合
+     * @return 结果
+     */
+    int deleteGoodsTypeByGoodsTypeCds(String[] goodsTypeCds);
+
+    /**
+     * 删除物品类型管理信息
+     *
+     * @param goodsTypeCd 物品类型管理主键
+     * @return 结果
+     */
+    int deleteGoodsTypeByGoodsTypeCd(String goodsTypeCd);
+}

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IWarehouseInfoService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.wms.service;
+
+import java.util.List;
+
+import com.ruoyi.wms.domain .WarehouseInfo;
+
+/**
+ * 仓库基础信息Service接口
+ *
+ * @author ryas
+ * created on 2024-02-18
+ */
+public interface IWarehouseInfoService {
+    /**
+     * 查询仓库基础信息
+     *
+     * @param whsCd 仓库基础信息主键
+     * @return 仓库基础信息
+     */
+    WarehouseInfo selectWarehouseInfoByWhsCd(String whsCd);
+
+    /**
+     * 查询仓库基础信息列表
+     *
+     * @param warehouseInfo 仓库基础信息
+     * @return 仓库基础信息集合
+     */
+    List<WarehouseInfo> selectWarehouseInfoList(WarehouseInfo warehouseInfo);
+
+    /**
+     * 新增仓库基础信息
+     *
+     * @param warehouseInfo 仓库基础信息
+     * @return 结果
+     */
+    int insertWarehouseInfo(WarehouseInfo warehouseInfo);
+
+    /**
+     * 修改仓库基础信息
+     *
+     * @param warehouseInfo 仓库基础信息
+     * @return 结果
+     */
+    int updateWarehouseInfo(WarehouseInfo warehouseInfo);
+
+    /**
+     * 批量删除仓库基础信息
+     *
+     * @param whsCds 需要删除的仓库基础信息主键集合
+     * @return 结果
+     */
+    int deleteWarehouseInfoByWhsCds(String[] whsCds);
+
+    /**
+     * 删除仓库基础信息信息
+     *
+     * @param whsCd 仓库基础信息主键
+     * @return 结果
+     */
+    int deleteWarehouseInfoByWhsCd(String whsCd);
+}

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/GoodsTypeServiceImpl.java

@@ -0,0 +1,122 @@
+package com.ruoyi.wms.service.impl;
+
+import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.uuid.snowflake.SnowFlakeIdGenerator;
+import com.ruoyi.common.core.web.domain.ExtBaseEntity;
+import com.ruoyi.common.security.utils.SecurityUtilsExt;
+import com.ruoyi.wms.domain.GoodsType;
+import com.ruoyi.wms.mapper.GoodsTypeDynamicSqlSupport;
+import com.ruoyi.wms.mapper.GoodsTypeMapper;
+import com.ruoyi.wms.service.IGoodsTypeService;
+import org.mybatis.dynamic.sql.SqlBuilder;
+import org.mybatis.dynamic.sql.render.RenderingStrategies;
+import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
+import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 物品类型管理Service业务层处理
+ *
+ * @author ryas
+ * created on 2024-02-18
+ */
+@Service
+public class GoodsTypeServiceImpl implements IGoodsTypeService {
+    @Autowired
+    private GoodsTypeMapper goodsTypeMapper;
+
+    /**
+     * 查询物品类型管理
+     *
+     * @param goodsTypeCd 物品类型管理主键
+     * @return 物品类型管理
+     */
+    @Override
+    public GoodsType selectGoodsTypeByGoodsTypeCd(String goodsTypeCd) {
+        Optional<GoodsType> result = goodsTypeMapper.selectOne(dsl -> dsl.where(GoodsTypeDynamicSqlSupport.goodsTypeCd, SqlBuilder.isEqualTo(goodsTypeCd)));
+        return result.orElse(null);
+    }
+
+    /**
+     * 查询物品类型管理列表
+     *
+     * @param goodsType 物品类型管理
+     * @return 物品类型管理
+     */
+    @Override
+    public List<GoodsType> selectGoodsTypeList(GoodsType goodsType) {
+        SelectStatementProvider provider = SqlBuilder.select(GoodsTypeMapper.selectList)
+                .from(GoodsTypeDynamicSqlSupport.goodsType)
+                .where(GoodsTypeDynamicSqlSupport.deleteFlag, SqlBuilder.isEqualTo(ExtBaseEntity.NOT_DELETE))
+                .and(GoodsTypeDynamicSqlSupport.goodsTypeCd, SqlBuilder.isEqualToWhenPresent(goodsType.getGoodsTypeCd()))
+                .and(GoodsTypeDynamicSqlSupport.goodsTypeName, SqlBuilder.isLikeWhenPresent(goodsType.getGoodsTypeName() == null ? null : "%" + goodsType.getGoodsTypeName() + "%"))
+                .and(GoodsTypeDynamicSqlSupport.remark1, SqlBuilder.isLikeWhenPresent(goodsType.getRemark1() == null ? null : "%" + goodsType.getRemark1() + "%"))
+                .build()
+                .render(RenderingStrategies.MYBATIS3);
+        return goodsTypeMapper.selectMany(provider);
+    }
+
+    /**
+     * 新增物品类型管理
+     *
+     * @param goodsType 物品类型管理
+     * @return 结果
+     */
+    @Override
+    public int insertGoodsType(GoodsType goodsType) {
+        if (StringUtils.isBlank(goodsType.getGoodsTypeCd())) {
+            goodsType.setGoodsTypeCd(SnowFlakeIdGenerator.nextId());
+        }
+        return goodsTypeMapper.insertSelective(goodsType);
+    }
+
+    /**
+     * 修改物品类型管理
+     *
+     * @param goodsType 物品类型管理
+     * @return 结果
+     */
+    @Override
+    public int updateGoodsType(GoodsType goodsType) {
+        return goodsTypeMapper.updateByPrimaryKeySelective(goodsType);
+    }
+
+    /**
+     * 批量删除物品类型管理
+     *
+     * @param goodsTypeCds 需要删除的物品类型管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteGoodsTypeByGoodsTypeCds(String[] goodsTypeCds) {
+        String userId = SecurityUtilsExt.getUserIdStr();
+        UpdateStatementProvider provider = SqlBuilder.update(GoodsTypeDynamicSqlSupport.goodsType)
+                .set(GoodsTypeDynamicSqlSupport.deleteFlag).equalTo(ExtBaseEntity.DELETED)
+                .set(GoodsTypeDynamicSqlSupport.updateTime).equalTo(DateUtils.getNowDate())
+                .set(GoodsTypeDynamicSqlSupport.updateBy).equalTo(userId)
+                .where(GoodsTypeDynamicSqlSupport.goodsTypeCd, SqlBuilder.isIn(goodsTypeCds))
+                .build()
+                .render(RenderingStrategies.MYBATIS3);
+        return goodsTypeMapper.update(provider);
+    }
+
+    /**
+     * 删除物品类型管理信息
+     *
+     * @param goodsTypeCd 物品类型管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteGoodsTypeByGoodsTypeCd(String goodsTypeCd) {
+        GoodsType record = new GoodsType();
+        record.setGoodsTypeCd(goodsTypeCd);
+        record.setDeleteFlag(ExtBaseEntity.DELETED);
+        record.setUpdateTime(DateUtils.getNowDate());
+        return goodsTypeMapper.updateByPrimaryKey(record);
+    }
+}

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/WarehouseInfoServiceImpl.java

@@ -0,0 +1,121 @@
+package com.ruoyi.wms.service.impl;
+
+import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.uuid.snowflake.SnowFlakeIdGenerator;
+import com.ruoyi.common.core.web.domain.ExtBaseEntity;
+import com.ruoyi.common.security.utils.SecurityUtilsExt;
+import com.ruoyi.wms.domain.WarehouseInfo;
+import com.ruoyi.wms.mapper.WarehouseInfoDynamicSqlSupport;
+import com.ruoyi.wms.mapper.WarehouseInfoMapper;
+import com.ruoyi.wms.service.IWarehouseInfoService;
+import org.mybatis.dynamic.sql.SqlBuilder;
+import org.mybatis.dynamic.sql.render.RenderingStrategies;
+import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
+import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 仓库基础信息Service业务层处理
+ *
+ * @author ryas
+ * created on 2024-02-18
+ */
+@Service
+public class WarehouseInfoServiceImpl implements IWarehouseInfoService {
+    @Autowired
+    private WarehouseInfoMapper warehouseInfoMapper;
+
+    /**
+     * 查询仓库基础信息
+     *
+     * @param whsCd 仓库基础信息主键
+     * @return 仓库基础信息
+     */
+    @Override
+    public WarehouseInfo selectWarehouseInfoByWhsCd(String whsCd) {
+        Optional<WarehouseInfo> result = warehouseInfoMapper.selectOne(dsl -> dsl.where(WarehouseInfoDynamicSqlSupport.whsCd, SqlBuilder.isEqualTo(whsCd)));
+        return result.orElse(null);
+    }
+
+    /**
+     * 查询仓库基础信息列表
+     *
+     * @param warehouseInfo 仓库基础信息
+     * @return 仓库基础信息
+     */
+    @Override
+    public List<WarehouseInfo> selectWarehouseInfoList(WarehouseInfo warehouseInfo) {
+        SelectStatementProvider provider = SqlBuilder.select(WarehouseInfoMapper.selectList)
+                .from(WarehouseInfoDynamicSqlSupport.warehouseInfo)
+                .where(WarehouseInfoDynamicSqlSupport.deleteFlag, SqlBuilder.isEqualTo(ExtBaseEntity.NOT_DELETE))
+                .and(WarehouseInfoDynamicSqlSupport.whsCd, SqlBuilder.isEqualToWhenPresent(warehouseInfo.getWhsCd()))
+                .and(WarehouseInfoDynamicSqlSupport.whsName, SqlBuilder.isLikeWhenPresent(warehouseInfo.getWhsName() == null ? null : "%" + warehouseInfo.getWhsName() + "%"))
+                .build()
+                .render(RenderingStrategies.MYBATIS3);
+        return warehouseInfoMapper.selectMany(provider);
+    }
+
+    /**
+     * 新增仓库基础信息
+     *
+     * @param warehouseInfo 仓库基础信息
+     * @return 结果
+     */
+    @Override
+    public int insertWarehouseInfo(WarehouseInfo warehouseInfo) {
+        if (StringUtils.isBlank(warehouseInfo.getWhsCd())) {
+            warehouseInfo.setWhsCd(SnowFlakeIdGenerator.nextId());
+        }
+        return warehouseInfoMapper.insertSelective(warehouseInfo);
+    }
+
+    /**
+     * 修改仓库基础信息
+     *
+     * @param warehouseInfo 仓库基础信息
+     * @return 结果
+     */
+    @Override
+    public int updateWarehouseInfo(WarehouseInfo warehouseInfo) {
+        return warehouseInfoMapper.updateByPrimaryKeySelective(warehouseInfo);
+    }
+
+    /**
+     * 批量删除仓库基础信息
+     *
+     * @param whsCds 需要删除的仓库基础信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWarehouseInfoByWhsCds(String[] whsCds) {
+        String userId = SecurityUtilsExt.getUserIdStr();
+        UpdateStatementProvider provider = SqlBuilder.update(WarehouseInfoDynamicSqlSupport.warehouseInfo)
+                .set(WarehouseInfoDynamicSqlSupport.deleteFlag).equalTo(ExtBaseEntity.DELETED)
+                .set(WarehouseInfoDynamicSqlSupport.updateTime).equalTo(DateUtils.getNowDate())
+                .set(WarehouseInfoDynamicSqlSupport.updateBy).equalTo(userId)
+                .where(WarehouseInfoDynamicSqlSupport.whsCd, SqlBuilder.isIn(whsCds))
+                .build()
+                .render(RenderingStrategies.MYBATIS3);
+        return warehouseInfoMapper.update(provider);
+    }
+
+    /**
+     * 删除仓库基础信息信息
+     *
+     * @param whsCd 仓库基础信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWarehouseInfoByWhsCd(String whsCd) {
+        WarehouseInfo record = new WarehouseInfo();
+        record.setWhsCd(whsCd);
+        record.setDeleteFlag(ExtBaseEntity.DELETED);
+        record.setUpdateTime(DateUtils.getNowDate());
+        return warehouseInfoMapper.updateByPrimaryKey(record);
+    }
+}

ruoyi-modules/ruoyi-wms/src/test/resources/generatorConfig.xml

@@ -10,9 +10,9 @@
         <plugin type="org.mybatis.generator.plugins.SerializablePlugin"/>
         <plugin type="org.mybatis.generator.plugins.ToStringPlugin"/>
 
-        <commentGenerator>
+        <commentGenerator type="com.ruoyi.common.datasource.mybatis.gen.MyCommentGenerator">
             <property name="suppressAllComments" value="false"/>
-            <property name="suppressDate" value="true"/>
+            <property name="suppressDate" value="false"/>
             <property name="addRemarkComments" value="true"/>
         </commentGenerator>
 
@@ -40,6 +40,9 @@
         </javaClientGenerator>
 
         <!-- 要生成的表 -->
-        <table tableName="SF_WMS_M_UNIT_INFO" domainObjectName="UnitInfo"/>
+<!--        <table tableName="WMS_M_UNIT_INFO" domainObjectName="UnitInfo"/>-->
+<!--        <table tableName="WMS_M_GOODS_TYPE_INFO" domainObjectName="GoodsType"/>-->
+        <table tableName="WMS_M_WAREHOUSE_INFO" domainObjectName="WarehouseInfo"/>
+
     </context>
 </generatorConfiguration>