优化代码生成

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

@@ -92,7 +92,7 @@ public class ExcelUtil<T> {
     /**
      * 当前行号
      */
-    private int rownum;
+    private int rowNum;
 
     /**
      * 标题
@@ -159,7 +159,7 @@ public class ExcelUtil<T> {
 
     public void init(List<T> list, String sheetName, String title, Type type) {
         if (list == null) {
-            list = new ArrayList<T>();
+            list = new ArrayList<>();
         }
         this.list = list;
         this.sheetName = sheetName;
@@ -182,7 +182,7 @@ public class ExcelUtil<T> {
             if (isSubList()) {
                 titleLastCol = titleLastCol + subFields.size() - 1;
             }
-            Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
+            Row titleRow = sheet.createRow(rowNum == 0 ? rowNum++ : 0);
             titleRow.setHeightInPoints(30);
             Cell titleCell = titleRow.createCell(0);
             titleCell.setCellStyle(styles.get("title"));
@@ -198,7 +198,7 @@ public class ExcelUtil<T> {
         if (isSubList()) {
             subMergedFirstRowNum++;
             subMergedLastRowNum++;
-            Row subRow = sheet.createRow(rownum);
+            Row subRow = sheet.createRow(rowNum);
             int excelNum = 0;
             for (Object[] objects : fields) {
                 Excel attr = (Excel) objects[1];
@@ -210,9 +210,9 @@ public class ExcelUtil<T> {
             int headFirstRow = excelNum - 1;
             int headLastRow = headFirstRow + subFields.size() - 1;
             if (headLastRow > headFirstRow) {
-                sheet.addMergedRegion(new CellRangeAddress(rownum, rownum, headFirstRow, headLastRow));
+                sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, headFirstRow, headLastRow));
             }
-            rownum++;
+            rowNum++;
         }
     }
 
@@ -257,7 +257,7 @@ public class ExcelUtil<T> {
     public List<T> importExcel(String sheetName, InputStream is, int titleNum) throws Exception {
         this.type = Type.IMPORT;
         this.wb = WorkbookFactory.create(is);
-        List<T> list = new ArrayList<T>();
+        List<T> list = new ArrayList<>();
         // 如果指定sheet名,则取指定sheet中的内容 否则默认指向第1个sheet
         Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0);
         if (sheet == null) {
@@ -268,7 +268,7 @@ public class ExcelUtil<T> {
         int rows = sheet.getLastRowNum();
         if (rows > 0) {
             // 定义一个map用于存放excel列的序号和field.
-            Map<String, Integer> cellMap = new HashMap<String, Integer>();
+            Map<String, Integer> cellMap = new HashMap<>();
             // 获取表头
             Row heard = sheet.getRow(titleNum);
             for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) {
@@ -282,7 +282,7 @@ public class ExcelUtil<T> {
             }
             // 有数据时才处理 得到类的所有field.
             List<Object[]> fields = this.getFields();
-            Map<Integer, Object[]> fieldsMap = new HashMap<Integer, Object[]>();
+            Map<Integer, Object[]> fieldsMap = new HashMap<>();
             for (Object[] objects : fields) {
                 Excel attr = (Excel) objects[1];
                 Integer column = cellMap.get(attr.name());
@@ -428,7 +428,7 @@ public class ExcelUtil<T> {
             createSheet(sheetNo, index);
 
             // 产生一行
-            Row row = sheet.createRow(rownum);
+            Row row = sheet.createRow(rowNum);
             int column = 0;
             // 写入各个字段的列头名称
             for (Object[] os : fields) {
@@ -460,9 +460,9 @@ public class ExcelUtil<T> {
     public void fillExcelData(int index, Row row) {
         int startNo = index * sheetSize;
         int endNo = Math.min(startNo + sheetSize, list.size());
-        int rowNo = (1 + rownum) - startNo;
+        int rowNo = (1 + rowNum) - startNo;
         for (int i = startNo; i < endNo; i++) {
-            rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo;
+            rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rowNum - startNo;
             row = sheet.createRow(rowNo);
             // 得到导出对象.
             T vo = (T) list.get(i);
@@ -515,7 +515,7 @@ public class ExcelUtil<T> {
      */
     private Map<String, CellStyle> createStyles(Workbook wb) {
         // 写入各条记录,每条记录对应excel表中的一行
-        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
+        Map<String, CellStyle> styles = new HashMap<>();
         CellStyle style = wb.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
@@ -566,7 +566,7 @@ public class ExcelUtil<T> {
      * @return 自定义样式列表
      */
     private Map<String, CellStyle> annotationHeaderStyles(Workbook wb, Map<String, CellStyle> styles) {
-        Map<String, CellStyle> headerStyles = new HashMap<String, CellStyle>();
+        Map<String, CellStyle> headerStyles = new HashMap<>();
         for (Object[] os : fields) {
             Excel excel = (Excel) os[1];
             String key = StringUtils.format("header_{}_{}", excel.headerColor(), excel.headerBackgroundColor());
@@ -596,7 +596,7 @@ public class ExcelUtil<T> {
      * @return 自定义样式列表
      */
     private Map<String, CellStyle> annotationDataStyles(Workbook wb) {
-        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
+        Map<String, CellStyle> styles = new HashMap<>();
         for (Object[] os : fields) {
             Excel excel = (Excel) os[1];
             String key = StringUtils.format("data_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor());
@@ -639,7 +639,7 @@ public class ExcelUtil<T> {
             // 填充默认样式，防止合并单元格样式失效
             sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor())));
             if (attr.needMerge()) {
-                sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column));
+                sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum, column, column));
             }
         }
         return cell;
@@ -1005,7 +1005,7 @@ public class ExcelUtil<T> {
      * 获取字段注解信息
      */
     public List<Object[]> getFields() {
-        List<Object[]> fields = new ArrayList<Object[]>();
+        List<Object[]> fields = new ArrayList<>();
         List<Field> tempFields = new ArrayList<>();
         tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
         tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
@@ -1184,7 +1184,7 @@ public class ExcelUtil<T> {
         try {
             value = subMethod.invoke(obj, new Object[]{});
         } catch (Exception e) {
-            return new ArrayList<Object>();
+            return new ArrayList<>();
         }
         return (Collection<?>) value;
     }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java

@@ -1,21 +1,18 @@
 package com.ruoyi.common.core.utils.reflect;
 
-import java.lang.reflect.Field;
+import com.ruoyi.common.core.text.Convert;
-import java.lang.reflect.InvocationTargetException;
+import com.ruoyi.common.core.utils.DateUtils;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.Date;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.ruoyi.common.core.text.Convert;
+
-import com.ruoyi.common.core.utils.DateUtils;
+import java.lang.reflect.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
@@ -326,4 +323,52 @@ public class ReflectUtils {
         }
         return new RuntimeException(msg, e);
     }
+
+    /**
+     * 深度寻找字段（不断往父类上去找）
+     *
+     * @param clazz     目标类
+     * @param fieldName 字段名
+     * @return 字段对象
+     * @throws NoSuchFieldException 最终还是找不到
+     */
+    public static Field getFieldDeep(Class<?> clazz, String fieldName) throws NoSuchFieldException {
+        if (clazz == Object.class) {
+            throw new NoSuchFieldException(fieldName);
+        }
+        try {
+            return clazz.getDeclaredField(fieldName);
+        } catch (NoSuchFieldException e0) {
+            Class<?> superClass = clazz.getSuperclass();
+            return getFieldDeep(superClass, fieldName);
+        }
+    }
+
+    /**
+     * 获取所有字段（包括父类的）
+     *
+     * @param clazz    起始类（包含）
+     * @param endClass 终止类（不包含）
+     * @return 所有字段
+     */
+    public static Field[] getFieldsDeep(Class<?> clazz, Class<?> endClass) {
+        List<Field> fieldList = new ArrayList<>();
+        while (clazz != endClass) {
+            Field[] fields = clazz.getDeclaredFields();
+            fieldList.addAll(Arrays.asList(fields));
+            clazz = clazz.getSuperclass();
+        }
+        Field[] f = new Field[fieldList.size()];
+        return fieldList.toArray(f);
+    }
+
+    /**
+     * 获取所有字段（包括父类的，一直查到Object类为止，不包括Object的字段）
+     *
+     * @param clazz 起始类
+     * @return 所有字段
+     */
+    public static Field[] getFieldsDeep(Class<?> clazz) {
+        return getFieldsDeep(clazz, Object.class);
+    }
 }

ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/mybatis/gen/MyCommentGenerator.java

@@ -0,0 +1,459 @@
+package com.ruoyi.common.datasource.mybatis.gen;
+
+import org.mybatis.generator.api.CommentGenerator;
+import org.mybatis.generator.api.IntrospectedColumn;
+import org.mybatis.generator.api.IntrospectedTable;
+import org.mybatis.generator.api.MyBatisGenerator;
+import org.mybatis.generator.api.dom.java.*;
+import org.mybatis.generator.api.dom.kotlin.KotlinFile;
+import org.mybatis.generator.api.dom.xml.TextElement;
+import org.mybatis.generator.api.dom.xml.XmlElement;
+import org.mybatis.generator.config.MergeConstants;
+import org.mybatis.generator.config.PropertyRegistry;
+import org.mybatis.generator.internal.util.StringUtility;
+
+import java.text.SimpleDateFormat;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.Properties;
+import java.util.Set;
+
+import static org.mybatis.generator.internal.util.StringUtility.isTrue;
+
+/**
+ * 抄录自{@link org.mybatis.generator.internal.DefaultCommentGenerator}，并作个性化修改
+ * 
+ * @author Alan Scipio
+ * created on 2024/2/18
+ */
+public class MyCommentGenerator implements CommentGenerator {
+
+    private final Properties properties = new Properties();
+
+    private boolean suppressDate;
+
+    private boolean suppressAllComments;
+
+    /** If suppressAllComments is true, this option is ignored. */
+    private boolean addRemarkComments;
+
+    private SimpleDateFormat dateFormat;
+
+    private FullyQualifiedJavaType generatedImport =
+            new FullyQualifiedJavaType("jakarta.annotation.Generated"); 
+
+    public MyCommentGenerator() {
+        super();
+        suppressDate = false;
+        suppressAllComments = false;
+        addRemarkComments = false;
+    }
+
+    /**
+     * Adds a suitable comment to warn users that the element was generated, and
+     * when it was generated.
+     *
+     * @param xmlElement the xml element
+     */
+    @Override
+    public void addComment(XmlElement xmlElement) {
+        if (suppressAllComments) {
+            return;
+        }
+
+        xmlElement.addElement(new TextElement("<!--")); 
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("  WARNING - "); 
+        sb.append(MergeConstants.NEW_ELEMENT_TAG);
+        xmlElement.addElement(new TextElement(sb.toString()));
+        xmlElement.addElement(
+                new TextElement("  This element is automatically generated by MyBatis Generator," 
+                        + " do not modify.")); 
+
+        String s = getDateString();
+        if (s != null) {
+            sb.setLength(0);
+            sb.append("  This element was generated on "); 
+            sb.append(s);
+            sb.append('.');
+            xmlElement.addElement(new TextElement(sb.toString()));
+        }
+
+        xmlElement.addElement(new TextElement("-->")); 
+    }
+
+    @Override
+    public void addConfigurationProperties(Properties props) {
+        this.properties.putAll(props);
+
+        suppressDate = isTrue(properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_SUPPRESS_DATE));
+
+        suppressAllComments = isTrue(properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_SUPPRESS_ALL_COMMENTS));
+
+        addRemarkComments = isTrue(properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_ADD_REMARK_COMMENTS));
+
+        if (isTrue(properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_USE_LEGACY_GENERATED_ANNOTATION))) {
+            generatedImport = new FullyQualifiedJavaType("javax.annotation.Generated"); 
+        }
+
+        String dateFormatString = properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_DATE_FORMAT);
+        if (StringUtility.stringHasValue(dateFormatString)) {
+            dateFormat = new SimpleDateFormat(dateFormatString);
+        } else {
+            dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        }
+    }
+
+    /**
+     * This method adds the custom javadoc tag for. You may do nothing if you do not
+     * wish to include the Javadoc tag - however, if you do not include the Javadoc
+     * tag then the Java merge capability of the eclipse plugin will break.
+     *
+     * @param javaElement       the java element
+     * @param markAsDoNotDelete the mark as do not delete
+     */
+    protected void addJavadocTag(JavaElement javaElement, boolean markAsDoNotDelete) {
+        javaElement.addJavaDocLine(" *"); 
+        StringBuilder sb = new StringBuilder();
+        sb.append(" * "); 
+        sb.append(MergeConstants.NEW_ELEMENT_TAG);
+        if (markAsDoNotDelete) {
+            sb.append(" do_not_delete_during_merge"); 
+        }
+        String s = getDateString();
+        if (s != null) {
+            sb.append(' ');
+            sb.append(s);
+        }
+        javaElement.addJavaDocLine(sb.toString());
+    }
+
+    /**
+     * Returns a formatted date string to include in the Javadoc tag and XML
+     * comments. You may return null if you do not want the date in these
+     * documentation elements.
+     *
+     * @return a string representing the current timestamp, or null
+     */
+    protected String getDateString() {
+        if (suppressDate) {
+            return null;
+        } else if (dateFormat != null) {
+            return dateFormat.format(new Date());
+        } else {
+            return new Date().toString();
+        }
+    }
+
+    @Override
+    public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable) {
+        if (suppressAllComments) {
+            return;
+        }
+
+        StringBuilder sb = new StringBuilder();
+
+        innerClass.addJavaDocLine("/**");
+        sb.append(introspectedTable.getFullyQualifiedTable());
+        innerClass.addJavaDocLine(sb.toString());
+
+        addJavadocTag(innerClass, false);
+
+        innerClass.addJavaDocLine(" */"); 
+    }
+
+    @Override
+    public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable, boolean markAsDoNotDelete) {
+        if (suppressAllComments) {
+            return;
+        }
+
+        StringBuilder sb = new StringBuilder();
+
+        innerClass.addJavaDocLine("/**");
+        sb.append(introspectedTable.getFullyQualifiedTable());
+        innerClass.addJavaDocLine(sb.toString());
+
+        addJavadocTag(innerClass, markAsDoNotDelete);
+
+        innerClass.addJavaDocLine(" */"); 
+    }
+
+    @Override
+    public void addModelClassComment(TopLevelClass topLevelClass, IntrospectedTable introspectedTable) {
+        if (suppressAllComments || !addRemarkComments) {
+            return;
+        }
+
+        topLevelClass.addJavaDocLine("/**");
+        topLevelClass.addJavaDocLine(" * This class was generated by MyBatis Generator.");
+        topLevelClass.addJavaDocLine(" *");
+
+
+
+        topLevelClass.addJavaDocLine(" * <ul>");
+        //表名
+        String s = " *   <li> Table: " + introspectedTable.getFullyQualifiedTable() + " </li>";
+        topLevelClass.addJavaDocLine(s);
+
+        //表注释
+        String remarks = introspectedTable.getRemarks() == null ? "" : introspectedTable.getRemarks();
+        StringBuilder remarksSb = new StringBuilder();
+        if (addRemarkComments && StringUtility.stringHasValue(remarks)) {
+            remarksSb.append(" *   <li> Remarks: ");
+            remarksSb.append(remarks);
+            remarksSb.append(" </li>");
+            topLevelClass.addJavaDocLine(remarksSb.toString());
+        }
+        topLevelClass.addJavaDocLine(" * </ul>");
+        topLevelClass.addJavaDocLine(" *");
+
+        //作者
+        topLevelClass.addJavaDocLine(" * @author ryas");
+        if (!suppressDate && !suppressAllComments) {
+            topLevelClass.addJavaDocLine(" * created on " + getDateString());
+        }
+
+        topLevelClass.addJavaDocLine(" */"); 
+    }
+
+    @Override
+    public void addEnumComment(InnerEnum innerEnum, IntrospectedTable introspectedTable) {
+        if (suppressAllComments) {
+            return;
+        }
+
+        StringBuilder sb = new StringBuilder();
+
+        innerEnum.addJavaDocLine("/**"); 
+        sb.append(introspectedTable.getFullyQualifiedTable());
+        innerEnum.addJavaDocLine(sb.toString());
+
+        addJavadocTag(innerEnum, false);
+
+        innerEnum.addJavaDocLine(" */"); 
+    }
+
+    @Override
+    public void addFieldComment(Field field, IntrospectedTable introspectedTable,
+                                IntrospectedColumn introspectedColumn) {
+        if (suppressAllComments) {
+            return;
+        }
+
+        field.addJavaDocLine("/**");
+
+        String remarks = introspectedTable.getRemarks() == null ? "" : introspectedTable.getRemarks();
+        if (addRemarkComments && StringUtility.stringHasValue(remarks)) {
+            String[] remarkLines = remarks.split(System.lineSeparator());
+            for (String remarkLine : remarkLines) {
+                field.addJavaDocLine(" *   " + remarkLine); 
+            }
+        }
+
+        String s = ""
+                + introspectedTable.getFullyQualifiedTable()
+                + '.'
+                + introspectedColumn.getActualColumnName();
+        field.addJavaDocLine(s);
+
+        addJavadocTag(field, false);
+
+        field.addJavaDocLine(" */"); 
+    }
+
+    @Override
+    public void addFieldComment(Field field, IntrospectedTable introspectedTable) {
+        if (suppressAllComments) {
+            return;
+        }
+
+        StringBuilder sb = new StringBuilder();
+
+        field.addJavaDocLine("/**"); 
+        sb.append(introspectedTable.getFullyQualifiedTable());
+        field.addJavaDocLine(sb.toString());
+
+        addJavadocTag(field, false);
+
+        field.addJavaDocLine(" */"); 
+    }
+
+    @Override
+    public void addGeneralMethodComment(Method method, IntrospectedTable introspectedTable) {
+        if (suppressAllComments) {
+            return;
+        }
+
+        StringBuilder sb = new StringBuilder();
+
+        method.addJavaDocLine("/**"); 
+        sb.append(introspectedTable.getFullyQualifiedTable());
+        method.addJavaDocLine(sb.toString());
+
+        addJavadocTag(method, false);
+
+        method.addJavaDocLine(" */"); 
+    }
+
+    @Override
+    public void addGetterComment(Method method, IntrospectedTable introspectedTable,
+                                 IntrospectedColumn introspectedColumn) {
+        if (suppressAllComments) {
+            return;
+        }
+
+        StringBuilder sb = new StringBuilder();
+
+        method.addJavaDocLine("/**"); 
+        sb.append(introspectedTable.getFullyQualifiedTable());
+        sb.append('.');
+        sb.append(introspectedColumn.getActualColumnName());
+        method.addJavaDocLine(sb.toString());
+
+        sb.setLength(0);
+        sb.append(" * @return the value of "); 
+        sb.append(introspectedTable.getFullyQualifiedTable());
+        sb.append('.');
+        sb.append(introspectedColumn.getActualColumnName());
+        method.addJavaDocLine(sb.toString());
+
+        addJavadocTag(method, false);
+
+        method.addJavaDocLine(" */"); 
+    }
+
+    @Override
+    public void addSetterComment(Method method, IntrospectedTable introspectedTable,
+                                 IntrospectedColumn introspectedColumn) {
+        if (suppressAllComments) {
+            return;
+        }
+
+        StringBuilder sb = new StringBuilder();
+
+        method.addJavaDocLine("/**"); 
+        sb.append(introspectedTable.getFullyQualifiedTable());
+        sb.append('.');
+        sb.append(introspectedColumn.getActualColumnName());
+        method.addJavaDocLine(sb.toString());
+
+        method.addJavaDocLine(" *"); 
+
+        Parameter parm = method.getParameters().getFirst();
+        sb.setLength(0);
+        sb.append(" * @param "); 
+        sb.append(parm.getName());
+        sb.append(" the value for "); 
+        sb.append(introspectedTable.getFullyQualifiedTable());
+        sb.append('.');
+        sb.append(introspectedColumn.getActualColumnName());
+        method.addJavaDocLine(sb.toString());
+
+        addJavadocTag(method, false);
+
+        method.addJavaDocLine(" */"); 
+    }
+
+    @Override
+    public void addGeneralMethodAnnotation(Method method, IntrospectedTable introspectedTable,
+                                           Set<FullyQualifiedJavaType> imports) {
+//        imports.add(generatedImport);
+//        String comment = "Source Table: " + introspectedTable.getFullyQualifiedTable().toString();
+//        method.addAnnotation(getGeneratedAnnotation(comment));
+    }
+
+    @Override
+    public void addGeneralMethodAnnotation(Method method, IntrospectedTable introspectedTable,
+                                           IntrospectedColumn introspectedColumn, Set<FullyQualifiedJavaType> imports) {
+//        imports.add(generatedImport);
+//        String comment = "Source field: "
+//                + introspectedTable.getFullyQualifiedTable().toString() + "."
+//                + introspectedColumn.getActualColumnName();
+//        method.addAnnotation(getGeneratedAnnotation(comment));
+    }
+
+    @Override
+    public void addFieldAnnotation(Field field, IntrospectedTable introspectedTable,
+                                   Set<FullyQualifiedJavaType> imports) {
+//        imports.add(generatedImport);
+//        String comment = "Source Table: " + introspectedTable.getFullyQualifiedTable().toString();
+//        field.addAnnotation(getGeneratedAnnotation(comment));
+    }
+
+    @Override
+    public void addFieldAnnotation(Field field, IntrospectedTable introspectedTable,
+                                   IntrospectedColumn introspectedColumn, Set<FullyQualifiedJavaType> imports) {
+//        imports.add(generatedImport);
+//        String comment = "Source field: "
+//                + introspectedTable.getFullyQualifiedTable().toString() + "."
+//                + introspectedColumn.getActualColumnName();
+//        field.addAnnotation(getGeneratedAnnotation(comment));
+
+        if (!suppressAllComments && addRemarkComments) {
+            String remarks = introspectedColumn.getRemarks();
+            if (addRemarkComments && StringUtility.stringHasValue(remarks)) {
+                field.addJavaDocLine("/**"); 
+                String[] remarkLines = remarks.split(System.lineSeparator());
+                for (String remarkLine : remarkLines) {
+                    field.addJavaDocLine(" *   " + remarkLine); 
+                }
+                field.addJavaDocLine(" */"); 
+            }
+        }
+    }
+
+    @Override
+    public void addClassAnnotation(InnerClass innerClass, IntrospectedTable introspectedTable,
+                                   Set<FullyQualifiedJavaType> imports) {
+//        imports.add(generatedImport);
+//        String comment = "Source Table: " + introspectedTable.getFullyQualifiedTable().toString();
+//        innerClass.addAnnotation(getGeneratedAnnotation(comment));
+    }
+
+    private String getGeneratedAnnotation(String comment) {
+        StringBuilder buffer = new StringBuilder();
+        buffer.append("@Generated("); 
+        if (suppressAllComments) {
+            buffer.append('\"');
+        } else {
+            buffer.append("value=\""); 
+        }
+
+        buffer.append(MyBatisGenerator.class.getName());
+        buffer.append('\"');
+
+        if (!suppressDate && !suppressAllComments) {
+            buffer.append(", date=\""); 
+            buffer.append(DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(ZonedDateTime.now()));
+            buffer.append('\"');
+        }
+
+        if (!suppressAllComments) {
+            buffer.append(", comments=\""); 
+            buffer.append(comment);
+            buffer.append('\"');
+        }
+
+        buffer.append(')');
+        return buffer.toString();
+    }
+
+    @Override
+    public void addFileComment(KotlinFile kotlinFile) {
+        if (suppressAllComments) {
+            return;
+        }
+
+        kotlinFile.addFileCommentLine("/*"); 
+        kotlinFile.addFileCommentLine(" * Auto-generated file. Created by MyBatis Generator"); 
+        if (!suppressDate) {
+            kotlinFile.addFileCommentLine(" * Generation date: " 
+                    + DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(ZonedDateTime.now()));
+        }
+        kotlinFile.addFileCommentLine(" */"); 
+    }
+
+}

ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/mybatis/gen/RyasMyBatisDynamicPlugin.java

@@ -5,6 +5,7 @@ import org.mybatis.generator.api.PluginAdapter;
 import org.mybatis.generator.api.dom.java.FullyQualifiedJavaType;
 import org.mybatis.generator.api.dom.java.Interface;
 import org.mybatis.generator.api.dom.java.Method;
+import org.mybatis.generator.api.dom.java.TopLevelClass;
 import org.mybatis.generator.internal.util.StringUtility;
 
 import java.util.List;
@@ -15,6 +16,8 @@ import java.util.List;
  */
 public class RyasMyBatisDynamicPlugin extends PluginAdapter {
 
+    private String modelClassName;
+
     // 校验插件配置的正确性
     @Override
     public boolean validate(List<String> warnings) {
@@ -26,6 +29,13 @@ public class RyasMyBatisDynamicPlugin extends PluginAdapter {
         return true;
     }
 
+    @Override
+    public boolean modelBaseRecordClassGenerated(TopLevelClass topLevelClass, IntrospectedTable introspectedTable) {
+        // 获取模型类的完整名称
+        modelClassName = topLevelClass.getType().getShortName();
+        return true;
+    }
+
     // int insert(UnitInfo row)
     @Override
     public boolean clientInsertMethodGenerated(Method method, Interface interfaze, IntrospectedTable introspectedTable) {
@@ -82,7 +92,7 @@ public class RyasMyBatisDynamicPlugin extends PluginAdapter {
         //从头插入，所以需要倒着
         bodyLines.addFirst("}");
         bodyLines.addFirst("row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());");
-        bodyLines.addFirst("for (UnitInfo row : records) {");
+        bodyLines.addFirst("for (" + modelClassName + " row : records) {");
     }
 
     private void setForUpdate(Method method, Interface interfaze) {

ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java

@@ -9,12 +9,11 @@ import com.ruoyi.system.api.domain.SysOperLog;
 
 /**
  * 异步调用日志服务
- * 
+ *
  * @author ruoyi
  */
 @Service
-public class AsyncLogService
+public class AsyncLogService {
-{
     @Autowired
     private RemoteLogService remoteLogService;
 
@@ -22,8 +21,7 @@ public class AsyncLogService
      * 保存系统日志记录
      */
     @Async
-    public void saveSysLog(SysOperLog sysOperLog) throws Exception
+    public void saveSysLog(SysOperLog sysOperLog) throws Exception {
-    {
         remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
     }
 }

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)
+    public static boolean isSuperColumn(String tplCategory, String javaField) {
-    {
+        if (isTree(tplCategory)) {
-        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)
+###foreach ($column in $columns)
-#if($column.javaField == 'createTime')
+###if($column.javaField == 'createTime')
-        ${className}.setCreateTime(DateUtils.getNowDate());
+##        ${className}.setCreateTime(DateUtils.getNowDate());
-#end
+###end
-#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)
+###foreach ($column in $columns)
-#if($column.javaField == 'updateTime')
+###if($column.javaField == 'updateTime')
-        ${className}.setUpdateTime(DateUtils.getNowDate());
+##        ${className}.setUpdateTime(DateUtils.getNowDate());
-#end
+###end
-#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")
+    @RequiresPermissions("wms:UnitInfo:export")
-//    @Log(title = "单位信息管理", businessType = BusinessType.EXPORT)
+    @Log(title = "单位信息管理", businessType = BusinessType.EXPORT)
-//    @PostMapping("/export")
+    @PostMapping("/export")
-//    public void export(HttpServletResponse response, UnitInfo unitInfo)
+    public void export(HttpServletResponse response, UnitInfo unitInfo) {
-//    {
+        List<UnitInfo> list = unitInfoService.selectUnitInfoList(unitInfo);
-//        List<UnitInfo> list = unitInfoService.selectUnitInfoList(unitInfo);
+        ExcelUtil<UnitInfo> util = new ExcelUtil<>(UnitInfo.class);
-//        ExcelUtil<UnitInfo> util = new ExcelUtil<>(UnitInfo.class);
+        util.exportExcel(response, list, "单位信息管理数据");
-//        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 java.util.Collection;
-import org.apache.ibatis.annotations.*;
+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 org.mybatis.dynamic.sql.util.mybatis3.CommonCountMapper;
-
+import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper;
-import java.util.Collection;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper;
-import java.util.List;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper;
-import java.util.Optional;
+import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
-
-import static com.ruoyi.wms.mapper.UnitInfoDynamicSqlSupport.*;
-import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
 
 @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, deptId, unitName, remark1, remark2, remark3, remark4, remark5, updateCount, deleteFlag, createBy, createTime, updateBy, updateTime, remark);
-    BasicColumn[] selectList = BasicColumn.columnList(unitCode, 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>

ruoyi-ui/src/api/wms/GoodsType.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询物品类型管理列表
+export function listGoodsType(query) {
+  return request({
+    url: '/wms/GoodsType/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询物品类型管理详细
+export function getGoodsType(goodsTypeCd) {
+  return request({
+    url: '/wms/GoodsType/' + goodsTypeCd,
+    method: 'get'
+  })
+}
+
+// 新增物品类型管理
+export function addGoodsType(data) {
+  return request({
+    url: '/wms/GoodsType',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改物品类型管理
+export function updateGoodsType(data) {
+  return request({
+    url: '/wms/GoodsType',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除物品类型管理
+export function delGoodsType(goodsTypeCd) {
+  return request({
+    url: '/wms/GoodsType/' + goodsTypeCd,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/wms/WarehouseInfo.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询仓库基础信息列表
+export function listWarehouseInfo(query) {
+  return request({
+    url: '/wms/WarehouseInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询仓库基础信息详细
+export function getWarehouseInfo(whsCd) {
+  return request({
+    url: '/wms/WarehouseInfo/' + whsCd,
+    method: 'get'
+  })
+}
+
+// 新增仓库基础信息
+export function addWarehouseInfo(data) {
+  return request({
+    url: '/wms/WarehouseInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改仓库基础信息
+export function updateWarehouseInfo(data) {
+  return request({
+    url: '/wms/WarehouseInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除仓库基础信息
+export function delWarehouseInfo(whsCd) {
+  return request({
+    url: '/wms/WarehouseInfo/' + whsCd,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/index.vue

@@ -4,15 +4,15 @@
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
         <h2>RYAS后台管理框架</h2>
         <p>
-         此后台管理系统基于Ruoyi开源基盘（v{{ version }}）
+         此后台管理系统基于开源基盘Ruoyi（v{{ version }}）
         </p>
         <p>
           已从原本的Ruoyi全面升级：
         </p>
         <ul>
-          <li>Java8 -> Java21</li>
+          <li>Java 8 升级到 Java 21</li>
-          <li>SpringBoot 2.7 -> SpringBoot 3.1</li>
+          <li>SpringBoot 2.7 升级到 SpringBoot 3.1</li>
-          <li>SpringCloud 2020.x -> SpringCloud 2023.0.5</li>
+          <li>SpringCloud 2020.x 升级到 SpringCloud 2023.0.5</li>
         </ul>
       </el-col>
 

ruoyi-ui/src/views/login.vue

@@ -59,7 +59,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © {{ new Date().getFullYear() }} RYAS All Rights Reserved.</span>
     </div>
   </div>
 </template>

ruoyi-ui/src/views/wms/GoodsType/index.vue

@@ -0,0 +1,258 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="物品类型编码" prop="goodsTypeCd">
+        <el-input
+          v-model="queryParams.goodsTypeCd"
+          placeholder="请输入物品类型编码"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物品类型名称" prop="goodsTypeName">
+        <el-input
+          v-model="queryParams.goodsTypeName"
+          placeholder="请输入物品类型名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['wms:GoodsType:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['wms:GoodsType:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['wms:GoodsType:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['wms:GoodsType:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="GoodsTypeList" @selection-change="handleSelectionChange" show-overflow-tooltip="true">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="物品类型编码" align="center" prop="goodsTypeCd" />
+      <el-table-column label="物品类型名称" align="center" prop="goodsTypeName" />
+      <el-table-column label="备注" align="center" prop="remark1" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:GoodsType:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:GoodsType:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改物品类型管理对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="GoodsTypeRef" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="物品类型名称" prop="goodsTypeName">
+          <el-input v-model="form.goodsTypeName" placeholder="请输入物品类型名称" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark1">
+          <el-input v-model="form.remark1" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="GoodsType">
+import { listGoodsType, getGoodsType, delGoodsType, addGoodsType, updateGoodsType } from "@/api/wms/GoodsType";
+
+const { proxy } = getCurrentInstance();
+
+const GoodsTypeList = ref([]);
+const open = ref(false);
+const loading = ref(false);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    goodsTypeCd: null,
+    goodsTypeName: null,
+    remark1: null,
+  },
+  rules: {
+    goodsTypeName: [
+      { required: true, message: "物品类型名称不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询物品类型管理列表 */
+function getList() {
+  loading.value = true;
+  listGoodsType(queryParams.value).then(response => {
+    GoodsTypeList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    deptId: null,
+    goodsTypeCd: null,
+    goodsTypeName: null,
+    remark1: null,
+    remark2: null,
+    remark3: null,
+    remark4: null,
+    remark5: null,
+    updateCount: null,
+    deleteFlag: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    remark: null
+  };
+  proxy.resetForm("GoodsTypeRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.goodsTypeCd);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加物品类型管理";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _goodsTypeCd = row.goodsTypeCd || ids.value
+  getGoodsType(_goodsTypeCd).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改物品类型管理";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["GoodsTypeRef"].validate(valid => {
+    if (valid) {
+      if (form.value.goodsTypeCd != null) {
+        updateGoodsType(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addGoodsType(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _goodsTypeCds = row.goodsTypeCd || ids.value;
+  proxy.$modal.confirm('是否确认删除物品类型管理编号为"' + _goodsTypeCds + '"的数据项？').then(function() {
+    return delGoodsType(_goodsTypeCds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('wms/GoodsType/export', {
+    ...queryParams.value
+  }, `GoodsType_${new Date().getTime()}.xlsx`)
+}
+
+//页面打开时查询
+//getList();
+</script>

ruoyi-ui/src/views/wms/UnitInfo/index.vue

@@ -65,11 +65,11 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="UnitInfoList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="UnitInfoList" @selection-change="handleSelectionChange" show-overflow-tooltip="true">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="单位代码" align="center" prop="unitCode" />
       <el-table-column label="单位名称" align="center" prop="unitName" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注" align="center" prop="remark1" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:UnitInfo:edit']">修改</el-button>
@@ -92,8 +92,8 @@
         <el-form-item label="单位名称" prop="unitName">
           <el-input v-model="form.unitName" placeholder="请输入单位名称" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
+        <el-form-item label="备注" prop="remark1">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.remark1" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <template #footer>

ruoyi-ui/src/views/wms/WarehouseInfo/index.vue

@@ -0,0 +1,318 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="仓库代码" prop="whsCd">
+        <el-input
+          v-model="queryParams.whsCd"
+          placeholder="请输入仓库代码"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库名称" prop="whsName">
+        <el-input
+          v-model="queryParams.whsName"
+          placeholder="请输入仓库名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['wms:WarehouseInfo:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['wms:WarehouseInfo:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['wms:WarehouseInfo:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['wms:WarehouseInfo:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="WarehouseInfoList" @selection-change="handleSelectionChange" show-overflow-tooltip="true">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="仓库代码" align="center" prop="whsCd" />
+      <el-table-column label="仓库名称" align="center" prop="whsName" />
+      <el-table-column label="仓库类型代码" align="center" prop="whsTypeCd" />
+      <el-table-column label="缩写" align="center" prop="abbr" />
+      <el-table-column label="地址1" align="center" prop="addr1" />
+      <el-table-column label="地址2" align="center" prop="addr2" />
+      <el-table-column label="地址3" align="center" prop="addr3" />
+      <el-table-column label="联系电话" align="center" prop="phoneNo" />
+      <el-table-column label="邮编" align="center" prop="zipCd" />
+      <el-table-column label="联系邮箱" align="center" prop="email" />
+      <el-table-column label="传真号" align="center" prop="faxNo" />
+      <el-table-column label="负责人" align="center" prop="respPerson" />
+      <el-table-column label="区域" align="center" prop="area" />
+      <el-table-column label="租赁费用" align="center" prop="rentalFee" />
+      <el-table-column label="存储费用" align="center" prop="storingFee" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:WarehouseInfo:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:WarehouseInfo:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改仓库基础信息对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="WarehouseInfoRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="仓库名称" prop="whsName">
+          <el-input v-model="form.whsName" placeholder="请输入仓库名称" />
+        </el-form-item>
+        <el-form-item label="仓库类型代码" prop="whsTypeCd">
+          <el-input v-model="form.whsTypeCd" placeholder="请输入仓库类型代码" />
+        </el-form-item>
+        <el-form-item label="缩写" prop="abbr">
+          <el-input v-model="form.abbr" placeholder="请输入缩写" />
+        </el-form-item>
+        <el-form-item label="地址1" prop="addr1">
+          <el-input v-model="form.addr1" placeholder="请输入地址1" />
+        </el-form-item>
+        <el-form-item label="地址2" prop="addr2">
+          <el-input v-model="form.addr2" placeholder="请输入地址2" />
+        </el-form-item>
+        <el-form-item label="地址3" prop="addr3">
+          <el-input v-model="form.addr3" placeholder="请输入地址3" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="phoneNo">
+          <el-input v-model="form.phoneNo" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="邮编" prop="zipCd">
+          <el-input v-model="form.zipCd" placeholder="请输入邮编" />
+        </el-form-item>
+        <el-form-item label="联系邮箱" prop="email">
+          <el-input v-model="form.email" placeholder="请输入联系邮箱" />
+        </el-form-item>
+        <el-form-item label="传真号" prop="faxNo">
+          <el-input v-model="form.faxNo" placeholder="请输入传真号" />
+        </el-form-item>
+        <el-form-item label="负责人" prop="respPerson">
+          <el-input v-model="form.respPerson" placeholder="请输入负责人" />
+        </el-form-item>
+        <el-form-item label="区域" prop="area">
+          <el-input v-model="form.area" placeholder="请输入区域" />
+        </el-form-item>
+        <el-form-item label="租赁费用" prop="rentalFee">
+          <el-input-number v-model="form.rentalFee" placeholder="请输入租赁费用" :precision="2"/>
+        </el-form-item>
+        <el-form-item label="存储费用" prop="storingFee">
+          <el-input-number v-model="form.storingFee" placeholder="请输入存储费用" :precision="2"/>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="WarehouseInfo">
+import { listWarehouseInfo, getWarehouseInfo, delWarehouseInfo, addWarehouseInfo, updateWarehouseInfo } from "@/api/wms/WarehouseInfo";
+
+const { proxy } = getCurrentInstance();
+
+const WarehouseInfoList = ref([]);
+const open = ref(false);
+const loading = ref(false);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    whsCd: null,
+    whsName: null,
+  },
+  rules: {
+    whsName: [
+      { required: true, message: "仓库名称不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询仓库基础信息列表 */
+function getList() {
+  loading.value = true;
+  listWarehouseInfo(queryParams.value).then(response => {
+    WarehouseInfoList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    deptId: null,
+    whsCd: null,
+    whsName: null,
+    whsTypeCd: null,
+    abbr: null,
+    addr1: null,
+    addr2: null,
+    addr3: null,
+    phoneNo: null,
+    zipCd: null,
+    email: null,
+    faxNo: null,
+    respPerson: null,
+    area: null,
+    rentalFee: null,
+    storingFee: null,
+    remark1: null,
+    remark2: null,
+    remark3: null,
+    remark4: null,
+    remark5: null,
+    updateCount: null,
+    deleteFlag: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    remark: null
+  };
+  proxy.resetForm("WarehouseInfoRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.whsCd);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加仓库基础信息";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _whsCd = row.whsCd || ids.value
+  getWarehouseInfo(_whsCd).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改仓库基础信息";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["WarehouseInfoRef"].validate(valid => {
+    if (valid) {
+      if (form.value.whsCd != null) {
+        updateWarehouseInfo(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addWarehouseInfo(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _whsCds = row.whsCd || ids.value;
+  proxy.$modal.confirm('是否确认删除仓库基础信息编号为"' + _whsCds + '"的数据项？').then(function() {
+    return delWarehouseInfo(_whsCds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('wms/WarehouseInfo/export', {
+    ...queryParams.value
+  }, `WarehouseInfo_${new Date().getTime()}.xlsx`)
+}
+
+//页面打开时查询
+//getList();
+</script>

sql/ry-cloud-ryas.sql

@@ -4,47 +4,117 @@
  Source Server         : MySQL (CIT1)
  Source Server Type    : MySQL
  Source Server Version : 80200 (8.2.0)
- Source Host           : 122.51.246.158:10300
+ Source Host           :
  Source Schema         : ry-cloud
 
  Target Server Type    : MySQL
  Target Server Version : 80200 (8.2.0)
  File Encoding         : 65001
 
- Date: 02/02/2024 18:45:15
+ Date: 18/02/2024 16:52:33
 */
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
 -- ----------------------------
--- Table structure for SF_WMS_M_UNIT_INFO
+-- Table structure for WMS_M_GOODS_TYPE_INFO
+-- ----------------------------
+DROP TABLE IF EXISTS `WMS_M_GOODS_TYPE_INFO`;
+CREATE TABLE `WMS_M_GOODS_TYPE_INFO`  (
+  `DEPT_ID` int NOT NULL DEFAULT 100 COMMENT '从属部门ID',
+  `GOODS_TYPE_CD` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '物品类型编码',
+  `GOODS_TYPE_NAME` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '物品类型名称',
+  `REMARK_1` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注1',
+  `REMARK_2` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注2',
+  `REMARK_3` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注3',
+  `REMARK_4` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注4',
+  `REMARK_5` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注5',
+  `UPDATE_COUNT` int NOT NULL DEFAULT 0 COMMENT '更新次数',
+  `DELETE_FLAG` int NOT NULL DEFAULT 0 COMMENT '更新次数',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`GOODS_TYPE_CD`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '物品类型表' ROW_FORMAT = Dynamic;
+
 -- ----------------------------
-DROP TABLE IF EXISTS `SF_WMS_M_UNIT_INFO`;
+-- Records of WMS_M_GOODS_TYPE_INFO
-CREATE TABLE `SF_WMS_M_UNIT_INFO`  (
+-- ----------------------------
-  `ORG_CD` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+INSERT INTO `WMS_M_GOODS_TYPE_INFO` VALUES (100, '6448700363265', '重金属原材料', NULL, NULL, NULL, NULL, NULL, 0, 0, '1', '2024-02-18 16:37:38', '1', '2024-02-18 16:37:38', NULL);
-  `UNIT` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+INSERT INTO `WMS_M_GOODS_TYPE_INFO` VALUES (100, '6448704094721', '金属成品', 'qwe', NULL, NULL, NULL, NULL, 3, 0, '1', '2024-02-18 16:38:07', '1', '2024-02-18 16:38:19', NULL);
-  `UNIT_NAME` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+
-  `UNIT_CONV_RATE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+-- ----------------------------
-  `SRC_CONV_UNIT` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+-- Table structure for WMS_M_UNIT_INFO
+-- ----------------------------
+DROP TABLE IF EXISTS `WMS_M_UNIT_INFO`;
+CREATE TABLE `WMS_M_UNIT_INFO`  (
+  `DEPT_ID` int NOT NULL DEFAULT 100 COMMENT '从属部门ID',
+  `UNIT_CODE` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '单位代码',
+  `UNIT_NAME` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '单位名称',
+  `REMARK_1` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注1',
+  `REMARK_2` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注2',
+  `REMARK_3` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注3',
+  `REMARK_4` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注4',
+  `REMARK_5` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注5',
+  `UPDATE_COUNT` int NOT NULL DEFAULT 0 COMMENT '更新次数',
+  `DELETE_FLAG` int NOT NULL DEFAULT 0 COMMENT '删除标志',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`UNIT_CODE`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '单位基础信息表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of WMS_M_UNIT_INFO
+-- ----------------------------
+INSERT INTO `WMS_M_UNIT_INFO` VALUES (100, '6314680921729', '个', 'qwe', NULL, NULL, NULL, NULL, 2, 0, '1', '2024-02-06 13:47:11', '1', '2024-02-18 15:05:16', NULL);
+INSERT INTO `WMS_M_UNIT_INFO` VALUES (100, '6314687617154', '把', NULL, NULL, NULL, NULL, NULL, 0, 0, '1', '2024-02-06 13:48:03', '1', '2024-02-06 14:05:37', NULL);
+
+-- ----------------------------
+-- Table structure for WMS_M_WAREHOUSE_INFO
+-- ----------------------------
+DROP TABLE IF EXISTS `WMS_M_WAREHOUSE_INFO`;
+CREATE TABLE `WMS_M_WAREHOUSE_INFO`  (
+  `DEPT_ID` int NOT NULL DEFAULT 100 COMMENT '从属部门ID',
+  `WHS_CD` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '仓库代码',
+  `WHS_NAME` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '仓库名称',
+  `WHS_TYPE_CD` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '仓库类型代码',
+  `ABBR` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '缩写',
+  `ADDR_1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '地址1',
+  `ADDR_2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '地址2',
+  `ADDR_3` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '地址3',
+  `PHONE_NO` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '联系电话',
+  `ZIP_CD` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '邮编',
+  `EMAIL` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '联系邮箱',
+  `FAX_NO` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '传真号',
+  `RESP_PERSON` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '负责人',
+  `AREA` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '区域',
+  `RENTAL_FEE` decimal(18, 6) NULL DEFAULT NULL COMMENT '租赁费用',
+  `STORING_FEE` decimal(18, 6) NULL DEFAULT NULL COMMENT '存储费用',
   `REMARK_1` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
   `REMARK_2` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
   `REMARK_3` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
   `REMARK_4` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
   `REMARK_5` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
-  `UPDATE_COUNT` int NOT NULL DEFAULT 0,
+  `UPDATE_COUNT` int NOT NULL DEFAULT 0 COMMENT '更新次数',
-  `DELETE_FLAG` int NOT NULL DEFAULT 0,
+  `DELETE_FLAG` int NOT NULL DEFAULT 0 COMMENT '删除标志',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '创建者',
   `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '更新者',
   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注',
-  PRIMARY KEY (`ORG_CD`, `UNIT`) USING BTREE
+  PRIMARY KEY (`WHS_CD`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '仓库基础信息表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
--- Records of SF_WMS_M_UNIT_INFO
+-- Records of WMS_M_WAREHOUSE_INFO
 -- ----------------------------
+INSERT INTO `WMS_M_WAREHOUSE_INFO` VALUES (100, '6448763241089', '仓库1', 'NORMAL', 'WH1', 'Flat 25, 12/F apartment and floor no. Acacia Building', '', NULL, '08524785441', '200001', '', NULL, '张三', 'Singapore', 17500.000000, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, '1', '2024-02-18 16:45:49', '1', '2024-02-18 16:45:49', NULL);
 
 -- ----------------------------
 -- Table structure for gen_table
@@ -74,12 +144,14 @@ CREATE TABLE `gen_table`  (
   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`table_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of gen_table
 -- ----------------------------
-INSERT INTO `gen_table` VALUES (5, 'SF_WMS_M_UNIT_INFO', '单位信息', NULL, NULL, 'UnitInfo', 'crud', 'element-plus', 'mybatis-dynamic', 'com.ruoyi.wms', 'wms', 'wms', '单位信息管理', 'ruoyi', '0', '/', '{\"parentMenuId\":2000}', 'admin', '2024-02-02 10:40:41', '', '2024-02-02 10:42:03', NULL);
+INSERT INTO `gen_table` VALUES (9, 'WMS_M_UNIT_INFO', '单位基础信息表', NULL, NULL, 'UnitInfo', 'crud', 'element-plus', 'mybatis-dynamic', 'com.ruoyi.wms', 'wms', 'UnitInfo', '单位信息管理', 'ryas', '0', '/', '{\"parentMenuId\":\"2000\"}', 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:26', NULL);
+INSERT INTO `gen_table` VALUES (10, 'WMS_M_GOODS_TYPE_INFO', '物品类型表', NULL, NULL, 'GoodsType', 'crud', 'element-plus', 'mybatis-dynamic', 'com.ruoyi.wms', 'wms', 'GoodsType', '物品类型管理', 'ryas', '0', '/', '{\"parentMenuId\":\"2000\"}', 'admin', '2024-02-18 07:27:46', '', '2024-02-18 08:17:23', NULL);
+INSERT INTO `gen_table` VALUES (12, 'WMS_M_WAREHOUSE_INFO', '仓库基础信息表', NULL, NULL, 'WarehouseInfo', 'crud', 'element-plus', 'mybatis-dynamic', 'com.ruoyi.wms', 'wms', 'WarehouseInfo', '仓库基础信息', 'ryas', '0', '/', '{\"parentMenuId\":2000}', 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04', NULL);
 
 -- ----------------------------
 -- Table structure for gen_table_column
@@ -109,28 +181,69 @@ CREATE TABLE `gen_table_column`  (
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '更新者',
   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`column_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 88 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表字段' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 226 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表字段' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of gen_table_column
 -- ----------------------------
-INSERT INTO `gen_table_column` VALUES (71, 5, 'ORG_CD', NULL, 'varchar(25)', 'String', 'orgCd', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:03');
+INSERT INTO `gen_table_column` VALUES (132, 9, 'DEPT_ID', '从属部门ID', 'int', 'Long', 'deptId', '0', '0', '0', '0', '0', '0', '0', 'EQ', 'input', '', 1, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:26');
-INSERT INTO `gen_table_column` VALUES (72, 5, 'UNIT', NULL, 'varchar(25)', 'String', 'unit', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 2, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (133, 9, 'UNIT_CODE', '单位代码', 'varchar(25)', 'String', 'unitCode', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 2, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:26');
-INSERT INTO `gen_table_column` VALUES (73, 5, 'UNIT_NAME', NULL, 'varchar(10)', 'String', 'unitName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 3, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (134, 9, 'UNIT_NAME', '单位名称', 'varchar(10)', 'String', 'unitName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 3, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:26');
-INSERT INTO `gen_table_column` VALUES (74, 5, 'UNIT_CONV_RATE', NULL, 'varchar(100)', 'String', 'unitConvRate', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 4, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (135, 9, 'REMARK_1', '备注1', 'varchar(100)', 'String', 'remark1', '0', '0', NULL, '1', '1', '1', '1', 'LIKE', 'input', '', 4, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:26');
-INSERT INTO `gen_table_column` VALUES (75, 5, 'SRC_CONV_UNIT', NULL, 'varchar(25)', 'String', 'srcConvUnit', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 5, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (136, 9, 'REMARK_2', '备注2', 'varchar(100)', 'String', 'remark2', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 5, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:26');
-INSERT INTO `gen_table_column` VALUES (76, 5, 'REMARK_1', NULL, 'varchar(100)', 'String', 'remark1', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 6, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (137, 9, 'REMARK_3', '备注3', 'varchar(100)', 'String', 'remark3', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 6, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:27');
-INSERT INTO `gen_table_column` VALUES (77, 5, 'REMARK_2', NULL, 'varchar(100)', 'String', 'remark2', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 7, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (138, 9, 'REMARK_4', '备注4', 'varchar(100)', 'String', 'remark4', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 7, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:27');
-INSERT INTO `gen_table_column` VALUES (78, 5, 'REMARK_3', NULL, 'varchar(100)', 'String', 'remark3', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 8, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (139, 9, 'REMARK_5', '备注5', 'varchar(100)', 'String', 'remark5', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 8, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:27');
-INSERT INTO `gen_table_column` VALUES (79, 5, 'REMARK_4', NULL, 'varchar(100)', 'String', 'remark4', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 9, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (140, 9, 'UPDATE_COUNT', '更新次数', 'int', 'Long', 'updateCount', '0', '0', '0', '0', '0', '0', '0', 'EQ', 'input', '', 9, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:27');
-INSERT INTO `gen_table_column` VALUES (80, 5, 'REMARK_5', NULL, 'varchar(100)', 'String', 'remark5', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 10, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (141, 9, 'DELETE_FLAG', '删除标志', 'int', 'Long', 'deleteFlag', '0', '0', '0', '0', '0', '0', '0', 'EQ', 'input', '', 10, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:27');
-INSERT INTO `gen_table_column` VALUES (81, 5, 'UPDATE_COUNT', NULL, 'int', 'Long', 'updateCount', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 11, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (142, 9, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '0', NULL, NULL, NULL, 'EQ', 'input', '', 11, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:27');
-INSERT INTO `gen_table_column` VALUES (82, 5, 'DELETE_FLAG', NULL, 'int', 'Long', 'deleteFlag', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 12, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (143, 9, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '0', NULL, NULL, NULL, 'EQ', 'datetime', '', 12, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:27');
-INSERT INTO `gen_table_column` VALUES (83, 5, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 13, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (144, 9, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '0', '0', NULL, NULL, 'EQ', 'input', '', 13, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:27');
-INSERT INTO `gen_table_column` VALUES (84, 5, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 14, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (145, 9, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '0', '0', NULL, NULL, 'EQ', 'datetime', '', 14, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:27');
-INSERT INTO `gen_table_column` VALUES (85, 5, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 15, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (146, 9, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, '0', '0', '0', NULL, 'EQ', 'textarea', '', 15, 'admin', '2024-02-18 07:22:15', '', '2024-02-18 08:07:27');
-INSERT INTO `gen_table_column` VALUES (86, 5, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 16, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (147, 10, 'DEPT_ID', '从属部门ID', 'int', 'Long', 'deptId', '0', '0', '0', '0', '0', '0', '0', 'EQ', 'input', '', 1, 'admin', '2024-02-18 07:27:46', '', '2024-02-18 08:17:23');
-INSERT INTO `gen_table_column` VALUES (87, 5, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'textarea', '', 17, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
+INSERT INTO `gen_table_column` VALUES (148, 10, 'GOODS_TYPE_CD', '物品类型编码', 'varchar(100)', 'String', 'goodsTypeCd', '1', '0', NULL, '1', NULL, NULL, '1', 'EQ', 'input', '', 2, 'admin', '2024-02-18 07:27:46', '', '2024-02-18 08:17:23');
+INSERT INTO `gen_table_column` VALUES (149, 10, 'GOODS_TYPE_NAME', '物品类型名称', 'varchar(100)', 'String', 'goodsTypeName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 3, 'admin', '2024-02-18 07:27:46', '', '2024-02-18 08:17:23');
+INSERT INTO `gen_table_column` VALUES (150, 10, 'REMARK_1', '备注1', 'varchar(100)', 'String', 'remark1', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 4, 'admin', '2024-02-18 07:27:46', '', '2024-02-18 08:17:23');
+INSERT INTO `gen_table_column` VALUES (151, 10, 'REMARK_2', '备注2', 'varchar(100)', 'String', 'remark2', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 5, 'admin', '2024-02-18 07:27:46', '', '2024-02-18 08:17:23');
+INSERT INTO `gen_table_column` VALUES (152, 10, 'REMARK_3', '备注3', 'varchar(100)', 'String', 'remark3', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 6, 'admin', '2024-02-18 07:27:46', '', '2024-02-18 08:17:23');
+INSERT INTO `gen_table_column` VALUES (153, 10, 'REMARK_4', '备注4', 'varchar(100)', 'String', 'remark4', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 7, 'admin', '2024-02-18 07:27:46', '', '2024-02-18 08:17:23');
+INSERT INTO `gen_table_column` VALUES (154, 10, 'REMARK_5', NULL, 'varchar(100)', 'String', 'remark5', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 8, 'admin', '2024-02-18 07:27:46', '', '2024-02-18 08:17:23');
+INSERT INTO `gen_table_column` VALUES (155, 10, 'UPDATE_COUNT', '更新次数', 'int', 'Long', 'updateCount', '0', '0', '0', '0', '0', '0', '0', 'EQ', 'input', '', 9, 'admin', '2024-02-18 07:27:46', '', '2024-02-18 08:17:23');
+INSERT INTO `gen_table_column` VALUES (156, 10, 'DELETE_FLAG', '更新次数', 'int', 'Long', 'deleteFlag', '0', '0', '0', '0', '0', '0', '0', 'EQ', 'input', '', 10, 'admin', '2024-02-18 07:27:46', '', '2024-02-18 08:17:23');
+INSERT INTO `gen_table_column` VALUES (157, 10, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '0', NULL, NULL, NULL, 'EQ', 'input', '', 11, 'admin', '2024-02-18 07:27:46', '', '2024-02-18 08:17:24');
+INSERT INTO `gen_table_column` VALUES (158, 10, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '0', NULL, NULL, NULL, 'EQ', 'datetime', '', 12, 'admin', '2024-02-18 07:27:47', '', '2024-02-18 08:17:24');
+INSERT INTO `gen_table_column` VALUES (159, 10, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '0', '0', NULL, NULL, 'EQ', 'input', '', 13, 'admin', '2024-02-18 07:27:47', '', '2024-02-18 08:17:24');
+INSERT INTO `gen_table_column` VALUES (160, 10, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '0', '0', NULL, NULL, 'EQ', 'datetime', '', 14, 'admin', '2024-02-18 07:27:47', '', '2024-02-18 08:17:24');
+INSERT INTO `gen_table_column` VALUES (161, 10, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, '0', '0', '0', NULL, 'EQ', 'textarea', '', 15, 'admin', '2024-02-18 07:27:47', '', '2024-02-18 08:17:24');
+INSERT INTO `gen_table_column` VALUES (198, 12, 'DEPT_ID', '从属部门ID', 'int', 'Long', 'deptId', '0', '0', '0', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (199, 12, 'WHS_CD', '仓库代码', 'varchar(25)', 'String', 'whsCd', '1', '0', NULL, '1', NULL, NULL, '1', 'EQ', 'input', '', 2, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (200, 12, 'WHS_NAME', '仓库名称', 'varchar(100)', 'String', 'whsName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 3, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (201, 12, 'WHS_TYPE_CD', '仓库类型代码', 'varchar(25)', 'String', 'whsTypeCd', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 4, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (202, 12, 'ABBR', '缩写', 'varchar(100)', 'String', 'abbr', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 5, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (203, 12, 'ADDR_1', '地址1', 'varchar(255)', 'String', 'addr1', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 6, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (204, 12, 'ADDR_2', '地址2', 'varchar(255)', 'String', 'addr2', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 7, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (205, 12, 'ADDR_3', '地址3', 'varchar(255)', 'String', 'addr3', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 8, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (206, 12, 'PHONE_NO', '联系电话', 'varchar(100)', 'String', 'phoneNo', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 9, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (207, 12, 'ZIP_CD', '邮编', 'varchar(25)', 'String', 'zipCd', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 10, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (208, 12, 'EMAIL', '联系邮箱', 'varchar(100)', 'String', 'email', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 11, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (209, 12, 'FAX_NO', '传真号', 'varchar(100)', 'String', 'faxNo', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 12, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (210, 12, 'RESP_PERSON', '负责人', 'varchar(10)', 'String', 'respPerson', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 13, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (211, 12, 'AREA', '区域', 'varchar(100)', 'String', 'area', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 14, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (212, 12, 'RENTAL_FEE', '租赁费用', 'decimal(18,6)', 'BigDecimal', 'rentalFee', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 15, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (213, 12, 'STORING_FEE', '存储费用', 'decimal(18,6)', 'BigDecimal', 'storingFee', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 16, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (214, 12, 'REMARK_1', NULL, 'varchar(100)', 'String', 'remark1', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 17, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (215, 12, 'REMARK_2', NULL, 'varchar(100)', 'String', 'remark2', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 18, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (216, 12, 'REMARK_3', NULL, 'varchar(100)', 'String', 'remark3', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 19, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:04');
+INSERT INTO `gen_table_column` VALUES (217, 12, 'REMARK_4', NULL, 'varchar(100)', 'String', 'remark4', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 20, 'admin', '2024-02-18 08:02:20', '', '2024-02-18 08:07:05');
+INSERT INTO `gen_table_column` VALUES (218, 12, 'REMARK_5', NULL, 'varchar(100)', 'String', 'remark5', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 21, 'admin', '2024-02-18 08:02:21', '', '2024-02-18 08:07:05');
+INSERT INTO `gen_table_column` VALUES (219, 12, 'UPDATE_COUNT', '更新次数', 'int', 'Long', 'updateCount', '0', '0', '0', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 22, 'admin', '2024-02-18 08:02:21', '', '2024-02-18 08:07:05');
+INSERT INTO `gen_table_column` VALUES (220, 12, 'DELETE_FLAG', '删除标志', 'int', 'Long', 'deleteFlag', '0', '0', '0', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 23, 'admin', '2024-02-18 08:02:21', '', '2024-02-18 08:07:05');
+INSERT INTO `gen_table_column` VALUES (221, 12, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 24, 'admin', '2024-02-18 08:02:21', '', '2024-02-18 08:07:05');
+INSERT INTO `gen_table_column` VALUES (222, 12, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 25, 'admin', '2024-02-18 08:02:21', '', '2024-02-18 08:07:05');
+INSERT INTO `gen_table_column` VALUES (223, 12, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 26, 'admin', '2024-02-18 08:02:21', '', '2024-02-18 08:07:05');
+INSERT INTO `gen_table_column` VALUES (224, 12, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 27, 'admin', '2024-02-18 08:02:21', '', '2024-02-18 08:07:05');
+INSERT INTO `gen_table_column` VALUES (225, 12, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'textarea', '', 28, 'admin', '2024-02-18 08:02:21', '', '2024-02-18 08:07:05');
 
 -- ----------------------------
 -- Table structure for sys_common
@@ -366,31 +479,11 @@ CREATE TABLE `sys_logininfor`  (
   PRIMARY KEY (`info_id`) USING BTREE,
   INDEX `idx_sys_logininfor_s`(`status` ASC) USING BTREE,
   INDEX `idx_sys_logininfor_lt`(`access_time` ASC) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 120 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '系统访问记录' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 133 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '系统访问记录' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_logininfor
 -- ----------------------------
-INSERT INTO `sys_logininfor` VALUES (100, 'admin', '127.0.0.1', '0', '登录成功', '2024-01-30 06:14:23');
-INSERT INTO `sys_logininfor` VALUES (101, 'admin', '127.0.0.1', '0', '登录成功', '2024-01-31 05:45:31');
-INSERT INTO `sys_logininfor` VALUES (102, 'admin', '127.0.0.1', '0', '登录成功', '2024-01-31 06:02:52');
-INSERT INTO `sys_logininfor` VALUES (103, 'admin', '127.0.0.1', '0', '登录成功', '2024-01-31 06:06:25');
-INSERT INTO `sys_logininfor` VALUES (104, 'admin', '127.0.0.1', '0', '登录成功', '2024-01-31 06:12:41');
-INSERT INTO `sys_logininfor` VALUES (105, 'admin', '127.0.0.1', '0', '退出成功', '2024-01-31 09:18:53');
-INSERT INTO `sys_logininfor` VALUES (106, 'admin', '127.0.0.1', '0', '登录成功', '2024-01-31 09:19:02');
-INSERT INTO `sys_logininfor` VALUES (107, 'admin', '127.0.0.1', '0', '退出成功', '2024-01-31 09:47:21');
-INSERT INTO `sys_logininfor` VALUES (108, 'admin', '127.0.0.1', '0', '登录成功', '2024-01-31 09:47:30');
-INSERT INTO `sys_logininfor` VALUES (109, 'admin', '127.0.0.1', '0', '退出成功', '2024-01-31 09:47:39');
-INSERT INTO `sys_logininfor` VALUES (110, 'admin', '127.0.0.1', '0', '登录成功', '2024-02-01 06:39:26');
-INSERT INTO `sys_logininfor` VALUES (111, 'admin', '127.0.0.1', '0', '退出成功', '2024-02-01 08:07:08');
-INSERT INTO `sys_logininfor` VALUES (112, 'admin', '127.0.0.1', '0', '登录成功', '2024-02-01 08:07:23');
-INSERT INTO `sys_logininfor` VALUES (113, 'admin', '127.0.0.1', '0', '退出成功', '2024-02-01 08:07:29');
-INSERT INTO `sys_logininfor` VALUES (114, 'admin', '127.0.0.1', '0', '登录成功', '2024-02-01 08:07:49');
-INSERT INTO `sys_logininfor` VALUES (115, 'admin', '127.0.0.1', '0', '退出成功', '2024-02-01 08:08:54');
-INSERT INTO `sys_logininfor` VALUES (116, 'admin', '127.0.0.1', '0', '登录成功', '2024-02-01 08:32:24');
-INSERT INTO `sys_logininfor` VALUES (117, 'admin', '127.0.0.1', '0', '登录成功', '2024-02-01 08:39:20');
-INSERT INTO `sys_logininfor` VALUES (118, 'admin', '127.0.0.1', '0', '退出成功', '2024-02-01 08:45:48');
-INSERT INTO `sys_logininfor` VALUES (119, 'admin', '127.0.0.1', '0', '登录成功', '2024-02-02 06:47:11');
 
 -- ----------------------------
 -- Table structure for sys_menu
@@ -417,7 +510,7 @@ CREATE TABLE `sys_menu`  (
   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '备注',
   PRIMARY KEY (`menu_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2001 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '菜单权限表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 2025 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '菜单权限表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_menu
@@ -506,6 +599,24 @@ INSERT INTO `sys_menu` VALUES (1058, '导入代码', 115, 2, '#', '', '', 1, 0,
 INSERT INTO `sys_menu` VALUES (1059, '预览代码', 115, 4, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 'admin', '2024-01-30 05:05:40', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (1060, '生成代码', 115, 5, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 'admin', '2024-01-30 05:05:40', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (2000, '基础信息', 0, 20, 'masterData', NULL, NULL, 1, 0, 'M', '0', '0', '', 'dict', 'admin', '2024-02-02 09:13:06', 'admin', '2024-02-02 09:13:43', '');
+INSERT INTO `sys_menu` VALUES (2007, '单位信息管理', 2000, 1, 'UnitInfo', 'wms/UnitInfo/index', NULL, 1, 0, 'C', '0', '0', 'wms:UnitInfo:list', 'build', 'admin', '2024-02-05 08:26:48', 'admin', '2024-02-05 08:34:07', '单位信息管理菜单');
+INSERT INTO `sys_menu` VALUES (2008, '单位信息管理查询', 2007, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:UnitInfo:query', '#', 'admin', '2024-02-05 08:26:48', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2009, '单位信息管理新增', 2007, 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:UnitInfo:add', '#', 'admin', '2024-02-05 08:26:48', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2010, '单位信息管理修改', 2007, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:UnitInfo:edit', '#', 'admin', '2024-02-05 08:26:48', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2011, '单位信息管理删除', 2007, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:UnitInfo:remove', '#', 'admin', '2024-02-05 08:26:48', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2012, '单位信息管理导出', 2007, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:UnitInfo:export', '#', 'admin', '2024-02-05 08:26:48', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2013, '物品类型管理', 2000, 1, 'GoodsType', 'wms/GoodsType/index', NULL, 1, 0, 'C', '0', '0', 'wms:GoodsType:list', 'tree', 'admin', '2024-02-18 08:18:08', '1', '2024-02-18 08:39:45', '物品类型管理菜单');
+INSERT INTO `sys_menu` VALUES (2014, '物品类型管理查询', 2013, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:GoodsType:query', '#', 'admin', '2024-02-18 08:18:08', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2015, '物品类型管理新增', 2013, 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:GoodsType:add', '#', 'admin', '2024-02-18 08:18:08', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2016, '物品类型管理修改', 2013, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:GoodsType:edit', '#', 'admin', '2024-02-18 08:18:08', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2017, '物品类型管理删除', 2013, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:GoodsType:remove', '#', 'admin', '2024-02-18 08:18:08', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2018, '物品类型管理导出', 2013, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:GoodsType:export', '#', 'admin', '2024-02-18 08:18:08', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2019, '仓库基础信息', 2000, 1, 'WarehouseInfo', 'wms/WarehouseInfo/index', NULL, 1, 0, 'C', '0', '0', 'wms:WarehouseInfo:list', 'build', 'admin', '2024-02-18 08:34:10', '1', '2024-02-18 08:40:03', '仓库基础信息菜单');
+INSERT INTO `sys_menu` VALUES (2020, '仓库基础信息查询', 2019, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:WarehouseInfo:query', '#', 'admin', '2024-02-18 08:34:10', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2021, '仓库基础信息新增', 2019, 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:WarehouseInfo:add', '#', 'admin', '2024-02-18 08:34:10', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2022, '仓库基础信息修改', 2019, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:WarehouseInfo:edit', '#', 'admin', '2024-02-18 08:34:10', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2023, '仓库基础信息删除', 2019, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:WarehouseInfo:remove', '#', 'admin', '2024-02-18 08:34:10', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2024, '仓库基础信息导出', 2019, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:WarehouseInfo:export', '#', 'admin', '2024-02-18 08:34:10', '', NULL, '');
 
 -- ----------------------------
 -- Table structure for sys_notice
@@ -557,53 +668,11 @@ CREATE TABLE `sys_oper_log`  (
   INDEX `idx_sys_oper_log_bt`(`business_type` ASC) USING BTREE,
   INDEX `idx_sys_oper_log_s`(`status` ASC) USING BTREE,
   INDEX `idx_sys_oper_log_ot`(`oper_time` ASC) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 142 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '操作日志记录' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 201 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '操作日志记录' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_oper_log
 -- ----------------------------
-INSERT INTO `sys_oper_log` VALUES (100, '用户管理', 2, 'com.ruoyi.system.controller.SysUserController.edit()', 'PUT', 1, 'admin', NULL, '/user', '127.0.0.1', '', '{\"admin\":false,\"avatar\":\"\",\"createBy\":\"admin\",\"createTime\":\"2024-01-30 05:05:40\",\"delFlag\":\"0\",\"dept\":{\"ancestors\":\"0,100,101\",\"children\":[],\"deptId\":105,\"deptName\":\"测试部门\",\"leader\":\"若依\",\"orderNum\":3,\"params\":{},\"parentId\":101,\"status\":\"0\"},\"deptId\":105,\"email\":\"ry@qq.com\",\"loginDate\":\"2024-01-30 05:05:40\",\"loginIp\":\"127.0.0.1\",\"nickName\":\"若依\",\"params\":{},\"phonenumber\":\"15666661234\",\"postIds\":[2],\"remark\":\"测试员\",\"roleIds\":[2],\"roles\":[{\"admin\":false,\"dataScope\":\"2\",\"deptCheckStrictly\":false,\"flag\":false,\"menuCheckStrictly\":false,\"params\":{},\"roleId\":2,\"roleKey\":\"common\",\"roleName\":\"普通角色\",\"roleSort\":2,\"status\":\"0\"}],\"sex\":\"1\",\"status\":\"0\",\"updateBy\":\"admin\",\"userId\":2,\"userName\":\"ry\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 06:13:09', 292);
-INSERT INTO `sys_oper_log` VALUES (101, '角色管理', 2, 'com.ruoyi.system.controller.SysRoleController.edit()', 'PUT', 1, 'admin', NULL, '/role', '127.0.0.1', '', '{\"admin\":false,\"createTime\":\"2024-01-30 05:05:40\",\"dataScope\":\"2\",\"delFlag\":\"0\",\"deptCheckStrictly\":true,\"flag\":false,\"menuCheckStrictly\":true,\"menuIds\":[1,100,1000,1001,1002,1003,1004,1005,1006,101,1007,1008,1009,1010,1011,102,1012,1013,1014,1015,103,1016,1017,1018,1019,104,1020,1021,1022,1023,1024,105,1025,1026,1027,1028,1029,106,1030,1031,1032,1033,1034,107,1035,1036,1037,1038,108,500,1039,1040,1041,501,1042,1043,1044,1045,2,109,1046,1047,1048,110,1049,1050,1051,1052,1053,1054,111,112,113,3,114,115,1055,1058,1056,1057,1059,1060,116],\"params\":{},\"remark\":\"普通角色\",\"roleId\":2,\"roleKey\":\"common\",\"roleName\":\"普通角色\",\"roleSort\":2,\"status\":\"0\",\"updateBy\":\"admin\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 06:48:15', 156);
-INSERT INTO `sys_oper_log` VALUES (102, '菜单管理', 3, 'com.ruoyi.system.controller.SysMenuController.remove()', 'DELETE', 1, 'admin', NULL, '/menu/4', '127.0.0.1', '', '{}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 06:48:24', 65);
-INSERT INTO `sys_oper_log` VALUES (103, '个人信息', 2, 'com.ruoyi.system.controller.SysProfileController.updateProfile()', 'PUT', 1, 'admin', NULL, '/user/profile', '127.0.0.1', '', '{\"admin\":false,\"email\":\"admin@ryas.com\",\"nickName\":\"管理员\",\"params\":{},\"phonenumber\":\"15888888888\",\"sex\":\"1\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 06:49:46', 161);
-INSERT INTO `sys_oper_log` VALUES (104, '用户管理', 2, 'com.ruoyi.system.controller.SysUserController.edit()', 'PUT', 1, 'admin', NULL, '/user', '127.0.0.1', '', '{\"admin\":false,\"avatar\":\"\",\"createBy\":\"admin\",\"createTime\":\"2024-01-30 05:05:40\",\"delFlag\":\"0\",\"dept\":{\"ancestors\":\"0,100,101\",\"children\":[],\"deptId\":105,\"deptName\":\"测试部门\",\"leader\":\"若依\",\"orderNum\":3,\"params\":{},\"parentId\":101,\"status\":\"0\"},\"deptId\":105,\"email\":\"ry@ryas.com\",\"loginDate\":\"2024-01-30 05:05:40\",\"loginIp\":\"127.0.0.1\",\"nickName\":\"若依\",\"params\":{},\"phonenumber\":\"15666661234\",\"postIds\":[2],\"remark\":\"测试员\",\"roleIds\":[2],\"roles\":[{\"admin\":false,\"dataScope\":\"2\",\"deptCheckStrictly\":false,\"flag\":false,\"menuCheckStrictly\":false,\"params\":{},\"roleId\":2,\"roleKey\":\"common\",\"roleName\":\"普通角色\",\"roleSort\":2,\"status\":\"0\"}],\"sex\":\"1\",\"status\":\"0\",\"updateBy\":\"admin\",\"userId\":2,\"userName\":\"ry\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 06:50:04', 298);
-INSERT INTO `sys_oper_log` VALUES (105, '部门管理', 2, 'com.ruoyi.system.controller.SysDeptController.edit()', 'PUT', 1, 'admin', NULL, '/dept', '127.0.0.1', '', '{\"ancestors\":\"0\",\"children\":[],\"createBy\":\"admin\",\"createTime\":\"2024-01-30 05:05:40\",\"delFlag\":\"0\",\"deptId\":100,\"deptName\":\"RYAS科技\",\"email\":\"ry@qq.com\",\"leader\":\"若依\",\"orderNum\":0,\"params\":{},\"parentId\":0,\"phone\":\"15888888888\",\"status\":\"0\",\"updateBy\":\"admin\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 06:50:32', 64);
-INSERT INTO `sys_oper_log` VALUES (106, '代码生成', 6, 'com.ruoyi.gen.controller.GenController.importTableSave()', 'POST', 1, 'admin', NULL, '/gen/importTable', '127.0.0.1', '', '{\"tables\":\"sys_user\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 07:06:18', 673);
-INSERT INTO `sys_oper_log` VALUES (107, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"sys_user\"}', NULL, 0, NULL, '2024-01-31 07:06:35', 328);
-INSERT INTO `sys_oper_log` VALUES (108, '在线用户', 7, 'com.ruoyi.system.controller.SysUserOnlineController.forceLogout()', 'DELETE', 1, 'admin', NULL, '/online/c4162f46-426e-4a0c-89f7-c22833733e6a', '127.0.0.1', '', '{}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 07:29:30', 5);
-INSERT INTO `sys_oper_log` VALUES (109, '在线用户', 7, 'com.ruoyi.system.controller.SysUserOnlineController.forceLogout()', 'DELETE', 1, 'admin', NULL, '/online/23d1b863-75c6-4fde-bb75-dbc0c60edb90', '127.0.0.1', '', '{}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 07:29:33', 1);
-INSERT INTO `sys_oper_log` VALUES (110, '在线用户', 7, 'com.ruoyi.system.controller.SysUserOnlineController.forceLogout()', 'DELETE', 1, 'admin', NULL, '/online/40f17282-b982-4954-825f-bffb9c28edd0', '127.0.0.1', '', '{}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 07:29:45', 1);
-INSERT INTO `sys_oper_log` VALUES (111, '定时任务', 2, 'com.ruoyi.job.controller.SysJobController.edit()', 'PUT', 1, 'admin', NULL, '/job', '127.0.0.1', '', '{\"concurrent\":\"1\",\"createBy\":\"admin\",\"createTime\":\"2024-01-30 05:05:41\",\"cronExpression\":\"0/10 * * * * ?\",\"invokeTarget\":\"ryTask.ryNoParams\",\"jobGroup\":\"DEFAULT\",\"jobId\":1,\"jobName\":\"系统默认（无参）1\",\"misfirePolicy\":\"3\",\"nextValidTime\":\"2024-01-31 17:19:50\",\"params\":{},\"remark\":\"\",\"status\":\"1\",\"updateBy\":\"admin\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 09:19:48', 259);
-INSERT INTO `sys_oper_log` VALUES (112, '代码生成', 3, 'com.ruoyi.gen.controller.GenController.remove()', 'DELETE', 1, 'admin', NULL, '/gen/1', '127.0.0.1', '', '{}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 06:47:31', 337);
-INSERT INTO `sys_oper_log` VALUES (113, '代码生成', 6, 'com.ruoyi.gen.controller.GenController.importTableSave()', 'POST', 1, 'admin', NULL, '/gen/importTable', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 06:49:28', 1660);
-INSERT INTO `sys_oper_log` VALUES (114, '代码生成', 2, 'com.ruoyi.gen.controller.GenController.editSave()', 'PUT', 1, 'admin', NULL, '/gen', '127.0.0.1', '', '{\"businessName\":\"UnitInfo\",\"className\":\"UnitInfo\",\"columns\":[{\"capJavaField\":\"OrgCd\",\"columnId\":20,\"columnName\":\"ORG_CD\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"orgCd\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":1,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"UNIT\",\"columnId\":21,\"columnName\":\"UNIT\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"UNIT\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":2,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"UnitName\",\"columnId\":22,\"columnName\":\"UNIT_NAME\",\"columnType\":\"varchar(10)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitName\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"LIKE\",\"required\":true,\"sort\":3,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"UnitConvRate\",\"columnId\":23,\"columnName\":\"UNIT_CONV_RATE\",\"columnType\":\"varchar(100)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitConvRate\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"EQ\",\"required\":true,\"sort\":4,\"superColumn\":fal', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 06:51:22', 2374);
-INSERT INTO `sys_oper_log` VALUES (115, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 06:51:58', 432);
-INSERT INTO `sys_oper_log` VALUES (116, '代码生成', 2, 'com.ruoyi.gen.controller.GenController.editSave()', 'PUT', 1, 'admin', NULL, '/gen', '127.0.0.1', '', '{\"businessName\":\"UnitInfo\",\"className\":\"UnitInfo\",\"columns\":[{\"capJavaField\":\"OrgCd\",\"columnId\":20,\"columnName\":\"ORG_CD\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"orgCd\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":1,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"updateTime\":\"2024-02-02 06:51:20\",\"usableColumn\":false},{\"capJavaField\":\"UNIT\",\"columnId\":21,\"columnName\":\"UNIT\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"UNIT\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":2,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"updateTime\":\"2024-02-02 06:51:20\",\"usableColumn\":false},{\"capJavaField\":\"UnitName\",\"columnId\":22,\"columnName\":\"UNIT_NAME\",\"columnType\":\"varchar(10)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitName\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"LIKE\",\"required\":true,\"sort\":3,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"updateTime\":\"2024-02-02 06:51:20\",\"usableColumn\":false},{\"capJavaField\":\"UnitConvRate\",\"columnId\":23,\"columnName\":\"UNIT_CONV_RATE\",\"columnType\":\"varchar(100)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitConvRate\",\"javaType\":\"String\",\"l', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 08:40:19', 1198);
-INSERT INTO `sys_oper_log` VALUES (117, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 08:40:32', 351);
-INSERT INTO `sys_oper_log` VALUES (118, '菜单管理', 1, 'com.ruoyi.system.controller.SysMenuController.add()', 'POST', 1, 'admin', NULL, '/menu', '127.0.0.1', '', '{\"children\":[],\"createBy\":\"admin\",\"icon\":\"dict\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuName\":\"基础信息\",\"menuType\":\"M\",\"orderNum\":100,\"params\":{},\"parentId\":0,\"path\":\"masterData\",\"status\":\"0\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 09:13:06', 91);
-INSERT INTO `sys_oper_log` VALUES (119, '菜单管理', 2, 'com.ruoyi.system.controller.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/menu', '127.0.0.1', '', '{\"children\":[],\"createTime\":\"2024-01-30 05:05:40\",\"icon\":\"system\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuId\":1,\"menuName\":\"系统管理\",\"menuType\":\"M\",\"orderNum\":100,\"params\":{},\"parentId\":0,\"path\":\"system\",\"perms\":\"\",\"query\":\"\",\"status\":\"0\",\"updateBy\":\"admin\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 09:13:20', 94);
-INSERT INTO `sys_oper_log` VALUES (120, '菜单管理', 2, 'com.ruoyi.system.controller.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/menu', '127.0.0.1', '', '{\"children\":[],\"createTime\":\"2024-01-30 05:05:40\",\"icon\":\"monitor\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuId\":2,\"menuName\":\"系统监控\",\"menuType\":\"M\",\"orderNum\":200,\"params\":{},\"parentId\":0,\"path\":\"monitor\",\"perms\":\"\",\"query\":\"\",\"status\":\"0\",\"updateBy\":\"admin\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 09:13:26', 111);
-INSERT INTO `sys_oper_log` VALUES (121, '菜单管理', 2, 'com.ruoyi.system.controller.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/menu', '127.0.0.1', '', '{\"children\":[],\"createTime\":\"2024-01-30 05:05:40\",\"icon\":\"tool\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuId\":3,\"menuName\":\"系统工具\",\"menuType\":\"M\",\"orderNum\":300,\"params\":{},\"parentId\":0,\"path\":\"tool\",\"perms\":\"\",\"query\":\"\",\"status\":\"0\",\"updateBy\":\"admin\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 09:13:31', 71);
-INSERT INTO `sys_oper_log` VALUES (122, '菜单管理', 2, 'com.ruoyi.system.controller.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/menu', '127.0.0.1', '', '{\"children\":[],\"createTime\":\"2024-02-02 09:13:06\",\"icon\":\"dict\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuId\":2000,\"menuName\":\"基础信息\",\"menuType\":\"M\",\"orderNum\":20,\"params\":{},\"parentId\":0,\"path\":\"masterData\",\"perms\":\"\",\"status\":\"0\",\"updateBy\":\"admin\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 09:13:43', 109);
-INSERT INTO `sys_oper_log` VALUES (123, '代码生成', 2, 'com.ruoyi.gen.controller.GenController.editSave()', 'PUT', 1, 'admin', NULL, '/gen', '127.0.0.1', '', '{\"businessName\":\"UnitInfo\",\"className\":\"UnitInfo\",\"columns\":[{\"capJavaField\":\"OrgCd\",\"columnId\":20,\"columnName\":\"ORG_CD\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"orgCd\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":1,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"updateTime\":\"2024-02-02 08:40:18\",\"usableColumn\":false},{\"capJavaField\":\"UNIT\",\"columnId\":21,\"columnName\":\"UNIT\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"UNIT\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":2,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"updateTime\":\"2024-02-02 08:40:18\",\"usableColumn\":false},{\"capJavaField\":\"UnitName\",\"columnId\":22,\"columnName\":\"UNIT_NAME\",\"columnType\":\"varchar(10)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitName\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"LIKE\",\"required\":true,\"sort\":3,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"updateTime\":\"2024-02-02 08:40:18\",\"usableColumn\":false},{\"capJavaField\":\"UnitConvRate\",\"columnId\":23,\"columnName\":\"UNIT_CONV_RATE\",\"columnType\":\"varchar(100)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitConvRate\",\"javaType\":\"String\",\"l', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 09:14:12', 1291);
-INSERT INTO `sys_oper_log` VALUES (124, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 09:14:17', 252);
-INSERT INTO `sys_oper_log` VALUES (125, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 09:14:41', 110);
-INSERT INTO `sys_oper_log` VALUES (126, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 09:16:58', 966);
-INSERT INTO `sys_oper_log` VALUES (127, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 09:47:06', 68678);
-INSERT INTO `sys_oper_log` VALUES (128, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:22:38', 1125);
-INSERT INTO `sys_oper_log` VALUES (129, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:24:13', 13105);
-INSERT INTO `sys_oper_log` VALUES (130, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:25:48', 368);
-INSERT INTO `sys_oper_log` VALUES (131, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:28:38', 742);
-INSERT INTO `sys_oper_log` VALUES (132, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:31:51', 675);
-INSERT INTO `sys_oper_log` VALUES (133, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:34:29', 104);
-INSERT INTO `sys_oper_log` VALUES (134, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:35:10', 678);
-INSERT INTO `sys_oper_log` VALUES (135, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:37:33', 23652);
-INSERT INTO `sys_oper_log` VALUES (136, '代码生成', 3, 'com.ruoyi.gen.controller.GenController.remove()', 'DELETE', 1, 'admin', NULL, '/gen/2', '127.0.0.1', '', '{}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 10:38:07', 214);
-INSERT INTO `sys_oper_log` VALUES (137, '代码生成', 6, 'com.ruoyi.gen.controller.GenController.importTableSave()', 'POST', 1, 'admin', NULL, '/gen/importTable', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 10:38:50', 30902);
-INSERT INTO `sys_oper_log` VALUES (138, '代码生成', 6, 'com.ruoyi.gen.controller.GenController.importTableSave()', 'POST', 1, 'admin', NULL, '/gen/importTable', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 10:39:44', 25132);
-INSERT INTO `sys_oper_log` VALUES (139, '代码生成', 6, 'com.ruoyi.gen.controller.GenController.importTableSave()', 'POST', 1, 'admin', NULL, '/gen/importTable', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 10:40:42', 847);
-INSERT INTO `sys_oper_log` VALUES (140, '代码生成', 2, 'com.ruoyi.gen.controller.GenController.editSave()', 'PUT', 1, 'admin', NULL, '/gen', '127.0.0.1', '', '{\"businessName\":\"wms\",\"className\":\"UnitInfo\",\"columns\":[{\"capJavaField\":\"OrgCd\",\"columnId\":71,\"columnName\":\"ORG_CD\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 10:40:42\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"orgCd\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":1,\"superColumn\":false,\"tableId\":5,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"Unit\",\"columnId\":72,\"columnName\":\"UNIT\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 10:40:42\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"unit\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":2,\"superColumn\":false,\"tableId\":5,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"UnitName\",\"columnId\":73,\"columnName\":\"UNIT_NAME\",\"columnType\":\"varchar(10)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 10:40:42\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitName\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"LIKE\",\"required\":true,\"sort\":3,\"superColumn\":false,\"tableId\":5,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"UnitConvRate\",\"columnId\":74,\"columnName\":\"UNIT_CONV_RATE\",\"columnType\":\"varchar(100)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 10:40:42\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitConvRate\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"EQ\",\"required\":true,\"sort\":4,\"superColumn\":false,\"t', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 10:42:04', 881);
-INSERT INTO `sys_oper_log` VALUES (141, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:42:11', 3415);
 
 -- ----------------------------
 -- Table structure for sys_post