支持自实现Quartz任务类

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java

@@ -1,31 +1,42 @@
 package com.ruoyi.common.core.constant;
 
+import lombok.Getter;
+
 /**
  * 任务调度通用常量
  *
  * @author ruoyi
  */
-public class ScheduleConstants
+public class ScheduleConstants {
-{
     public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
 
-    /** 执行目标key */
+    /**
+     * 执行目标key
+     */
     public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
 
-    /** 默认 */
+    /**
+     * 默认
+     */
     public static final String MISFIRE_DEFAULT = "0";
 
-    /** 立即触发执行 */
+    /**
+     * 立即触发执行
+     */
     public static final String MISFIRE_IGNORE_MISFIRES = "1";
 
-    /** 触发一次执行 */
+    /**
+     * 触发一次执行
+     */
     public static final String MISFIRE_FIRE_AND_PROCEED = "2";
 
-    /** 不触发立即执行 */
+    /**
+     * 不触发立即执行
+     */
     public static final String MISFIRE_DO_NOTHING = "3";
 
-    public enum Status
+    @Getter
-    {
+    public enum Status {
         /**
          * 正常
          */
@@ -35,16 +46,11 @@ public class ScheduleConstants
          */
         PAUSE("1");
 
-        private String value;
+        private final String value;
 
-        private Status(String value)
+        Status(String value) {
-        {
             this.value = value;
         }
 
-        public String getValue()
-        {
-            return value;
-        }
     }
 }

ruoyi-common/ruoyi-common-services/src/main/java/com/ruoyi/common/services/IJobDataLogService.java

@@ -0,0 +1,31 @@
+package com.ruoyi.common.services;
+
+import com.ruoyi.common.services.constants.JobLogStatus;
+import com.ruoyi.common.services.domain.JobDataLog;
+
+/**
+ * 定时任务数据日志服务接口
+ *
+ * @author Alan Scipio
+ * created on 2024/2/20
+ */
+public interface IJobDataLogService {
+
+    /**
+     * 添加日志
+     */
+    void addLog(JobDataLog log);
+
+    default void addLog(JobLogStatus status, String logType, String message) {
+        JobDataLog log = new JobDataLog();
+        log.setStatus(status.getCode() + "");
+        log.setLogType(logType);
+        log.setMessage(message);
+        addLog(log);
+    }
+
+    default void addLog(JobLogStatus status, String message) {
+        addLog(status, null, message);
+    }
+
+}

ruoyi-common/ruoyi-common-services/src/main/java/com/ruoyi/common/services/JobDataLogServiceImpl.java

@@ -0,0 +1,44 @@
+package com.ruoyi.common.services;
+
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.uuid.snowflake.SnowFlakeIdGenerator;
+import com.ruoyi.common.services.domain.JobDataLog;
+import com.ruoyi.common.services.mapper.JobDataLogMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 定时任务数据日志服务接口
+ *
+ * @author Alan Scipio
+ * created on 2024/2/20
+ */
+@Service
+public class JobDataLogServiceImpl implements IJobDataLogService {
+
+    @Resource
+    private JobDataLogMapper jobDataLogMapper;
+
+    @Override
+    public void addLog(JobDataLog log) {
+        if (StringUtils.isBlank(log.getMessage())) {
+            throw new IllegalArgumentException("message cannot be blank");
+        }
+        if (StringUtils.isBlank(log.getStatus())) {
+            throw new IllegalArgumentException("status cannot be blank");
+        }
+        if (log.getStatus().length() > 1) {
+            throw new IllegalArgumentException("status length must be 1");
+        }
+        if (log.getLogId() == null) {
+            log.setLogId(SnowFlakeIdGenerator.nextIdLong());
+        }
+        if (log.getJobClass() == null) {
+            StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
+            StackTraceElement caller = stackTraceElements[2];
+            log.setJobClass(caller.getClassName());
+            log.setJobMethod(caller.getMethodName());
+        }
+        jobDataLogMapper.insertSelective(log);
+    }
+}

ruoyi-common/ruoyi-common-services/src/main/java/com/ruoyi/common/services/constants/JobLogStatus.java

@@ -0,0 +1,24 @@
+package com.ruoyi.common.services.constants;
+
+import com.ruoyi.common.core.constant.IEnum;
+import lombok.Getter;
+
+/**
+ * @author Alan Scipio
+ * created on 2024/2/20
+ */
+@Getter
+public enum JobLogStatus implements IEnum {
+
+    SUCCESS(0, "正常执行"),
+
+    ERROR(1, "异常");
+
+    private final int code;
+    private final String name;
+
+    JobLogStatus(int code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+}

ruoyi-common/ruoyi-common-services/src/main/java/com/ruoyi/common/services/constants/SeqType.java

@@ -12,7 +12,7 @@ public enum SeqType implements IEnum {
 
     UNIT_CD(1, "UNIT", "单位代码"),
 
-    GOODE_TYPE_CD(2, "GT", "商品类型代码"),
+    ITEM_TYPE_CD(2, "ITYPE", "商品类型代码"),
 
     WHS_CD(3, "WHS", "仓库代码"),
 

ruoyi-common/ruoyi-common-services/src/main/java/com/ruoyi/common/services/domain/JobDataLog.java

@@ -0,0 +1,166 @@
+package com.ruoyi.common.services.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * This class was generated by MyBatis Generator.
+ *
+ * <ul>
+ *   <li> Table: sys_job_data_log </li>
+ *   <li> Remarks: 定时任务数据日志表 </li>
+ * </ul>
+ *
+ * @author ryas
+ * created on 2024-02-20
+ */
+public class JobDataLog extends BaseEntity implements Serializable {
+    /**
+     *   任务数据日志ID
+     */
+    private Long logId;
+
+    /**
+     *   执行开始时间
+     */
+    private Date startTime;
+
+    /**
+     *   执行结束时间
+     */
+    private Date endTime;
+
+    /**
+     *   日志内容
+     */
+    private String message;
+
+    /**
+     *   日志类型
+     */
+    private String logType;
+
+    /**
+     *   状态（0正常执行 1异常）
+     */
+    private String status;
+
+    /**
+     *   任务执行类
+     */
+    private String jobClass;
+
+    /**
+     *   任务执行方法名
+     */
+    private String jobMethod;
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    public static JobDataLog of(Date startTime, Date endTime, String message, String logType, String status, String jobClass, String jobMethod) {
+        JobDataLog jobDataLog = new JobDataLog();
+        jobDataLog.setStartTime(startTime);
+        jobDataLog.setEndTime(endTime);
+        jobDataLog.setMessage(message);
+        jobDataLog.setLogType(logType);
+        jobDataLog.setStatus(status);
+        jobDataLog.setJobClass(jobClass);
+        jobDataLog.setJobMethod(jobMethod);
+        return jobDataLog;
+    }
+
+    public static JobDataLog of(Date startTime, Date endTime, String message, String logType, String status) {
+        return of(startTime, endTime, message, logType, status, null, null);
+    }
+
+    public static JobDataLog of(String message, String logType, String status) {
+        return of(null, null, message, logType, status);
+    }
+
+    public Long getLogId() {
+        return logId;
+    }
+
+    public void setLogId(Long logId) {
+        this.logId = logId;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message == null ? null : message.trim();
+    }
+
+    public String getLogType() {
+        return logType;
+    }
+
+    public void setLogType(String logType) {
+        this.logType = logType == null ? null : logType.trim();
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public String getJobClass() {
+        return jobClass;
+    }
+
+    public void setJobClass(String jobClass) {
+        this.jobClass = jobClass == null ? null : jobClass.trim();
+    }
+
+    public String getJobMethod() {
+        return jobMethod;
+    }
+
+    public void setJobMethod(String jobMethod) {
+        this.jobMethod = jobMethod == null ? null : jobMethod.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", logId=").append(logId);
+        sb.append(", startTime=").append(startTime);
+        sb.append(", endTime=").append(endTime);
+        sb.append(", message=").append(message);
+        sb.append(", logType=").append(logType);
+        sb.append(", status=").append(status);
+        sb.append(", jobClass=").append(jobClass);
+        sb.append(", jobMethod=").append(jobMethod);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

ruoyi-common/ruoyi-common-services/src/main/java/com/ruoyi/common/services/mapper/JobDataLogDynamicSqlSupport.java

@@ -0,0 +1,108 @@
+package com.ruoyi.common.services.mapper;
+
+import org.mybatis.dynamic.sql.AliasableSqlTable;
+import org.mybatis.dynamic.sql.SqlColumn;
+
+import java.sql.JDBCType;
+import java.util.Date;
+
+public final class JobDataLogDynamicSqlSupport {
+    public static final JobDataLog jobDataLog = new JobDataLog();
+
+    /**
+     *   任务数据日志ID
+     */
+    public static final SqlColumn<Long> logId = jobDataLog.logId;
+
+    /**
+     *   执行开始时间
+     */
+    public static final SqlColumn<Date> startTime = jobDataLog.startTime;
+
+    /**
+     *   执行结束时间
+     */
+    public static final SqlColumn<Date> endTime = jobDataLog.endTime;
+
+    /**
+     *   日志内容
+     */
+    public static final SqlColumn<String> message = jobDataLog.message;
+
+    /**
+     *   日志类型
+     */
+    public static final SqlColumn<String> logType = jobDataLog.logType;
+
+    /**
+     *   状态（0正常执行 1异常）
+     */
+    public static final SqlColumn<String> status = jobDataLog.status;
+
+    /**
+     *   任务执行类
+     */
+    public static final SqlColumn<String> jobClass = jobDataLog.jobClass;
+
+    /**
+     *   任务执行方法名
+     */
+    public static final SqlColumn<String> jobMethod = jobDataLog.jobMethod;
+
+    /**
+     *   创建者
+     */
+    public static final SqlColumn<String> createBy = jobDataLog.createBy;
+
+    /**
+     *   创建时间
+     */
+    public static final SqlColumn<Date> createTime = jobDataLog.createTime;
+
+    /**
+     *   更新者
+     */
+    public static final SqlColumn<String> updateBy = jobDataLog.updateBy;
+
+    /**
+     *   更新时间
+     */
+    public static final SqlColumn<Date> updateTime = jobDataLog.updateTime;
+
+    /**
+     *   备注信息
+     */
+    public static final SqlColumn<String> remark = jobDataLog.remark;
+
+    public static final class JobDataLog extends AliasableSqlTable<JobDataLog> {
+        public final SqlColumn<Long> logId = column("log_id", JDBCType.BIGINT);
+
+        public final SqlColumn<Date> startTime = column("start_time", JDBCType.TIMESTAMP);
+
+        public final SqlColumn<Date> endTime = column("end_time", JDBCType.TIMESTAMP);
+
+        public final SqlColumn<String> message = column("message", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> logType = column("log_type", JDBCType.CHAR);
+
+        public final SqlColumn<String> status = column("status", JDBCType.CHAR);
+
+        public final SqlColumn<String> jobClass = column("job_class", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> jobMethod = column("job_method", JDBCType.VARCHAR);
+
+        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 JobDataLog() {
+            super("sys_job_data_log", JobDataLog::new);
+        }
+    }
+}

ruoyi-common/ruoyi-common-services/src/main/java/com/ruoyi/common/services/mapper/JobDataLogMapper.java

@@ -0,0 +1,215 @@
+package com.ruoyi.common.services.mapper;
+
+import com.ruoyi.common.security.utils.SecurityUtilsExt;
+import com.ruoyi.common.services.domain.JobDataLog;
+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.common.services.mapper.JobDataLogDynamicSqlSupport.*;
+import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
+
+@Mapper
+public interface JobDataLogMapper extends CommonCountMapper, CommonDeleteMapper, CommonInsertMapper<JobDataLog>, CommonUpdateMapper {
+    BasicColumn[] selectList = BasicColumn.columnList(logId, startTime, endTime, message, logType, status, jobClass, jobMethod, createBy, createTime, updateBy, updateTime, remark);
+
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @Results(id="JobDataLogResult", value = {
+        @Result(column="log_id", property="logId", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="start_time", property="startTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="end_time", property="endTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="message", property="message", jdbcType=JdbcType.VARCHAR),
+        @Result(column="log_type", property="logType", jdbcType=JdbcType.CHAR),
+        @Result(column="status", property="status", jdbcType=JdbcType.CHAR),
+        @Result(column="job_class", property="jobClass", jdbcType=JdbcType.VARCHAR),
+        @Result(column="job_method", property="jobMethod", jdbcType=JdbcType.VARCHAR),
+        @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<JobDataLog> selectMany(SelectStatementProvider selectStatement);
+
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @ResultMap("JobDataLogResult")
+    Optional<JobDataLog> selectOne(SelectStatementProvider selectStatement);
+
+    default long count(CountDSLCompleter completer) {
+        return MyBatis3Utils.countFrom(this::count, jobDataLog, completer);
+    }
+
+    default int delete(DeleteDSLCompleter completer) {
+        return MyBatis3Utils.deleteFrom(this::delete, jobDataLog, completer);
+    }
+
+    default int deleteByPrimaryKey(Long logId_) {
+        return delete(c -> 
+            c.where(logId, isEqualTo(logId_))
+        );
+    }
+
+    default int insert(JobDataLog row) {
+        row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
+        return MyBatis3Utils.insert(this::insert, row, jobDataLog, c ->
+            c.map(logId).toProperty("logId")
+            .map(startTime).toProperty("startTime")
+            .map(endTime).toProperty("endTime")
+            .map(message).toProperty("message")
+            .map(logType).toProperty("logType")
+            .map(status).toProperty("status")
+            .map(jobClass).toProperty("jobClass")
+            .map(jobMethod).toProperty("jobMethod")
+            .map(createBy).toProperty("createBy")
+            .map(createTime).toProperty("createTime")
+            .map(updateBy).toProperty("updateBy")
+            .map(updateTime).toProperty("updateTime")
+            .map(remark).toProperty("remark")
+        );
+    }
+
+    default int insertMultiple(Collection<JobDataLog> records) {
+        for (JobDataLog row : records) {
+            row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
+        }
+        return MyBatis3Utils.insertMultiple(this::insertMultiple, records, jobDataLog, c ->
+            c.map(logId).toProperty("logId")
+            .map(startTime).toProperty("startTime")
+            .map(endTime).toProperty("endTime")
+            .map(message).toProperty("message")
+            .map(logType).toProperty("logType")
+            .map(status).toProperty("status")
+            .map(jobClass).toProperty("jobClass")
+            .map(jobMethod).toProperty("jobMethod")
+            .map(createBy).toProperty("createBy")
+            .map(createTime).toProperty("createTime")
+            .map(updateBy).toProperty("updateBy")
+            .map(updateTime).toProperty("updateTime")
+            .map(remark).toProperty("remark")
+        );
+    }
+
+    default int insertSelective(JobDataLog row) {
+        row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
+        return MyBatis3Utils.insert(this::insert, row, jobDataLog, c ->
+            c.map(logId).toPropertyWhenPresent("logId", row::getLogId)
+            .map(startTime).toPropertyWhenPresent("startTime", row::getStartTime)
+            .map(endTime).toPropertyWhenPresent("endTime", row::getEndTime)
+            .map(message).toPropertyWhenPresent("message", row::getMessage)
+            .map(logType).toPropertyWhenPresent("logType", row::getLogType)
+            .map(status).toPropertyWhenPresent("status", row::getStatus)
+            .map(jobClass).toPropertyWhenPresent("jobClass", row::getJobClass)
+            .map(jobMethod).toPropertyWhenPresent("jobMethod", row::getJobMethod)
+            .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<JobDataLog> selectOne(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectOne(this::selectOne, selectList, jobDataLog, completer);
+    }
+
+    default List<JobDataLog> select(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectList(this::selectMany, selectList, jobDataLog, completer);
+    }
+
+    default List<JobDataLog> selectDistinct(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectDistinct(this::selectMany, selectList, jobDataLog, completer);
+    }
+
+    default Optional<JobDataLog> selectByPrimaryKey(Long logId_) {
+        return selectOne(c ->
+            c.where(logId, isEqualTo(logId_))
+        );
+    }
+
+    default int update(UpdateDSLCompleter completer) {
+        return MyBatis3Utils.update(this::update, jobDataLog, completer);
+    }
+
+    static UpdateDSL<UpdateModel> updateAllColumns(JobDataLog row, UpdateDSL<UpdateModel> dsl) {
+        return dsl.set(logId).equalTo(row::getLogId)
+                .set(startTime).equalTo(row::getStartTime)
+                .set(endTime).equalTo(row::getEndTime)
+                .set(message).equalTo(row::getMessage)
+                .set(logType).equalTo(row::getLogType)
+                .set(status).equalTo(row::getStatus)
+                .set(jobClass).equalTo(row::getJobClass)
+                .set(jobMethod).equalTo(row::getJobMethod)
+                .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(JobDataLog row, UpdateDSL<UpdateModel> dsl) {
+        row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr());
+        return dsl.set(logId).equalToWhenPresent(row::getLogId)
+                .set(startTime).equalToWhenPresent(row::getStartTime)
+                .set(endTime).equalToWhenPresent(row::getEndTime)
+                .set(message).equalToWhenPresent(row::getMessage)
+                .set(logType).equalToWhenPresent(row::getLogType)
+                .set(status).equalToWhenPresent(row::getStatus)
+                .set(jobClass).equalToWhenPresent(row::getJobClass)
+                .set(jobMethod).equalToWhenPresent(row::getJobMethod)
+                .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(JobDataLog row) {
+        return update(c ->
+            c.set(startTime).equalTo(row::getStartTime)
+            .set(endTime).equalTo(row::getEndTime)
+            .set(message).equalTo(row::getMessage)
+            .set(logType).equalTo(row::getLogType)
+            .set(status).equalTo(row::getStatus)
+            .set(jobClass).equalTo(row::getJobClass)
+            .set(jobMethod).equalTo(row::getJobMethod)
+            .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(logId, isEqualTo(row::getLogId))
+        );
+    }
+
+    default int updateByPrimaryKeySelective(JobDataLog row) {
+        row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr());
+        return update(c ->
+            c.set(startTime).equalToWhenPresent(row::getStartTime)
+            .set(endTime).equalToWhenPresent(row::getEndTime)
+            .set(message).equalToWhenPresent(row::getMessage)
+            .set(logType).equalToWhenPresent(row::getLogType)
+            .set(status).equalToWhenPresent(row::getStatus)
+            .set(jobClass).equalToWhenPresent(row::getJobClass)
+            .set(jobMethod).equalToWhenPresent(row::getJobMethod)
+            .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(logId, isEqualTo(row::getLogId))
+        );
+    }
+}

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java

@@ -16,6 +16,7 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class RuoYiFileApplication {
     public static void main(String[] args) {
+        System.setProperty("pagehelper.banner", "false"); //关闭pagehelper的banner
         SpringApplication.run(RuoYiFileApplication.class, args);
         System.out.println("(♥◠‿◠)ﾉﾞ  文件服务模块启动成功   ლ(´ڡ`ლ)ﾞ");
     }

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java

@@ -1,12 +1,5 @@
 package com.ruoyi.job.domain;
 
-import java.io.Serial;
-import java.util.Date;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
@@ -14,6 +7,13 @@ import com.ruoyi.common.core.constant.ScheduleConstants;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.job.util.CronUtils;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.io.Serial;
+import java.util.Date;
 
 /**
  * 定时任务调度表 sys_job
@@ -72,6 +72,12 @@ public class SysJob extends BaseEntity {
     @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
     private String status;
 
+    /**
+     * 自定义QuartzJob类
+     */
+    @Excel(name = "自定义QuartzJob类")
+    private String customJobClass;
+
     public Long getJobId() {
         return jobId;
     }
@@ -150,6 +156,14 @@ public class SysJob extends BaseEntity {
         this.status = status;
     }
 
+    public String getCustomJobClass() {
+        return customJobClass;
+    }
+
+    public void setCustomJobClass(String customJobClass) {
+        this.customJobClass = customJobClass;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -161,6 +175,7 @@ public class SysJob extends BaseEntity {
                 .append("misfirePolicy", getMisfirePolicy())
                 .append("concurrent", getConcurrent())
                 .append("status", getStatus())
+                .append("customJobClass", getCustomJobClass())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java

@@ -1,29 +1,29 @@
 package com.ruoyi.job.mapper;
 
-import java.util.List;
 import com.ruoyi.job.domain.SysJobLog;
 
+import java.util.List;
+
 /**
  * 调度任务日志信息 数据层
  *
  * @author ruoyi
  */
-public interface SysJobLogMapper
+public interface SysJobLogMapper {
-{
     /**
      * 获取quartz调度器日志的计划任务
      *
      * @param jobLog 调度日志信息
      * @return 调度任务日志集合
      */
-    public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
+    List<SysJobLog> selectJobLogList(SysJobLog jobLog);
 
     /**
      * 查询所有调度任务日志
      *
      * @return 调度任务日志列表
      */
-    public List<SysJobLog> selectJobLogAll();
+    List<SysJobLog> selectJobLogAll();
 
     /**
      * 通过调度任务日志ID查询调度信息
@@ -31,7 +31,7 @@ public interface SysJobLogMapper
      * @param jobLogId 调度任务日志ID
      * @return 调度任务日志对象信息
      */
-    public SysJobLog selectJobLogById(Long jobLogId);
+    SysJobLog selectJobLogById(Long jobLogId);
 
     /**
      * 新增任务日志
@@ -39,7 +39,7 @@ public interface SysJobLogMapper
      * @param jobLog 调度日志信息
      * @return 结果
      */
-    public int insertJobLog(SysJobLog jobLog);
+    int insertJobLog(SysJobLog jobLog);
 
     /**
      * 批量删除调度日志信息
@@ -47,7 +47,7 @@ public interface SysJobLogMapper
      * @param logIds 需要删除的数据ID
      * @return 结果
      */
-    public int deleteJobLogByIds(Long[] logIds);
+    int deleteJobLogByIds(Long[] logIds);
 
     /**
      * 删除任务日志
@@ -55,10 +55,10 @@ public interface SysJobLogMapper
      * @param jobId 调度日志ID
      * @return 结果
      */
-    public int deleteJobLogById(Long jobId);
+    int deleteJobLogById(Long jobId);
 
     /**
      * 清空任务日志
      */
-    public void cleanJobLog();
+    void cleanJobLog();
 }

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java

@@ -1,29 +1,29 @@
 package com.ruoyi.job.mapper;
 
-import java.util.List;
 import com.ruoyi.job.domain.SysJob;
 
+import java.util.List;
+
 /**
  * 调度任务信息 数据层
  *
  * @author ruoyi
  */
-public interface SysJobMapper
+public interface SysJobMapper {
-{
     /**
      * 查询调度任务日志集合
      *
      * @param job 调度信息
      * @return 操作日志集合
      */
-    public List<SysJob> selectJobList(SysJob job);
+    List<SysJob> selectJobList(SysJob job);
 
     /**
      * 查询所有调度任务
      *
      * @return 调度任务列表
      */
-    public List<SysJob> selectJobAll();
+    List<SysJob> selectJobAll();
 
     /**
      * 通过调度ID查询调度任务信息
@@ -31,7 +31,7 @@ public interface SysJobMapper
      * @param jobId 调度ID
      * @return 角色对象信息
      */
-    public SysJob selectJobById(Long jobId);
+    SysJob selectJobById(Long jobId);
 
     /**
      * 通过调度ID删除调度任务信息
@@ -39,7 +39,7 @@ public interface SysJobMapper
      * @param jobId 调度ID
      * @return 结果
      */
-    public int deleteJobById(Long jobId);
+    int deleteJobById(Long jobId);
 
     /**
      * 批量删除调度任务信息
@@ -47,7 +47,7 @@ public interface SysJobMapper
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteJobByIds(Long[] ids);
+    int deleteJobByIds(Long[] ids);
 
     /**
      * 修改调度任务信息
@@ -55,7 +55,7 @@ public interface SysJobMapper
      * @param job 调度任务信息
      * @return 结果
      */
-    public int updateJob(SysJob job);
+    int updateJob(SysJob job);
 
     /**
      * 新增调度任务信息
@@ -63,5 +63,5 @@ public interface SysJobMapper
      * @param job 调度任务信息
      * @return 结果
      */
-    public int insertJob(SysJob job);
+    int insertJob(SysJob job);
 }

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java

@@ -1,22 +1,22 @@
 package com.ruoyi.job.service;
 
-import java.util.List;
 import com.ruoyi.job.domain.SysJobLog;
 
+import java.util.List;
+
 /**
  * 定时任务调度日志信息信息 服务层
  *
  * @author ruoyi
  */
-public interface ISysJobLogService
+public interface ISysJobLogService {
-{
     /**
      * 获取quartz调度器日志的计划任务
      *
      * @param jobLog 调度日志信息
      * @return 调度任务日志集合
      */
-    public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
+    List<SysJobLog> selectJobLogList(SysJobLog jobLog);
 
     /**
      * 通过调度任务日志ID查询调度信息
@@ -24,14 +24,14 @@ public interface ISysJobLogService
      * @param jobLogId 调度任务日志ID
      * @return 调度任务日志对象信息
      */
-    public SysJobLog selectJobLogById(Long jobLogId);
+    SysJobLog selectJobLogById(Long jobLogId);
 
     /**
      * 新增任务日志
      *
      * @param jobLog 调度日志信息
      */
-    public void addJobLog(SysJobLog jobLog);
+    void addJobLog(SysJobLog jobLog);
 
     /**
      * 批量删除调度日志信息
@@ -39,7 +39,7 @@ public interface ISysJobLogService
      * @param logIds 需要删除的日志ID
      * @return 结果
      */
-    public int deleteJobLogByIds(Long[] logIds);
+    int deleteJobLogByIds(Long[] logIds);
 
     /**
      * 删除任务日志
@@ -47,10 +47,10 @@ public interface ISysJobLogService
      * @param jobId 调度日志ID
      * @return 结果
      */
-    public int deleteJobLogById(Long jobId);
+    int deleteJobLogById(Long jobId);
 
     /**
      * 清空任务日志
      */
-    public void cleanJobLog();
+    void cleanJobLog();
 }

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java

@@ -1,10 +1,11 @@
 package com.ruoyi.job.service;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.ruoyi.job.domain.SysJobLog;
 import com.ruoyi.job.mapper.SysJobLogMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 定时任务调度日志信息 服务层
@@ -12,9 +13,8 @@ import com.ruoyi.job.mapper.SysJobLogMapper;
  * @author ruoyi
  */
 @Service
-public class SysJobLogServiceImpl implements ISysJobLogService
+public class SysJobLogServiceImpl implements ISysJobLogService {
-{
+    @Resource
-    @Autowired
     private SysJobLogMapper jobLogMapper;
 
     /**
@@ -24,8 +24,7 @@ public class SysJobLogServiceImpl implements ISysJobLogService
      * @return 调度任务日志集合
      */
     @Override
-    public List<SysJobLog> selectJobLogList(SysJobLog jobLog)
+    public List<SysJobLog> selectJobLogList(SysJobLog jobLog) {
-    {
         return jobLogMapper.selectJobLogList(jobLog);
     }
 
@@ -36,8 +35,7 @@ public class SysJobLogServiceImpl implements ISysJobLogService
      * @return 调度任务日志对象信息
      */
     @Override
-    public SysJobLog selectJobLogById(Long jobLogId)
+    public SysJobLog selectJobLogById(Long jobLogId) {
-    {
         return jobLogMapper.selectJobLogById(jobLogId);
     }
 
@@ -47,8 +45,7 @@ public class SysJobLogServiceImpl implements ISysJobLogService
      * @param jobLog 调度日志信息
      */
     @Override
-    public void addJobLog(SysJobLog jobLog)
+    public void addJobLog(SysJobLog jobLog) {
-    {
         jobLogMapper.insertJobLog(jobLog);
     }
 
@@ -59,8 +56,7 @@ public class SysJobLogServiceImpl implements ISysJobLogService
      * @return 结果
      */
     @Override
-    public int deleteJobLogByIds(Long[] logIds)
+    public int deleteJobLogByIds(Long[] logIds) {
-    {
         return jobLogMapper.deleteJobLogByIds(logIds);
     }
 
@@ -70,8 +66,7 @@ public class SysJobLogServiceImpl implements ISysJobLogService
      * @param jobId 调度日志ID
      */
     @Override
-    public int deleteJobLogById(Long jobId)
+    public int deleteJobLogById(Long jobId) {
-    {
         return jobLogMapper.deleteJobLogById(jobId);
     }
 
@@ -79,8 +74,7 @@ public class SysJobLogServiceImpl implements ISysJobLogService
      * 清空任务日志
      */
     @Override
-    public void cleanJobLog()
+    public void cleanJobLog() {
-    {
         jobLogMapper.cleanJobLog();
     }
 }

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java

@@ -1,21 +1,21 @@
 package com.ruoyi.job.service;
 
-import java.util.List;
+import com.ruoyi.common.core.constant.ScheduleConstants;
-
+import com.ruoyi.common.core.exception.job.TaskException;
+import com.ruoyi.job.domain.SysJob;
+import com.ruoyi.job.mapper.SysJobMapper;
+import com.ruoyi.job.util.CronUtils;
+import com.ruoyi.job.util.ScheduleUtils;
 import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
 import org.quartz.JobDataMap;
 import org.quartz.JobKey;
 import org.quartz.Scheduler;
 import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.ruoyi.common.core.constant.ScheduleConstants;
+
-import com.ruoyi.common.core.exception.job.TaskException;
+import java.util.List;
-import com.ruoyi.job.domain.SysJob;
-import com.ruoyi.job.mapper.SysJobMapper;
-import com.ruoyi.job.util.CronUtils;
-import com.ruoyi.job.util.ScheduleUtils;
 
 /**
  * 定时任务调度信息 服务层
@@ -24,10 +24,10 @@ import com.ruoyi.job.util.ScheduleUtils;
  */
 @Service
 public class SysJobServiceImpl implements ISysJobService {
-    @Autowired
+    @Resource
     private Scheduler scheduler;
 
-    @Autowired
+    @Resource
     private SysJobMapper jobMapper;
 
     /**

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java

@@ -9,20 +9,16 @@ import com.ruoyi.common.core.utils.StringUtils;
  * @author ruoyi
  */
 @Component("ryTask")
-public class RyTask
+public class RyTask {
-{
+    public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
-    public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
-    {
         System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
     }
 
-    public void ryParams(String params)
+    public void ryParams(String params) {
-    {
         System.out.println("执行有参方法：" + params);
     }
 
-    public void ryNoParams()
+    public void ryNoParams() {
-    {
         System.out.println("执行无参方法");
     }
 }

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java

@@ -1,11 +1,5 @@
 package com.ruoyi.job.util;
 
-import java.util.Date;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import com.ruoyi.common.core.constant.ScheduleConstants;
 import com.ruoyi.common.core.utils.ExceptionUtil;
 import com.ruoyi.common.core.utils.SpringUtils;
@@ -14,37 +8,35 @@ import com.ruoyi.common.core.utils.bean.BeanUtils;
 import com.ruoyi.job.domain.SysJob;
 import com.ruoyi.job.domain.SysJobLog;
 import com.ruoyi.job.service.ISysJobLogService;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Date;
 
 /**
  * 抽象quartz调用
  *
  * @author ruoyi
  */
-public abstract class AbstractQuartzJob implements Job
+public abstract class AbstractQuartzJob implements Job {
-{
     private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class);
 
     /**
      * 线程本地变量
      */
-    private static ThreadLocal<Date> threadLocal = new ThreadLocal<>();
+    private static final ThreadLocal<Date> threadLocal = new ThreadLocal<>();
 
     @Override
-    public void execute(JobExecutionContext context) throws JobExecutionException
+    public void execute(JobExecutionContext context) {
-    {
         SysJob sysJob = new SysJob();
         BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES));
-        try
+        try {
-        {
             before(context, sysJob);
-            if (sysJob != null)
-            {
             doExecute(context, sysJob);
-            }
             after(context, sysJob, null);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             log.error("任务执行异常 - ：", e);
             after(context, sysJob, e);
         }
@@ -56,8 +48,7 @@ public abstract class AbstractQuartzJob implements Job
      * @param context 工作执行上下文对象
      * @param sysJob  系统计划任务
      */
-    protected void before(JobExecutionContext context, SysJob sysJob)
+    protected void before(JobExecutionContext context, SysJob sysJob) {
-    {
         threadLocal.set(new Date());
     }
 
@@ -67,8 +58,7 @@ public abstract class AbstractQuartzJob implements Job
      * @param context 工作执行上下文对象
      * @param sysJob  系统计划任务
      */
-    protected void after(JobExecutionContext context, SysJob sysJob, Exception e)
+    protected void after(JobExecutionContext context, SysJob sysJob, Exception e) {
-    {
         Date startTime = threadLocal.get();
         threadLocal.remove();
 
@@ -80,14 +70,11 @@ public abstract class AbstractQuartzJob implements Job
         sysJobLog.setStopTime(new Date());
         long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime();
         sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒");
-        if (e != null)
+        if (e != null) {
-        {
             sysJobLog.setStatus("1");
             String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000);
             sysJobLog.setExceptionInfo(errorMsg);
-        }
+        } else {
-        else
-        {
             sysJobLog.setStatus("0");
         }
 

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java

@@ -1,25 +1,23 @@
 package com.ruoyi.job.util;
 
+import org.quartz.CronExpression;
+
 import java.text.ParseException;
 import java.util.Date;
-import org.quartz.CronExpression;
 
 /**
  * cron表达式工具类
  *
  * @author ruoyi
- *
  */
-public class CronUtils
+public class CronUtils {
-{
     /**
      * 返回一个布尔值代表一个给定的Cron表达式的有效性
      *
      * @param cronExpression Cron表达式
      * @return boolean 表达式是否有效
      */
-    public static boolean isValid(String cronExpression)
+    public static boolean isValid(String cronExpression) {
-    {
         return CronExpression.isValidExpression(cronExpression);
     }
 
@@ -29,15 +27,11 @@ public class CronUtils
      * @param cronExpression Cron表达式
      * @return String 无效时返回表达式错误描述,如果有效返回null
      */
-    public static String getInvalidMessage(String cronExpression)
+    public static String getInvalidMessage(String cronExpression) {
-    {
+        try {
-        try
-        {
             new CronExpression(cronExpression);
             return null;
-        }
+        } catch (ParseException pe) {
-        catch (ParseException pe)
-        {
             return pe.getMessage();
         }
     }
@@ -48,15 +42,11 @@ public class CronUtils
      * @param cronExpression Cron表达式
      * @return Date 下次Cron表达式执行时间
      */
-    public static Date getNextExecution(String cronExpression)
+    public static Date getNextExecution(String cronExpression) {
-    {
+        try {
-        try
-        {
             CronExpression cron = new CronExpression(cronExpression);
             return cron.getNextValidTimeAfter(new Date(System.currentTimeMillis()));
-        }
+        } catch (ParseException e) {
-        catch (ParseException e)
-        {
             throw new IllegalArgumentException(e.getMessage());
         }
     }

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java

@@ -1,39 +1,36 @@
 package com.ruoyi.job.util;
 
+import com.ruoyi.common.core.utils.SpringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.job.domain.SysJob;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.LinkedList;
 import java.util.List;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.job.domain.SysJob;
 
 /**
  * 任务执行工具
  *
  * @author ruoyi
  */
-public class JobInvokeUtil
+public class JobInvokeUtil {
-{
+
     /**
      * 执行方法
      *
      * @param sysJob 系统任务
      */
-    public static void invokeMethod(SysJob sysJob) throws Exception
+    public static void invokeMethod(SysJob sysJob) throws Exception {
-    {
         String invokeTarget = sysJob.getInvokeTarget();
         String beanName = getBeanName(invokeTarget);
         String methodName = getMethodName(invokeTarget);
         List<Object[]> methodParams = getMethodParams(invokeTarget);
 
-        if (!isValidClassName(beanName))
+        if (!isValidClassName(beanName)) {
-        {
             Object bean = SpringUtils.getBean(beanName);
             invokeMethod(bean, methodName, methodParams);
-        }
+        } else {
-        else
-        {
             Object bean = Class.forName(beanName).getDeclaredConstructor().newInstance();
             invokeMethod(bean, methodName, methodParams);
         }
@@ -48,15 +45,11 @@ public class JobInvokeUtil
      */
     private static void invokeMethod(Object bean, String methodName, List<Object[]> methodParams)
             throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException,
-            InvocationTargetException
+            InvocationTargetException {
-    {
+        if (StringUtils.isNotNull(methodParams) && !methodParams.isEmpty()) {
-        if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0)
-        {
             Method method = bean.getClass().getMethod(methodName, getMethodParamsType(methodParams));
             method.invoke(bean, getMethodParamsValue(methodParams));
-        }
+        } else {
-        else
-        {
             Method method = bean.getClass().getMethod(methodName);
             method.invoke(bean);
         }
@@ -68,8 +61,7 @@ public class JobInvokeUtil
      * @param invokeTarget 名称
      * @return true是 false否
      */
-    public static boolean isValidClassName(String invokeTarget)
+    public static boolean isValidClassName(String invokeTarget) {
-    {
         return StringUtils.countMatches(invokeTarget, ".") > 1;
     }
 
@@ -79,8 +71,7 @@ public class JobInvokeUtil
      * @param invokeTarget 目标字符串
      * @return bean名称
      */
-    public static String getBeanName(String invokeTarget)
+    public static String getBeanName(String invokeTarget) {
-    {
         String beanName = StringUtils.substringBefore(invokeTarget, "(");
         return StringUtils.substringBeforeLast(beanName, ".");
     }
@@ -91,8 +82,7 @@ public class JobInvokeUtil
      * @param invokeTarget 目标字符串
      * @return method方法
      */
-    public static String getMethodName(String invokeTarget)
+    public static String getMethodName(String invokeTarget) {
-    {
         String methodName = StringUtils.substringBefore(invokeTarget, "(");
         return StringUtils.substringAfterLast(methodName, ".");
     }
@@ -103,41 +93,33 @@ public class JobInvokeUtil
      * @param invokeTarget 目标字符串
      * @return method方法相关参数列表
      */
-    public static List<Object[]> getMethodParams(String invokeTarget)
+    public static List<Object[]> getMethodParams(String invokeTarget) {
-    {
         String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
-        if (StringUtils.isEmpty(methodStr))
+        if (StringUtils.isEmpty(methodStr)) {
-        {
             return null;
         }
         String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)");
         List<Object[]> classs = new LinkedList<>();
-        for (int i = 0; i < methodParams.length; i++)
+        for (String methodParam : methodParams) {
-        {
+            String str = StringUtils.trimToEmpty(methodParam);
-            String str = StringUtils.trimToEmpty(methodParams[i]);
             // String字符串类型，以'或"开头
-            if (StringUtils.startsWithAny(str, "'", "\""))
+            if (StringUtils.startsWithAny(str, "'", "\"")) {
-            {
                 classs.add(new Object[]{StringUtils.substring(str, 1, str.length() - 1), String.class});
             }
             // boolean布尔类型，等于true或者false
-            else if ("true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str))
+            else if ("true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str)) {
-            {
                 classs.add(new Object[]{Boolean.valueOf(str), Boolean.class});
             }
             // long长整形，以L结尾
-            else if (StringUtils.endsWith(str, "L"))
+            else if (StringUtils.endsWith(str, "L")) {
-            {
                 classs.add(new Object[]{Long.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Long.class});
             }
             // double浮点类型，以D结尾
-            else if (StringUtils.endsWith(str, "D"))
+            else if (StringUtils.endsWith(str, "D")) {
-            {
                 classs.add(new Object[]{Double.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Double.class});
             }
             // 其他类型归类为整形
-            else
+            else {
-            {
                 classs.add(new Object[]{Integer.valueOf(str), Integer.class});
             }
         }
@@ -150,12 +132,10 @@ public class JobInvokeUtil
      * @param methodParams 参数相关列表
      * @return 参数类型列表
      */
-    public static Class<?>[] getMethodParamsType(List<Object[]> methodParams)
+    public static Class<?>[] getMethodParamsType(List<Object[]> methodParams) {
-    {
         Class<?>[] classs = new Class<?>[methodParams.size()];
         int index = 0;
-        for (Object[] os : methodParams)
+        for (Object[] os : methodParams) {
-        {
             classs[index] = (Class<?>) os[1];
             index++;
         }
@@ -168,12 +148,10 @@ public class JobInvokeUtil
      * @param methodParams 参数相关列表
      * @return 参数值列表
      */
-    public static Object[] getMethodParamsValue(List<Object[]> methodParams)
+    public static Object[] getMethodParamsValue(List<Object[]> methodParams) {
-    {
         Object[] classs = new Object[methodParams.size()];
         int index = 0;
-        for (Object[] os : methodParams)
+        for (Object[] os : methodParams) {
-        {
             classs[index] = (Object) os[0];
             index++;
         }

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java

@@ -9,14 +9,11 @@ import com.ruoyi.job.domain.SysJob;
  * 定时任务处理（禁止并发执行）
  *
  * @author ruoyi
- *
  */
 @DisallowConcurrentExecution
-public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob
+public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob {
-{
     @Override
-    protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception
+    protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception {
-    {
         JobInvokeUtil.invokeMethod(sysJob);
     }
 }

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java

@@ -8,13 +8,10 @@ import com.ruoyi.job.domain.SysJob;
  * 定时任务处理（允许并发执行）
  *
  * @author ruoyi
- *
  */
-public class QuartzJobExecution extends AbstractQuartzJob
+public class QuartzJobExecution extends AbstractQuartzJob {
-{
     @Override
-    protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception
+    protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception {
-    {
         JobInvokeUtil.invokeMethod(sysJob);
     }
 }

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java

@@ -30,10 +30,22 @@ public class ScheduleUtils {
      * @param sysJob 执行计划
      * @return 具体执行任务类
      */
-    private static Class<? extends Job> getQuartzJobClass(SysJob sysJob) {
+    @SuppressWarnings("unchecked")
+    private static Class<? extends Job> getQuartzJobClass(SysJob sysJob) throws TaskException {
+        String customJobClass = sysJob.getCustomJobClass();
+        if (StringUtils.isNotBlank(customJobClass)) {
+            // 使用自定义任务类
+            try {
+                return (Class<? extends Job>) Class.forName(customJobClass);
+            } catch (Exception e) {
+                throw new TaskException("Custom job class [" + customJobClass + "] not exists", Code.CONFIG_ERROR);
+            }
+        } else {
+            // 使用系统任务类
             boolean isConcurrent = "0".equals(sysJob.getConcurrent());
             return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class;
         }
+    }
 
     /**
      * 构建任务触发对象

ruoyi-modules/ruoyi-job/src/main/resources/com/ruoyi/job/mapper/SysJobMapper.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.job.mapper.SysJobMapper">
 
-	<resultMap type="SysJob" id="SysJobResult">
+    <resultMap type="com.ruoyi.job.domain.SysJob" id="SysJobResult">
         <id property="jobId" column="job_id"/>
         <result property="jobName" column="job_name"/>
         <result property="jobGroup" column="job_group"/>
@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="misfirePolicy" column="misfire_policy"/>
         <result property="concurrent" column="concurrent"/>
         <result property="status" column="status"/>
+        <result property="customJobClass" column="custom_job_class"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -21,11 +22,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectJobVo">
-        select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark 
+        select job_id,
+               job_name,
+               job_group,
+               invoke_target,
+               cron_expression,
+               misfire_policy,
+               concurrent,
+               status,
+               custom_job_class,
+               create_by,
+               create_time,
+               remark
         from sys_job
     </sql>
 
-	<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult">
+    <select id="selectJobList" parameterType="com.ruoyi.job.domain.SysJob" resultMap="SysJobResult">
         <include refid="selectJobVo"/>
         <where>
             <if test="jobName != null and jobName != ''">
@@ -53,7 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <delete id="deleteJobById" parameterType="Long">
- 		delete from sys_job where job_id = #{jobId}
+        delete
+        from sys_job
+        where job_id = #{jobId}
     </delete>
 
     <delete id="deleteJobByIds" parameterType="Long">
@@ -63,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
- 	<update id="updateJob" parameterType="SysJob">
+    <update id="updateJob" parameterType="com.ruoyi.job.domain.SysJob">
         update sys_job
         <set>
             <if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
@@ -73,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy = #{misfirePolicy},</if>
             <if test="concurrent != null and concurrent != ''">concurrent = #{concurrent},</if>
             <if test="status !=null">status = #{status},</if>
+            <if test="customJobClass !=null and customJobClass != ''">custom_job_class = #{customJobClass},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
@@ -80,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where job_id = #{jobId}
     </update>
 
- 	<insert id="insertJob" parameterType="SysJob" useGeneratedKeys="true" keyProperty="jobId">
+    <insert id="insertJob" parameterType="com.ruoyi.job.domain.SysJob" useGeneratedKeys="true" keyProperty="jobId">
         insert into sys_job(
         <if test="jobId != null and jobId != 0">job_id,</if>
         <if test="jobName != null and jobName != ''">job_name,</if>
@@ -90,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy,</if>
         <if test="concurrent != null and concurrent != ''">concurrent,</if>
         <if test="status != null and status != ''">status,</if>
+        <if test="customJobClass != null and customJobClass != ''">custom_job_class,</if>
         <if test="remark != null and remark != ''">remark,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
         create_time
@@ -102,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="misfirePolicy != null and misfirePolicy != ''">#{misfirePolicy},</if>
         <if test="concurrent != null and concurrent != ''">#{concurrent},</if>
         <if test="status != null and status != ''">#{status},</if>
+        <if test="customJobClass != null and customJobClass != ''">#{customJobClass},</if>
         <if test="remark != null and remark != ''">#{remark},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         sysdate()

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

@@ -1,91 +0,0 @@
-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/ItemInfoController.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.ItemInfo;
+import com.ruoyi.wms.service.IItemInfoService;
+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-20
+ */
+@RestController
+@RequestMapping("/ItemInfo")
+public class ItemInfoController extends BaseController {
+    @Autowired
+    private IItemInfoService itemInfoService;
+
+    /**
+     * 查询物品基础信息列表
+     */
+    @RequiresPermissions("wms:ItemInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo list(ItemInfo itemInfo) {
+        startPage();
+        List<ItemInfo> list = itemInfoService.selectItemInfoList(itemInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出物品基础信息列表
+     */
+    @RequiresPermissions("wms:ItemInfo:export")
+    @Log(title = "物品基础信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ItemInfo itemInfo) {
+        List<ItemInfo> list = itemInfoService.selectItemInfoList(itemInfo);
+        ExcelUtil<ItemInfo> util = new ExcelUtil<>(ItemInfo.class);
+        util.exportExcel(response, list, "物品基础信息数据");
+    }
+
+    /**
+     * 获取物品基础信息详细信息
+     */
+    @RequiresPermissions("wms:ItemInfo:query")
+    @GetMapping(value = "/{itemCd}")
+    public AjaxResult getInfo(@PathVariable("itemCd") String itemCd) {
+        return success(itemInfoService.selectItemInfoByItemCd(itemCd));
+    }
+
+    /**
+     * 新增物品基础信息
+     */
+    @RequiresPermissions("wms:ItemInfo:add")
+    @Log(title = "物品基础信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ItemInfo itemInfo) {
+        return toAjax(itemInfoService.insertItemInfo(itemInfo));
+    }
+
+    /**
+     * 修改物品基础信息
+     */
+    @RequiresPermissions("wms:ItemInfo:edit")
+    @Log(title = "物品基础信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ItemInfo itemInfo) {
+        return toAjax(itemInfoService.updateItemInfo(itemInfo));
+    }
+
+    /**
+     * 删除物品基础信息
+     */
+    @RequiresPermissions("wms:ItemInfo:remove")
+    @Log(title = "物品基础信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{itemCds}")
+    public AjaxResult remove(@PathVariable String[] itemCds) {
+        return toAjax(itemInfoService.deleteItemInfoByItemCds(itemCds));
+    }
+}

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemTypeController.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.ItemType;
+import com.ruoyi.wms.service.IItemTypeService;
+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-20
+ */
+@RestController
+@RequestMapping("/ItemType")
+public class ItemTypeController extends BaseController {
+    @Autowired
+    private IItemTypeService itemTypeService;
+
+    /**
+     * 查询物品类型列表
+     */
+    @RequiresPermissions("wms:ItemType:list")
+    @GetMapping("/list")
+    public TableDataInfo list(ItemType itemType) {
+        startPage();
+        List<ItemType> list = itemTypeService.selectItemTypeList(itemType);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出物品类型列表
+     */
+    @RequiresPermissions("wms:ItemType:export")
+    @Log(title = "物品类型", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ItemType itemType) {
+        List<ItemType> list = itemTypeService.selectItemTypeList(itemType);
+        ExcelUtil<ItemType> util = new ExcelUtil<>(ItemType.class);
+        util.exportExcel(response, list, "物品类型数据");
+    }
+
+    /**
+     * 获取物品类型详细信息
+     */
+    @RequiresPermissions("wms:ItemType:query")
+    @GetMapping(value = "/{itemTypeCd}")
+    public AjaxResult getInfo(@PathVariable("itemTypeCd") String itemTypeCd) {
+        return success(itemTypeService.selectItemTypeByItemTypeCd(itemTypeCd));
+    }
+
+    /**
+     * 新增物品类型
+     */
+    @RequiresPermissions("wms:ItemType:add")
+    @Log(title = "物品类型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ItemType itemType) {
+        return toAjax(itemTypeService.insertItemType(itemType));
+    }
+
+    /**
+     * 修改物品类型
+     */
+    @RequiresPermissions("wms:ItemType:edit")
+    @Log(title = "物品类型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ItemType itemType) {
+        return toAjax(itemTypeService.updateItemType(itemType));
+    }
+
+    /**
+     * 删除物品类型
+     */
+    @RequiresPermissions("wms:ItemType:remove")
+    @Log(title = "物品类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{itemTypeCds}")
+    public AjaxResult remove(@PathVariable String[] itemTypeCds) {
+        return toAjax(itemTypeService.deleteItemTypeByItemTypeCds(itemTypeCds));
+    }
+}

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

@@ -0,0 +1,691 @@
+package com.ruoyi.wms.domain;
+
+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_ITEM_INFO </li>
+ * </ul>
+ *
+ * @author ryas
+ * created on 2024-02-20
+ */
+public class ItemInfo extends ExtBaseEntity implements Serializable {
+    /**
+     *   物品代码
+     */
+    private String itemCd;
+
+    /**
+     *   从属部门ID
+     */
+    private Integer deptId;
+
+    /**
+     *   物品名称
+     */
+    private String itemName;
+
+    /**
+     *   供应商
+     */
+    private String supplier;
+
+    /**
+     *   筹备提前期
+     */
+    private BigDecimal prepLeadTime;
+
+    /**
+     *   入库提前期
+     */
+    private BigDecimal instockLeadTime;
+
+    /**
+     *   放置期
+     */
+    private BigDecimal restingPeriod;
+
+    /**
+     *   出库提前期
+     */
+    private BigDecimal outstockLeadTime;
+
+    /**
+     *   规格1
+     */
+    private String spec1;
+
+    /**
+     *   规格2
+     */
+    private String spec2;
+
+    /**
+     *   规格3
+     */
+    private String spec3;
+
+    /**
+     *   规格4
+     */
+    private String spec4;
+
+    /**
+     *   规格5
+     */
+    private String spec5;
+
+    /**
+     *   分类1
+     */
+    private String cls1;
+
+    /**
+     *   分类2
+     */
+    private String cls2;
+
+    /**
+     *   分类3
+     */
+    private String cls3;
+
+    /**
+     *   分类4
+     */
+    private String cls4;
+
+    /**
+     *   分类5
+     */
+    private String cls5;
+
+    /**
+     *   备注1
+     */
+    private String remark1;
+
+    /**
+     *   备注2
+     */
+    private String remark2;
+
+    /**
+     *   备注3
+     */
+    private String remark3;
+
+    /**
+     *   备注4
+     */
+    private String remark4;
+
+    /**
+     *   备注5
+     */
+    private String remark5;
+
+    /**
+     *   供货周期
+     */
+    private String deliveryPeriod;
+
+    /**
+     *   默认库位号
+     */
+    private String defaultStgBinCd;
+
+    /**
+     *   启用标志
+     */
+    private Integer enableFlg;
+
+    /**
+     *   安全库存量
+     */
+    private BigDecimal safetyStock;
+
+    /**
+     *   最大库存量
+     */
+    private BigDecimal maxInvQty;
+
+    /**
+     *   发起购买的阈值
+     */
+    private BigDecimal purchLimitQty;
+
+    /**
+     *   物品区分
+     */
+    private String goodsCls;
+
+    /**
+     *   批号管理区分(0:不管理, 1:管理)
+     */
+    private Integer lotNoMgmtCls;
+
+    /**
+     *   物品类型代码
+     */
+    private String itemTypeCd;
+
+    /**
+     *   标准单位代码
+     */
+    private String stdUnitCd;
+
+    /**
+     *   包装单位代码
+     */
+    private String pkgUnitCd;
+
+    /**
+     *   出库申请最小数量
+     */
+    private BigDecimal outstockReqMinQty;
+
+    /**
+     *   出库单位区分
+     */
+    private String outstockUnitCls;
+
+    /**
+     *   单位净重
+     */
+    private BigDecimal netWeightPerUnit;
+
+    /**
+     *   自身体积(M3)
+     */
+    private BigDecimal ownVolM3;
+
+    /**
+     *   尺寸(长)
+     */
+    private BigDecimal sizeD;
+
+    /**
+     *   尺寸(宽)
+     */
+    private BigDecimal sizeW;
+
+    /**
+     *   尺寸(高)
+     */
+    private BigDecimal sizeH;
+
+    /**
+     *   包装要求描述
+     */
+    private String pkgRqmtDesc;
+
+    /**
+     *   码放要求描述
+     */
+    private String stackingRqmtDesc;
+
+    /**
+     *   储存要求描述
+     */
+    private String stgRqmtDesc;
+
+    /**
+     *   生产商
+     */
+    private String manufacturer;
+
+    /**
+     *   图片ID
+     */
+    private String pictureId;
+
+    /**
+     *   图片URL
+     */
+    private String pictureUrl;
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    public String getItemCd() {
+        return itemCd;
+    }
+
+    public void setItemCd(String itemCd) {
+        this.itemCd = itemCd == null ? null : itemCd.trim();
+    }
+
+    public Integer getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Integer deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName == null ? null : itemName.trim();
+    }
+
+    public String getSupplier() {
+        return supplier;
+    }
+
+    public void setSupplier(String supplier) {
+        this.supplier = supplier == null ? null : supplier.trim();
+    }
+
+    public BigDecimal getPrepLeadTime() {
+        return prepLeadTime;
+    }
+
+    public void setPrepLeadTime(BigDecimal prepLeadTime) {
+        this.prepLeadTime = prepLeadTime;
+    }
+
+    public BigDecimal getInstockLeadTime() {
+        return instockLeadTime;
+    }
+
+    public void setInstockLeadTime(BigDecimal instockLeadTime) {
+        this.instockLeadTime = instockLeadTime;
+    }
+
+    public BigDecimal getRestingPeriod() {
+        return restingPeriod;
+    }
+
+    public void setRestingPeriod(BigDecimal restingPeriod) {
+        this.restingPeriod = restingPeriod;
+    }
+
+    public BigDecimal getOutstockLeadTime() {
+        return outstockLeadTime;
+    }
+
+    public void setOutstockLeadTime(BigDecimal outstockLeadTime) {
+        this.outstockLeadTime = outstockLeadTime;
+    }
+
+    public String getSpec1() {
+        return spec1;
+    }
+
+    public void setSpec1(String spec1) {
+        this.spec1 = spec1 == null ? null : spec1.trim();
+    }
+
+    public String getSpec2() {
+        return spec2;
+    }
+
+    public void setSpec2(String spec2) {
+        this.spec2 = spec2 == null ? null : spec2.trim();
+    }
+
+    public String getSpec3() {
+        return spec3;
+    }
+
+    public void setSpec3(String spec3) {
+        this.spec3 = spec3 == null ? null : spec3.trim();
+    }
+
+    public String getSpec4() {
+        return spec4;
+    }
+
+    public void setSpec4(String spec4) {
+        this.spec4 = spec4 == null ? null : spec4.trim();
+    }
+
+    public String getSpec5() {
+        return spec5;
+    }
+
+    public void setSpec5(String spec5) {
+        this.spec5 = spec5 == null ? null : spec5.trim();
+    }
+
+    public String getCls1() {
+        return cls1;
+    }
+
+    public void setCls1(String cls1) {
+        this.cls1 = cls1 == null ? null : cls1.trim();
+    }
+
+    public String getCls2() {
+        return cls2;
+    }
+
+    public void setCls2(String cls2) {
+        this.cls2 = cls2 == null ? null : cls2.trim();
+    }
+
+    public String getCls3() {
+        return cls3;
+    }
+
+    public void setCls3(String cls3) {
+        this.cls3 = cls3 == null ? null : cls3.trim();
+    }
+
+    public String getCls4() {
+        return cls4;
+    }
+
+    public void setCls4(String cls4) {
+        this.cls4 = cls4 == null ? null : cls4.trim();
+    }
+
+    public String getCls5() {
+        return cls5;
+    }
+
+    public void setCls5(String cls5) {
+        this.cls5 = cls5 == null ? null : cls5.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();
+    }
+
+    public String getDeliveryPeriod() {
+        return deliveryPeriod;
+    }
+
+    public void setDeliveryPeriod(String deliveryPeriod) {
+        this.deliveryPeriod = deliveryPeriod == null ? null : deliveryPeriod.trim();
+    }
+
+    public String getDefaultStgBinCd() {
+        return defaultStgBinCd;
+    }
+
+    public void setDefaultStgBinCd(String defaultStgBinCd) {
+        this.defaultStgBinCd = defaultStgBinCd == null ? null : defaultStgBinCd.trim();
+    }
+
+    public Integer getEnableFlg() {
+        return enableFlg;
+    }
+
+    public void setEnableFlg(Integer enableFlg) {
+        this.enableFlg = enableFlg;
+    }
+
+    public BigDecimal getSafetyStock() {
+        return safetyStock;
+    }
+
+    public void setSafetyStock(BigDecimal safetyStock) {
+        this.safetyStock = safetyStock;
+    }
+
+    public BigDecimal getMaxInvQty() {
+        return maxInvQty;
+    }
+
+    public void setMaxInvQty(BigDecimal maxInvQty) {
+        this.maxInvQty = maxInvQty;
+    }
+
+    public BigDecimal getPurchLimitQty() {
+        return purchLimitQty;
+    }
+
+    public void setPurchLimitQty(BigDecimal purchLimitQty) {
+        this.purchLimitQty = purchLimitQty;
+    }
+
+    public String getGoodsCls() {
+        return goodsCls;
+    }
+
+    public void setGoodsCls(String goodsCls) {
+        this.goodsCls = goodsCls == null ? null : goodsCls.trim();
+    }
+
+    public Integer getLotNoMgmtCls() {
+        return lotNoMgmtCls;
+    }
+
+    public void setLotNoMgmtCls(Integer lotNoMgmtCls) {
+        this.lotNoMgmtCls = lotNoMgmtCls;
+    }
+
+    public String getItemTypeCd() {
+        return itemTypeCd;
+    }
+
+    public void setItemTypeCd(String itemTypeCd) {
+        this.itemTypeCd = itemTypeCd == null ? null : itemTypeCd.trim();
+    }
+
+    public String getStdUnitCd() {
+        return stdUnitCd;
+    }
+
+    public void setStdUnitCd(String stdUnitCd) {
+        this.stdUnitCd = stdUnitCd == null ? null : stdUnitCd.trim();
+    }
+
+    public String getPkgUnitCd() {
+        return pkgUnitCd;
+    }
+
+    public void setPkgUnitCd(String pkgUnitCd) {
+        this.pkgUnitCd = pkgUnitCd == null ? null : pkgUnitCd.trim();
+    }
+
+    public BigDecimal getOutstockReqMinQty() {
+        return outstockReqMinQty;
+    }
+
+    public void setOutstockReqMinQty(BigDecimal outstockReqMinQty) {
+        this.outstockReqMinQty = outstockReqMinQty;
+    }
+
+    public String getOutstockUnitCls() {
+        return outstockUnitCls;
+    }
+
+    public void setOutstockUnitCls(String outstockUnitCls) {
+        this.outstockUnitCls = outstockUnitCls == null ? null : outstockUnitCls.trim();
+    }
+
+    public BigDecimal getNetWeightPerUnit() {
+        return netWeightPerUnit;
+    }
+
+    public void setNetWeightPerUnit(BigDecimal netWeightPerUnit) {
+        this.netWeightPerUnit = netWeightPerUnit;
+    }
+
+    public BigDecimal getOwnVolM3() {
+        return ownVolM3;
+    }
+
+    public void setOwnVolM3(BigDecimal ownVolM3) {
+        this.ownVolM3 = ownVolM3;
+    }
+
+    public BigDecimal getSizeD() {
+        return sizeD;
+    }
+
+    public void setSizeD(BigDecimal sizeD) {
+        this.sizeD = sizeD;
+    }
+
+    public BigDecimal getSizeW() {
+        return sizeW;
+    }
+
+    public void setSizeW(BigDecimal sizeW) {
+        this.sizeW = sizeW;
+    }
+
+    public BigDecimal getSizeH() {
+        return sizeH;
+    }
+
+    public void setSizeH(BigDecimal sizeH) {
+        this.sizeH = sizeH;
+    }
+
+    public String getPkgRqmtDesc() {
+        return pkgRqmtDesc;
+    }
+
+    public void setPkgRqmtDesc(String pkgRqmtDesc) {
+        this.pkgRqmtDesc = pkgRqmtDesc == null ? null : pkgRqmtDesc.trim();
+    }
+
+    public String getStackingRqmtDesc() {
+        return stackingRqmtDesc;
+    }
+
+    public void setStackingRqmtDesc(String stackingRqmtDesc) {
+        this.stackingRqmtDesc = stackingRqmtDesc == null ? null : stackingRqmtDesc.trim();
+    }
+
+    public String getStgRqmtDesc() {
+        return stgRqmtDesc;
+    }
+
+    public void setStgRqmtDesc(String stgRqmtDesc) {
+        this.stgRqmtDesc = stgRqmtDesc == null ? null : stgRqmtDesc.trim();
+    }
+
+    public String getManufacturer() {
+        return manufacturer;
+    }
+
+    public void setManufacturer(String manufacturer) {
+        this.manufacturer = manufacturer == null ? null : manufacturer.trim();
+    }
+
+    public String getPictureId() {
+        return pictureId;
+    }
+
+    public void setPictureId(String pictureId) {
+        this.pictureId = pictureId == null ? null : pictureId.trim();
+    }
+
+    public String getPictureUrl() {
+        return pictureUrl;
+    }
+
+    public void setPictureUrl(String pictureUrl) {
+        this.pictureUrl = pictureUrl == null ? null : pictureUrl.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", itemCd=").append(itemCd);
+        sb.append(", deptId=").append(deptId);
+        sb.append(", itemName=").append(itemName);
+        sb.append(", supplier=").append(supplier);
+        sb.append(", prepLeadTime=").append(prepLeadTime);
+        sb.append(", instockLeadTime=").append(instockLeadTime);
+        sb.append(", restingPeriod=").append(restingPeriod);
+        sb.append(", outstockLeadTime=").append(outstockLeadTime);
+        sb.append(", spec1=").append(spec1);
+        sb.append(", spec2=").append(spec2);
+        sb.append(", spec3=").append(spec3);
+        sb.append(", spec4=").append(spec4);
+        sb.append(", spec5=").append(spec5);
+        sb.append(", cls1=").append(cls1);
+        sb.append(", cls2=").append(cls2);
+        sb.append(", cls3=").append(cls3);
+        sb.append(", cls4=").append(cls4);
+        sb.append(", cls5=").append(cls5);
+        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(", deliveryPeriod=").append(deliveryPeriod);
+        sb.append(", defaultStgBinCd=").append(defaultStgBinCd);
+        sb.append(", enableFlg=").append(enableFlg);
+        sb.append(", safetyStock=").append(safetyStock);
+        sb.append(", maxInvQty=").append(maxInvQty);
+        sb.append(", purchLimitQty=").append(purchLimitQty);
+        sb.append(", goodsCls=").append(goodsCls);
+        sb.append(", lotNoMgmtCls=").append(lotNoMgmtCls);
+        sb.append(", itemTypeCd=").append(itemTypeCd);
+        sb.append(", stdUnitCd=").append(stdUnitCd);
+        sb.append(", pkgUnitCd=").append(pkgUnitCd);
+        sb.append(", outstockReqMinQty=").append(outstockReqMinQty);
+        sb.append(", outstockUnitCls=").append(outstockUnitCls);
+        sb.append(", netWeightPerUnit=").append(netWeightPerUnit);
+        sb.append(", ownVolM3=").append(ownVolM3);
+        sb.append(", sizeD=").append(sizeD);
+        sb.append(", sizeW=").append(sizeW);
+        sb.append(", sizeH=").append(sizeH);
+        sb.append(", pkgRqmtDesc=").append(pkgRqmtDesc);
+        sb.append(", stackingRqmtDesc=").append(stackingRqmtDesc);
+        sb.append(", stgRqmtDesc=").append(stgRqmtDesc);
+        sb.append(", manufacturer=").append(manufacturer);
+        sb.append(", pictureId=").append(pictureId);
+        sb.append(", pictureUrl=").append(pictureUrl);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -10,19 +10,19 @@ import java.io.Serializable;
  * This class was generated by MyBatis Generator.
  *
  * <ul>
- *   <li> Table: WMS_M_GOODS_TYPE_INFO </li>
+ *   <li> Table: WMS_M_ITEM_TYPE </li>
  *   <li> Remarks: 物品类型表 </li>
  * </ul>
  *
  * @author ryas
- * created on 2024-02-18
+ * created on 2024-02-20
  */
-public class GoodsType extends ExtBaseEntity implements Serializable {
+public class ItemType extends ExtBaseEntity implements Serializable {
     /**
      *   物品类型编码
      */
     @Excel(name = "物品类型编码")
-    private String goodsTypeCd;
+    private String itemTypeCd;
 
     /**
      *   从属部门ID
@@ -33,7 +33,7 @@ public class GoodsType extends ExtBaseEntity implements Serializable {
      *   物品类型名称
      */
     @Excel(name = "物品类型名称")
-    private String goodsTypeName;
+    private String itemTypeName;
 
     /**
      *   备注1
@@ -64,12 +64,12 @@ public class GoodsType extends ExtBaseEntity implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    public String getGoodsTypeCd() {
+    public String getItemTypeCd() {
-        return goodsTypeCd;
+        return itemTypeCd;
     }
 
-    public void setGoodsTypeCd(String goodsTypeCd) {
+    public void setItemTypeCd(String itemTypeCd) {
-        this.goodsTypeCd = goodsTypeCd == null ? null : goodsTypeCd.trim();
+        this.itemTypeCd = itemTypeCd == null ? null : itemTypeCd.trim();
     }
 
     public Integer getDeptId() {
@@ -80,12 +80,12 @@ public class GoodsType extends ExtBaseEntity implements Serializable {
         this.deptId = deptId;
     }
 
-    public String getGoodsTypeName() {
+    public String getItemTypeName() {
-        return goodsTypeName;
+        return itemTypeName;
     }
 
-    public void setGoodsTypeName(String goodsTypeName) {
+    public void setItemTypeName(String itemTypeName) {
-        this.goodsTypeName = goodsTypeName == null ? null : goodsTypeName.trim();
+        this.itemTypeName = itemTypeName == null ? null : itemTypeName.trim();
     }
 
     public String getRemark1() {
@@ -134,9 +134,9 @@ public class GoodsType extends ExtBaseEntity implements Serializable {
         sb.append(getClass().getSimpleName());
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
-        sb.append(", goodsTypeCd=").append(goodsTypeCd);
+        sb.append(", itemTypeCd=").append(itemTypeCd);
         sb.append(", deptId=").append(deptId);
-        sb.append(", goodsTypeName=").append(goodsTypeName);
+        sb.append(", itemTypeName=").append(itemTypeName);
         sb.append(", remark1=").append(remark1);
         sb.append(", remark2=").append(remark2);
         sb.append(", remark3=").append(remark3);

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

@@ -0,0 +1,395 @@
+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 ItemInfoDynamicSqlSupport {
+    public static final ItemInfo itemInfo = new ItemInfo();
+
+    /**
+     *   物品代码
+     */
+    public static final SqlColumn<String> itemCd = itemInfo.itemCd;
+
+    /**
+     *   从属部门ID
+     */
+    public static final SqlColumn<Integer> deptId = itemInfo.deptId;
+
+    /**
+     *   物品名称
+     */
+    public static final SqlColumn<String> itemName = itemInfo.itemName;
+
+    /**
+     *   供应商
+     */
+    public static final SqlColumn<String> supplier = itemInfo.supplier;
+
+    /**
+     *   筹备提前期
+     */
+    public static final SqlColumn<BigDecimal> prepLeadTime = itemInfo.prepLeadTime;
+
+    /**
+     *   入库提前期
+     */
+    public static final SqlColumn<BigDecimal> instockLeadTime = itemInfo.instockLeadTime;
+
+    /**
+     *   放置期
+     */
+    public static final SqlColumn<BigDecimal> restingPeriod = itemInfo.restingPeriod;
+
+    /**
+     *   出库提前期
+     */
+    public static final SqlColumn<BigDecimal> outstockLeadTime = itemInfo.outstockLeadTime;
+
+    /**
+     *   规格1
+     */
+    public static final SqlColumn<String> spec1 = itemInfo.spec1;
+
+    /**
+     *   规格2
+     */
+    public static final SqlColumn<String> spec2 = itemInfo.spec2;
+
+    /**
+     *   规格3
+     */
+    public static final SqlColumn<String> spec3 = itemInfo.spec3;
+
+    /**
+     *   规格4
+     */
+    public static final SqlColumn<String> spec4 = itemInfo.spec4;
+
+    /**
+     *   规格5
+     */
+    public static final SqlColumn<String> spec5 = itemInfo.spec5;
+
+    /**
+     *   分类1
+     */
+    public static final SqlColumn<String> cls1 = itemInfo.cls1;
+
+    /**
+     *   分类2
+     */
+    public static final SqlColumn<String> cls2 = itemInfo.cls2;
+
+    /**
+     *   分类3
+     */
+    public static final SqlColumn<String> cls3 = itemInfo.cls3;
+
+    /**
+     *   分类4
+     */
+    public static final SqlColumn<String> cls4 = itemInfo.cls4;
+
+    /**
+     *   分类5
+     */
+    public static final SqlColumn<String> cls5 = itemInfo.cls5;
+
+    /**
+     *   更新次数
+     */
+    public static final SqlColumn<Integer> updateCount = itemInfo.updateCount;
+
+    /**
+     *   删除标志
+     */
+    public static final SqlColumn<Integer> deleteFlag = itemInfo.deleteFlag;
+
+    /**
+     *   创建者
+     */
+    public static final SqlColumn<String> createBy = itemInfo.createBy;
+
+    /**
+     *   创建时间
+     */
+    public static final SqlColumn<Date> createTime = itemInfo.createTime;
+
+    /**
+     *   更新者
+     */
+    public static final SqlColumn<String> updateBy = itemInfo.updateBy;
+
+    /**
+     *   更新时间
+     */
+    public static final SqlColumn<Date> updateTime = itemInfo.updateTime;
+
+    /**
+     *   备注
+     */
+    public static final SqlColumn<String> remark = itemInfo.remark;
+
+    /**
+     *   备注1
+     */
+    public static final SqlColumn<String> remark1 = itemInfo.remark1;
+
+    /**
+     *   备注2
+     */
+    public static final SqlColumn<String> remark2 = itemInfo.remark2;
+
+    /**
+     *   备注3
+     */
+    public static final SqlColumn<String> remark3 = itemInfo.remark3;
+
+    /**
+     *   备注4
+     */
+    public static final SqlColumn<String> remark4 = itemInfo.remark4;
+
+    /**
+     *   备注5
+     */
+    public static final SqlColumn<String> remark5 = itemInfo.remark5;
+
+    /**
+     *   供货周期
+     */
+    public static final SqlColumn<String> deliveryPeriod = itemInfo.deliveryPeriod;
+
+    /**
+     *   默认库位号
+     */
+    public static final SqlColumn<String> defaultStgBinCd = itemInfo.defaultStgBinCd;
+
+    /**
+     *   启用标志
+     */
+    public static final SqlColumn<Integer> enableFlg = itemInfo.enableFlg;
+
+    /**
+     *   安全库存量
+     */
+    public static final SqlColumn<BigDecimal> safetyStock = itemInfo.safetyStock;
+
+    /**
+     *   最大库存量
+     */
+    public static final SqlColumn<BigDecimal> maxInvQty = itemInfo.maxInvQty;
+
+    /**
+     *   发起购买的阈值
+     */
+    public static final SqlColumn<BigDecimal> purchLimitQty = itemInfo.purchLimitQty;
+
+    /**
+     *   物品区分
+     */
+    public static final SqlColumn<String> goodsCls = itemInfo.goodsCls;
+
+    /**
+     *   批号管理区分(0:不管理, 1:管理)
+     */
+    public static final SqlColumn<Integer> lotNoMgmtCls = itemInfo.lotNoMgmtCls;
+
+    /**
+     *   物品类型代码
+     */
+    public static final SqlColumn<String> itemTypeCd = itemInfo.itemTypeCd;
+
+    /**
+     *   标准单位代码
+     */
+    public static final SqlColumn<String> stdUnitCd = itemInfo.stdUnitCd;
+
+    /**
+     *   包装单位代码
+     */
+    public static final SqlColumn<String> pkgUnitCd = itemInfo.pkgUnitCd;
+
+    /**
+     *   出库申请最小数量
+     */
+    public static final SqlColumn<BigDecimal> outstockReqMinQty = itemInfo.outstockReqMinQty;
+
+    /**
+     *   出库单位区分
+     */
+    public static final SqlColumn<String> outstockUnitCls = itemInfo.outstockUnitCls;
+
+    /**
+     *   单位净重
+     */
+    public static final SqlColumn<BigDecimal> netWeightPerUnit = itemInfo.netWeightPerUnit;
+
+    /**
+     *   自身体积(M3)
+     */
+    public static final SqlColumn<BigDecimal> ownVolM3 = itemInfo.ownVolM3;
+
+    /**
+     *   尺寸(长)
+     */
+    public static final SqlColumn<BigDecimal> sizeD = itemInfo.sizeD;
+
+    /**
+     *   尺寸(宽)
+     */
+    public static final SqlColumn<BigDecimal> sizeW = itemInfo.sizeW;
+
+    /**
+     *   尺寸(高)
+     */
+    public static final SqlColumn<BigDecimal> sizeH = itemInfo.sizeH;
+
+    /**
+     *   包装要求描述
+     */
+    public static final SqlColumn<String> pkgRqmtDesc = itemInfo.pkgRqmtDesc;
+
+    /**
+     *   码放要求描述
+     */
+    public static final SqlColumn<String> stackingRqmtDesc = itemInfo.stackingRqmtDesc;
+
+    /**
+     *   储存要求描述
+     */
+    public static final SqlColumn<String> stgRqmtDesc = itemInfo.stgRqmtDesc;
+
+    /**
+     *   生产商
+     */
+    public static final SqlColumn<String> manufacturer = itemInfo.manufacturer;
+
+    /**
+     *   图片ID
+     */
+    public static final SqlColumn<String> pictureId = itemInfo.pictureId;
+
+    /**
+     *   图片URL
+     */
+    public static final SqlColumn<String> pictureUrl = itemInfo.pictureUrl;
+
+    public static final class ItemInfo extends AliasableSqlTable<ItemInfo> {
+        public final SqlColumn<String> itemCd = column("ITEM_CD", JDBCType.VARCHAR);
+
+        public final SqlColumn<Integer> deptId = column("DEPT_ID", JDBCType.INTEGER);
+
+        public final SqlColumn<String> itemName = column("ITEM_NAME", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> supplier = column("SUPPLIER", JDBCType.VARCHAR);
+
+        public final SqlColumn<BigDecimal> prepLeadTime = column("PREP_LEAD_TIME", JDBCType.DECIMAL);
+
+        public final SqlColumn<BigDecimal> instockLeadTime = column("INSTOCK_LEAD_TIME", JDBCType.DECIMAL);
+
+        public final SqlColumn<BigDecimal> restingPeriod = column("RESTING_PERIOD", JDBCType.DECIMAL);
+
+        public final SqlColumn<BigDecimal> outstockLeadTime = column("OUTSTOCK_LEAD_TIME", JDBCType.DECIMAL);
+
+        public final SqlColumn<String> spec1 = column("SPEC_1", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> spec2 = column("SPEC_2", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> spec3 = column("SPEC_3", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> spec4 = column("SPEC_4", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> spec5 = column("SPEC_5", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> cls1 = column("CLS_1", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> cls2 = column("CLS_2", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> cls3 = column("CLS_3", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> cls4 = column("CLS_4", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> cls5 = column("CLS_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 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<String> deliveryPeriod = column("DELIVERY_PERIOD", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> defaultStgBinCd = column("DEFAULT_STG_BIN_CD", JDBCType.VARCHAR);
+
+        public final SqlColumn<Integer> enableFlg = column("ENABLE_FLG", JDBCType.INTEGER);
+
+        public final SqlColumn<BigDecimal> safetyStock = column("SAFETY_STOCK", JDBCType.DECIMAL);
+
+        public final SqlColumn<BigDecimal> maxInvQty = column("MAX_INV_QTY", JDBCType.DECIMAL);
+
+        public final SqlColumn<BigDecimal> purchLimitQty = column("PURCH_LIMIT_QTY", JDBCType.DECIMAL);
+
+        public final SqlColumn<String> goodsCls = column("GOODS_CLS", JDBCType.VARCHAR);
+
+        public final SqlColumn<Integer> lotNoMgmtCls = column("LOT_NO_MGMT_CLS", JDBCType.INTEGER);
+
+        public final SqlColumn<String> itemTypeCd = column("ITEM_TYPE_CD", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> stdUnitCd = column("STD_UNIT_CD", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> pkgUnitCd = column("PKG_UNIT_CD", JDBCType.VARCHAR);
+
+        public final SqlColumn<BigDecimal> outstockReqMinQty = column("OUTSTOCK_REQ_MIN_QTY", JDBCType.DECIMAL);
+
+        public final SqlColumn<String> outstockUnitCls = column("OUTSTOCK_UNIT_CLS", JDBCType.VARCHAR);
+
+        public final SqlColumn<BigDecimal> netWeightPerUnit = column("NET_WEIGHT_PER_UNIT", JDBCType.DECIMAL);
+
+        public final SqlColumn<BigDecimal> ownVolM3 = column("OWN_VOL_M3", JDBCType.DECIMAL);
+
+        public final SqlColumn<BigDecimal> sizeD = column("SIZE_D", JDBCType.DECIMAL);
+
+        public final SqlColumn<BigDecimal> sizeW = column("SIZE_W", JDBCType.DECIMAL);
+
+        public final SqlColumn<BigDecimal> sizeH = column("SIZE_H", JDBCType.DECIMAL);
+
+        public final SqlColumn<String> pkgRqmtDesc = column("PKG_RQMT_DESC", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> stackingRqmtDesc = column("STACKING_RQMT_DESC", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> stgRqmtDesc = column("STG_RQMT_DESC", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> manufacturer = column("MANUFACTURER", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> pictureId = column("PICTURE_ID", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> pictureUrl = column("PICTURE_URL", JDBCType.VARCHAR);
+
+        public ItemInfo() {
+            super("WMS_M_ITEM_INFO", ItemInfo::new);
+        }
+    }
+}

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

@@ -0,0 +1,550 @@
+package com.ruoyi.wms.mapper;
+
+import static com.ruoyi.wms.mapper.ItemInfoDynamicSqlSupport.*;
+import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
+
+import com.ruoyi.common.security.utils.SecurityUtilsExt;
+import com.ruoyi.wms.domain.ItemInfo;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.type.JdbcType;
+import org.mybatis.dynamic.sql.BasicColumn;
+import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
+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.CommonCountMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
+
+@Mapper
+public interface ItemInfoMapper extends CommonCountMapper, CommonDeleteMapper, CommonInsertMapper<ItemInfo>, CommonUpdateMapper {
+    BasicColumn[] selectList = BasicColumn.columnList(itemCd, deptId, itemName, supplier, prepLeadTime, instockLeadTime, restingPeriod, outstockLeadTime, spec1, spec2, spec3, spec4, spec5, cls1, cls2, cls3, cls4, cls5, updateCount, deleteFlag, createBy, createTime, updateBy, updateTime, remark, remark1, remark2, remark3, remark4, remark5, deliveryPeriod, defaultStgBinCd, enableFlg, safetyStock, maxInvQty, purchLimitQty, goodsCls, lotNoMgmtCls, itemTypeCd, stdUnitCd, pkgUnitCd, outstockReqMinQty, outstockUnitCls, netWeightPerUnit, ownVolM3, sizeD, sizeW, sizeH, pkgRqmtDesc, stackingRqmtDesc, stgRqmtDesc, manufacturer, pictureId, pictureUrl);
+
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @Results(id="ItemInfoResult", value = {
+        @Result(column="ITEM_CD", property="itemCd", jdbcType=JdbcType.VARCHAR, id=true),
+        @Result(column="DEPT_ID", property="deptId", jdbcType=JdbcType.INTEGER),
+        @Result(column="ITEM_NAME", property="itemName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="SUPPLIER", property="supplier", jdbcType=JdbcType.VARCHAR),
+        @Result(column="PREP_LEAD_TIME", property="prepLeadTime", jdbcType=JdbcType.DECIMAL),
+        @Result(column="INSTOCK_LEAD_TIME", property="instockLeadTime", jdbcType=JdbcType.DECIMAL),
+        @Result(column="RESTING_PERIOD", property="restingPeriod", jdbcType=JdbcType.DECIMAL),
+        @Result(column="OUTSTOCK_LEAD_TIME", property="outstockLeadTime", jdbcType=JdbcType.DECIMAL),
+        @Result(column="SPEC_1", property="spec1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="SPEC_2", property="spec2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="SPEC_3", property="spec3", jdbcType=JdbcType.VARCHAR),
+        @Result(column="SPEC_4", property="spec4", jdbcType=JdbcType.VARCHAR),
+        @Result(column="SPEC_5", property="spec5", jdbcType=JdbcType.VARCHAR),
+        @Result(column="CLS_1", property="cls1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="CLS_2", property="cls2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="CLS_3", property="cls3", jdbcType=JdbcType.VARCHAR),
+        @Result(column="CLS_4", property="cls4", jdbcType=JdbcType.VARCHAR),
+        @Result(column="CLS_5", property="cls5", 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),
+        @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="DELIVERY_PERIOD", property="deliveryPeriod", jdbcType=JdbcType.VARCHAR),
+        @Result(column="DEFAULT_STG_BIN_CD", property="defaultStgBinCd", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ENABLE_FLG", property="enableFlg", jdbcType=JdbcType.INTEGER),
+        @Result(column="SAFETY_STOCK", property="safetyStock", jdbcType=JdbcType.DECIMAL),
+        @Result(column="MAX_INV_QTY", property="maxInvQty", jdbcType=JdbcType.DECIMAL),
+        @Result(column="PURCH_LIMIT_QTY", property="purchLimitQty", jdbcType=JdbcType.DECIMAL),
+        @Result(column="GOODS_CLS", property="goodsCls", jdbcType=JdbcType.VARCHAR),
+        @Result(column="LOT_NO_MGMT_CLS", property="lotNoMgmtCls", jdbcType=JdbcType.INTEGER),
+        @Result(column="ITEM_TYPE_CD", property="itemTypeCd", jdbcType=JdbcType.VARCHAR),
+        @Result(column="STD_UNIT_CD", property="stdUnitCd", jdbcType=JdbcType.VARCHAR),
+        @Result(column="PKG_UNIT_CD", property="pkgUnitCd", jdbcType=JdbcType.VARCHAR),
+        @Result(column="OUTSTOCK_REQ_MIN_QTY", property="outstockReqMinQty", jdbcType=JdbcType.DECIMAL),
+        @Result(column="OUTSTOCK_UNIT_CLS", property="outstockUnitCls", jdbcType=JdbcType.VARCHAR),
+        @Result(column="NET_WEIGHT_PER_UNIT", property="netWeightPerUnit", jdbcType=JdbcType.DECIMAL),
+        @Result(column="OWN_VOL_M3", property="ownVolM3", jdbcType=JdbcType.DECIMAL),
+        @Result(column="SIZE_D", property="sizeD", jdbcType=JdbcType.DECIMAL),
+        @Result(column="SIZE_W", property="sizeW", jdbcType=JdbcType.DECIMAL),
+        @Result(column="SIZE_H", property="sizeH", jdbcType=JdbcType.DECIMAL),
+        @Result(column="PKG_RQMT_DESC", property="pkgRqmtDesc", jdbcType=JdbcType.VARCHAR),
+        @Result(column="STACKING_RQMT_DESC", property="stackingRqmtDesc", jdbcType=JdbcType.VARCHAR),
+        @Result(column="STG_RQMT_DESC", property="stgRqmtDesc", jdbcType=JdbcType.VARCHAR),
+        @Result(column="MANUFACTURER", property="manufacturer", jdbcType=JdbcType.VARCHAR),
+        @Result(column="PICTURE_ID", property="pictureId", jdbcType=JdbcType.VARCHAR),
+        @Result(column="PICTURE_URL", property="pictureUrl", jdbcType=JdbcType.VARCHAR)
+    })
+    List<ItemInfo> selectMany(SelectStatementProvider selectStatement);
+
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @ResultMap("ItemInfoResult")
+    Optional<ItemInfo> selectOne(SelectStatementProvider selectStatement);
+
+    default long count(CountDSLCompleter completer) {
+        return MyBatis3Utils.countFrom(this::count, itemInfo, completer);
+    }
+
+    default int delete(DeleteDSLCompleter completer) {
+        return MyBatis3Utils.deleteFrom(this::delete, itemInfo, completer);
+    }
+
+    default int deleteByPrimaryKey(String itemCd_) {
+        return delete(c -> 
+            c.where(itemCd, isEqualTo(itemCd_))
+        );
+    }
+
+    default int insert(ItemInfo row) {
+        row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
+        return MyBatis3Utils.insert(this::insert, row, itemInfo, c ->
+            c.map(itemCd).toProperty("itemCd")
+            .map(deptId).toProperty("deptId")
+            .map(itemName).toProperty("itemName")
+            .map(supplier).toProperty("supplier")
+            .map(prepLeadTime).toProperty("prepLeadTime")
+            .map(instockLeadTime).toProperty("instockLeadTime")
+            .map(restingPeriod).toProperty("restingPeriod")
+            .map(outstockLeadTime).toProperty("outstockLeadTime")
+            .map(spec1).toProperty("spec1")
+            .map(spec2).toProperty("spec2")
+            .map(spec3).toProperty("spec3")
+            .map(spec4).toProperty("spec4")
+            .map(spec5).toProperty("spec5")
+            .map(cls1).toProperty("cls1")
+            .map(cls2).toProperty("cls2")
+            .map(cls3).toProperty("cls3")
+            .map(cls4).toProperty("cls4")
+            .map(cls5).toProperty("cls5")
+            .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")
+            .map(remark1).toProperty("remark1")
+            .map(remark2).toProperty("remark2")
+            .map(remark3).toProperty("remark3")
+            .map(remark4).toProperty("remark4")
+            .map(remark5).toProperty("remark5")
+            .map(deliveryPeriod).toProperty("deliveryPeriod")
+            .map(defaultStgBinCd).toProperty("defaultStgBinCd")
+            .map(enableFlg).toProperty("enableFlg")
+            .map(safetyStock).toProperty("safetyStock")
+            .map(maxInvQty).toProperty("maxInvQty")
+            .map(purchLimitQty).toProperty("purchLimitQty")
+            .map(goodsCls).toProperty("goodsCls")
+            .map(lotNoMgmtCls).toProperty("lotNoMgmtCls")
+            .map(itemTypeCd).toProperty("itemTypeCd")
+            .map(stdUnitCd).toProperty("stdUnitCd")
+            .map(pkgUnitCd).toProperty("pkgUnitCd")
+            .map(outstockReqMinQty).toProperty("outstockReqMinQty")
+            .map(outstockUnitCls).toProperty("outstockUnitCls")
+            .map(netWeightPerUnit).toProperty("netWeightPerUnit")
+            .map(ownVolM3).toProperty("ownVolM3")
+            .map(sizeD).toProperty("sizeD")
+            .map(sizeW).toProperty("sizeW")
+            .map(sizeH).toProperty("sizeH")
+            .map(pkgRqmtDesc).toProperty("pkgRqmtDesc")
+            .map(stackingRqmtDesc).toProperty("stackingRqmtDesc")
+            .map(stgRqmtDesc).toProperty("stgRqmtDesc")
+            .map(manufacturer).toProperty("manufacturer")
+            .map(pictureId).toProperty("pictureId")
+            .map(pictureUrl).toProperty("pictureUrl")
+        );
+    }
+
+    default int insertMultiple(Collection<ItemInfo> records) {
+        for (ItemInfo row : records) {
+            row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
+        }
+        return MyBatis3Utils.insertMultiple(this::insertMultiple, records, itemInfo, c ->
+            c.map(itemCd).toProperty("itemCd")
+            .map(deptId).toProperty("deptId")
+            .map(itemName).toProperty("itemName")
+            .map(supplier).toProperty("supplier")
+            .map(prepLeadTime).toProperty("prepLeadTime")
+            .map(instockLeadTime).toProperty("instockLeadTime")
+            .map(restingPeriod).toProperty("restingPeriod")
+            .map(outstockLeadTime).toProperty("outstockLeadTime")
+            .map(spec1).toProperty("spec1")
+            .map(spec2).toProperty("spec2")
+            .map(spec3).toProperty("spec3")
+            .map(spec4).toProperty("spec4")
+            .map(spec5).toProperty("spec5")
+            .map(cls1).toProperty("cls1")
+            .map(cls2).toProperty("cls2")
+            .map(cls3).toProperty("cls3")
+            .map(cls4).toProperty("cls4")
+            .map(cls5).toProperty("cls5")
+            .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")
+            .map(remark1).toProperty("remark1")
+            .map(remark2).toProperty("remark2")
+            .map(remark3).toProperty("remark3")
+            .map(remark4).toProperty("remark4")
+            .map(remark5).toProperty("remark5")
+            .map(deliveryPeriod).toProperty("deliveryPeriod")
+            .map(defaultStgBinCd).toProperty("defaultStgBinCd")
+            .map(enableFlg).toProperty("enableFlg")
+            .map(safetyStock).toProperty("safetyStock")
+            .map(maxInvQty).toProperty("maxInvQty")
+            .map(purchLimitQty).toProperty("purchLimitQty")
+            .map(goodsCls).toProperty("goodsCls")
+            .map(lotNoMgmtCls).toProperty("lotNoMgmtCls")
+            .map(itemTypeCd).toProperty("itemTypeCd")
+            .map(stdUnitCd).toProperty("stdUnitCd")
+            .map(pkgUnitCd).toProperty("pkgUnitCd")
+            .map(outstockReqMinQty).toProperty("outstockReqMinQty")
+            .map(outstockUnitCls).toProperty("outstockUnitCls")
+            .map(netWeightPerUnit).toProperty("netWeightPerUnit")
+            .map(ownVolM3).toProperty("ownVolM3")
+            .map(sizeD).toProperty("sizeD")
+            .map(sizeW).toProperty("sizeW")
+            .map(sizeH).toProperty("sizeH")
+            .map(pkgRqmtDesc).toProperty("pkgRqmtDesc")
+            .map(stackingRqmtDesc).toProperty("stackingRqmtDesc")
+            .map(stgRqmtDesc).toProperty("stgRqmtDesc")
+            .map(manufacturer).toProperty("manufacturer")
+            .map(pictureId).toProperty("pictureId")
+            .map(pictureUrl).toProperty("pictureUrl")
+        );
+    }
+
+    default int insertSelective(ItemInfo row) {
+        row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
+        return MyBatis3Utils.insert(this::insert, row, itemInfo, c ->
+            c.map(itemCd).toPropertyWhenPresent("itemCd", row::getItemCd)
+            .map(deptId).toPropertyWhenPresent("deptId", row::getDeptId)
+            .map(itemName).toPropertyWhenPresent("itemName", row::getItemName)
+            .map(supplier).toPropertyWhenPresent("supplier", row::getSupplier)
+            .map(prepLeadTime).toPropertyWhenPresent("prepLeadTime", row::getPrepLeadTime)
+            .map(instockLeadTime).toPropertyWhenPresent("instockLeadTime", row::getInstockLeadTime)
+            .map(restingPeriod).toPropertyWhenPresent("restingPeriod", row::getRestingPeriod)
+            .map(outstockLeadTime).toPropertyWhenPresent("outstockLeadTime", row::getOutstockLeadTime)
+            .map(spec1).toPropertyWhenPresent("spec1", row::getSpec1)
+            .map(spec2).toPropertyWhenPresent("spec2", row::getSpec2)
+            .map(spec3).toPropertyWhenPresent("spec3", row::getSpec3)
+            .map(spec4).toPropertyWhenPresent("spec4", row::getSpec4)
+            .map(spec5).toPropertyWhenPresent("spec5", row::getSpec5)
+            .map(cls1).toPropertyWhenPresent("cls1", row::getCls1)
+            .map(cls2).toPropertyWhenPresent("cls2", row::getCls2)
+            .map(cls3).toPropertyWhenPresent("cls3", row::getCls3)
+            .map(cls4).toPropertyWhenPresent("cls4", row::getCls4)
+            .map(cls5).toPropertyWhenPresent("cls5", row::getCls5)
+            .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)
+            .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(deliveryPeriod).toPropertyWhenPresent("deliveryPeriod", row::getDeliveryPeriod)
+            .map(defaultStgBinCd).toPropertyWhenPresent("defaultStgBinCd", row::getDefaultStgBinCd)
+            .map(enableFlg).toPropertyWhenPresent("enableFlg", row::getEnableFlg)
+            .map(safetyStock).toPropertyWhenPresent("safetyStock", row::getSafetyStock)
+            .map(maxInvQty).toPropertyWhenPresent("maxInvQty", row::getMaxInvQty)
+            .map(purchLimitQty).toPropertyWhenPresent("purchLimitQty", row::getPurchLimitQty)
+            .map(goodsCls).toPropertyWhenPresent("goodsCls", row::getGoodsCls)
+            .map(lotNoMgmtCls).toPropertyWhenPresent("lotNoMgmtCls", row::getLotNoMgmtCls)
+            .map(itemTypeCd).toPropertyWhenPresent("itemTypeCd", row::getItemTypeCd)
+            .map(stdUnitCd).toPropertyWhenPresent("stdUnitCd", row::getStdUnitCd)
+            .map(pkgUnitCd).toPropertyWhenPresent("pkgUnitCd", row::getPkgUnitCd)
+            .map(outstockReqMinQty).toPropertyWhenPresent("outstockReqMinQty", row::getOutstockReqMinQty)
+            .map(outstockUnitCls).toPropertyWhenPresent("outstockUnitCls", row::getOutstockUnitCls)
+            .map(netWeightPerUnit).toPropertyWhenPresent("netWeightPerUnit", row::getNetWeightPerUnit)
+            .map(ownVolM3).toPropertyWhenPresent("ownVolM3", row::getOwnVolM3)
+            .map(sizeD).toPropertyWhenPresent("sizeD", row::getSizeD)
+            .map(sizeW).toPropertyWhenPresent("sizeW", row::getSizeW)
+            .map(sizeH).toPropertyWhenPresent("sizeH", row::getSizeH)
+            .map(pkgRqmtDesc).toPropertyWhenPresent("pkgRqmtDesc", row::getPkgRqmtDesc)
+            .map(stackingRqmtDesc).toPropertyWhenPresent("stackingRqmtDesc", row::getStackingRqmtDesc)
+            .map(stgRqmtDesc).toPropertyWhenPresent("stgRqmtDesc", row::getStgRqmtDesc)
+            .map(manufacturer).toPropertyWhenPresent("manufacturer", row::getManufacturer)
+            .map(pictureId).toPropertyWhenPresent("pictureId", row::getPictureId)
+            .map(pictureUrl).toPropertyWhenPresent("pictureUrl", row::getPictureUrl)
+        );
+    }
+
+    default Optional<ItemInfo> selectOne(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectOne(this::selectOne, selectList, itemInfo, completer);
+    }
+
+    default List<ItemInfo> select(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectList(this::selectMany, selectList, itemInfo, completer);
+    }
+
+    default List<ItemInfo> selectDistinct(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectDistinct(this::selectMany, selectList, itemInfo, completer);
+    }
+
+    default Optional<ItemInfo> selectByPrimaryKey(String itemCd_) {
+        return selectOne(c ->
+            c.where(itemCd, isEqualTo(itemCd_))
+        );
+    }
+
+    default int update(UpdateDSLCompleter completer) {
+        return MyBatis3Utils.update(this::update, itemInfo, completer);
+    }
+
+    static UpdateDSL<UpdateModel> updateAllColumns(ItemInfo row, UpdateDSL<UpdateModel> dsl) {
+        return dsl.set(itemCd).equalTo(row::getItemCd)
+                .set(deptId).equalTo(row::getDeptId)
+                .set(itemName).equalTo(row::getItemName)
+                .set(supplier).equalTo(row::getSupplier)
+                .set(prepLeadTime).equalTo(row::getPrepLeadTime)
+                .set(instockLeadTime).equalTo(row::getInstockLeadTime)
+                .set(restingPeriod).equalTo(row::getRestingPeriod)
+                .set(outstockLeadTime).equalTo(row::getOutstockLeadTime)
+                .set(spec1).equalTo(row::getSpec1)
+                .set(spec2).equalTo(row::getSpec2)
+                .set(spec3).equalTo(row::getSpec3)
+                .set(spec4).equalTo(row::getSpec4)
+                .set(spec5).equalTo(row::getSpec5)
+                .set(cls1).equalTo(row::getCls1)
+                .set(cls2).equalTo(row::getCls2)
+                .set(cls3).equalTo(row::getCls3)
+                .set(cls4).equalTo(row::getCls4)
+                .set(cls5).equalTo(row::getCls5)
+                .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)
+                .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(deliveryPeriod).equalTo(row::getDeliveryPeriod)
+                .set(defaultStgBinCd).equalTo(row::getDefaultStgBinCd)
+                .set(enableFlg).equalTo(row::getEnableFlg)
+                .set(safetyStock).equalTo(row::getSafetyStock)
+                .set(maxInvQty).equalTo(row::getMaxInvQty)
+                .set(purchLimitQty).equalTo(row::getPurchLimitQty)
+                .set(goodsCls).equalTo(row::getGoodsCls)
+                .set(lotNoMgmtCls).equalTo(row::getLotNoMgmtCls)
+                .set(itemTypeCd).equalTo(row::getItemTypeCd)
+                .set(stdUnitCd).equalTo(row::getStdUnitCd)
+                .set(pkgUnitCd).equalTo(row::getPkgUnitCd)
+                .set(outstockReqMinQty).equalTo(row::getOutstockReqMinQty)
+                .set(outstockUnitCls).equalTo(row::getOutstockUnitCls)
+                .set(netWeightPerUnit).equalTo(row::getNetWeightPerUnit)
+                .set(ownVolM3).equalTo(row::getOwnVolM3)
+                .set(sizeD).equalTo(row::getSizeD)
+                .set(sizeW).equalTo(row::getSizeW)
+                .set(sizeH).equalTo(row::getSizeH)
+                .set(pkgRqmtDesc).equalTo(row::getPkgRqmtDesc)
+                .set(stackingRqmtDesc).equalTo(row::getStackingRqmtDesc)
+                .set(stgRqmtDesc).equalTo(row::getStgRqmtDesc)
+                .set(manufacturer).equalTo(row::getManufacturer)
+                .set(pictureId).equalTo(row::getPictureId)
+                .set(pictureUrl).equalTo(row::getPictureUrl);
+    }
+
+    static UpdateDSL<UpdateModel> updateSelectiveColumns(ItemInfo row, UpdateDSL<UpdateModel> dsl) {
+        row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr());
+        return dsl.set(itemCd).equalToWhenPresent(row::getItemCd)
+                .set(deptId).equalToWhenPresent(row::getDeptId)
+                .set(itemName).equalToWhenPresent(row::getItemName)
+                .set(supplier).equalToWhenPresent(row::getSupplier)
+                .set(prepLeadTime).equalToWhenPresent(row::getPrepLeadTime)
+                .set(instockLeadTime).equalToWhenPresent(row::getInstockLeadTime)
+                .set(restingPeriod).equalToWhenPresent(row::getRestingPeriod)
+                .set(outstockLeadTime).equalToWhenPresent(row::getOutstockLeadTime)
+                .set(spec1).equalToWhenPresent(row::getSpec1)
+                .set(spec2).equalToWhenPresent(row::getSpec2)
+                .set(spec3).equalToWhenPresent(row::getSpec3)
+                .set(spec4).equalToWhenPresent(row::getSpec4)
+                .set(spec5).equalToWhenPresent(row::getSpec5)
+                .set(cls1).equalToWhenPresent(row::getCls1)
+                .set(cls2).equalToWhenPresent(row::getCls2)
+                .set(cls3).equalToWhenPresent(row::getCls3)
+                .set(cls4).equalToWhenPresent(row::getCls4)
+                .set(cls5).equalToWhenPresent(row::getCls5)
+                .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)
+                .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(deliveryPeriod).equalToWhenPresent(row::getDeliveryPeriod)
+                .set(defaultStgBinCd).equalToWhenPresent(row::getDefaultStgBinCd)
+                .set(enableFlg).equalToWhenPresent(row::getEnableFlg)
+                .set(safetyStock).equalToWhenPresent(row::getSafetyStock)
+                .set(maxInvQty).equalToWhenPresent(row::getMaxInvQty)
+                .set(purchLimitQty).equalToWhenPresent(row::getPurchLimitQty)
+                .set(goodsCls).equalToWhenPresent(row::getGoodsCls)
+                .set(lotNoMgmtCls).equalToWhenPresent(row::getLotNoMgmtCls)
+                .set(itemTypeCd).equalToWhenPresent(row::getItemTypeCd)
+                .set(stdUnitCd).equalToWhenPresent(row::getStdUnitCd)
+                .set(pkgUnitCd).equalToWhenPresent(row::getPkgUnitCd)
+                .set(outstockReqMinQty).equalToWhenPresent(row::getOutstockReqMinQty)
+                .set(outstockUnitCls).equalToWhenPresent(row::getOutstockUnitCls)
+                .set(netWeightPerUnit).equalToWhenPresent(row::getNetWeightPerUnit)
+                .set(ownVolM3).equalToWhenPresent(row::getOwnVolM3)
+                .set(sizeD).equalToWhenPresent(row::getSizeD)
+                .set(sizeW).equalToWhenPresent(row::getSizeW)
+                .set(sizeH).equalToWhenPresent(row::getSizeH)
+                .set(pkgRqmtDesc).equalToWhenPresent(row::getPkgRqmtDesc)
+                .set(stackingRqmtDesc).equalToWhenPresent(row::getStackingRqmtDesc)
+                .set(stgRqmtDesc).equalToWhenPresent(row::getStgRqmtDesc)
+                .set(manufacturer).equalToWhenPresent(row::getManufacturer)
+                .set(pictureId).equalToWhenPresent(row::getPictureId)
+                .set(pictureUrl).equalToWhenPresent(row::getPictureUrl);
+    }
+
+    default int updateByPrimaryKey(ItemInfo row) {
+        return update(c ->
+            c.set(deptId).equalTo(row::getDeptId)
+            .set(itemName).equalTo(row::getItemName)
+            .set(supplier).equalTo(row::getSupplier)
+            .set(prepLeadTime).equalTo(row::getPrepLeadTime)
+            .set(instockLeadTime).equalTo(row::getInstockLeadTime)
+            .set(restingPeriod).equalTo(row::getRestingPeriod)
+            .set(outstockLeadTime).equalTo(row::getOutstockLeadTime)
+            .set(spec1).equalTo(row::getSpec1)
+            .set(spec2).equalTo(row::getSpec2)
+            .set(spec3).equalTo(row::getSpec3)
+            .set(spec4).equalTo(row::getSpec4)
+            .set(spec5).equalTo(row::getSpec5)
+            .set(cls1).equalTo(row::getCls1)
+            .set(cls2).equalTo(row::getCls2)
+            .set(cls3).equalTo(row::getCls3)
+            .set(cls4).equalTo(row::getCls4)
+            .set(cls5).equalTo(row::getCls5)
+            .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)
+            .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(deliveryPeriod).equalTo(row::getDeliveryPeriod)
+            .set(defaultStgBinCd).equalTo(row::getDefaultStgBinCd)
+            .set(enableFlg).equalTo(row::getEnableFlg)
+            .set(safetyStock).equalTo(row::getSafetyStock)
+            .set(maxInvQty).equalTo(row::getMaxInvQty)
+            .set(purchLimitQty).equalTo(row::getPurchLimitQty)
+            .set(goodsCls).equalTo(row::getGoodsCls)
+            .set(lotNoMgmtCls).equalTo(row::getLotNoMgmtCls)
+            .set(itemTypeCd).equalTo(row::getItemTypeCd)
+            .set(stdUnitCd).equalTo(row::getStdUnitCd)
+            .set(pkgUnitCd).equalTo(row::getPkgUnitCd)
+            .set(outstockReqMinQty).equalTo(row::getOutstockReqMinQty)
+            .set(outstockUnitCls).equalTo(row::getOutstockUnitCls)
+            .set(netWeightPerUnit).equalTo(row::getNetWeightPerUnit)
+            .set(ownVolM3).equalTo(row::getOwnVolM3)
+            .set(sizeD).equalTo(row::getSizeD)
+            .set(sizeW).equalTo(row::getSizeW)
+            .set(sizeH).equalTo(row::getSizeH)
+            .set(pkgRqmtDesc).equalTo(row::getPkgRqmtDesc)
+            .set(stackingRqmtDesc).equalTo(row::getStackingRqmtDesc)
+            .set(stgRqmtDesc).equalTo(row::getStgRqmtDesc)
+            .set(manufacturer).equalTo(row::getManufacturer)
+            .set(pictureId).equalTo(row::getPictureId)
+            .set(pictureUrl).equalTo(row::getPictureUrl)
+            .where(itemCd, isEqualTo(row::getItemCd))
+        );
+    }
+
+    default int updateByPrimaryKeySelective(ItemInfo row) {
+        row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr());
+        return update(c ->
+            c.set(deptId).equalToWhenPresent(row::getDeptId)
+            .set(itemName).equalToWhenPresent(row::getItemName)
+            .set(supplier).equalToWhenPresent(row::getSupplier)
+            .set(prepLeadTime).equalToWhenPresent(row::getPrepLeadTime)
+            .set(instockLeadTime).equalToWhenPresent(row::getInstockLeadTime)
+            .set(restingPeriod).equalToWhenPresent(row::getRestingPeriod)
+            .set(outstockLeadTime).equalToWhenPresent(row::getOutstockLeadTime)
+            .set(spec1).equalToWhenPresent(row::getSpec1)
+            .set(spec2).equalToWhenPresent(row::getSpec2)
+            .set(spec3).equalToWhenPresent(row::getSpec3)
+            .set(spec4).equalToWhenPresent(row::getSpec4)
+            .set(spec5).equalToWhenPresent(row::getSpec5)
+            .set(cls1).equalToWhenPresent(row::getCls1)
+            .set(cls2).equalToWhenPresent(row::getCls2)
+            .set(cls3).equalToWhenPresent(row::getCls3)
+            .set(cls4).equalToWhenPresent(row::getCls4)
+            .set(cls5).equalToWhenPresent(row::getCls5)
+            .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)
+            .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(deliveryPeriod).equalToWhenPresent(row::getDeliveryPeriod)
+            .set(defaultStgBinCd).equalToWhenPresent(row::getDefaultStgBinCd)
+            .set(enableFlg).equalToWhenPresent(row::getEnableFlg)
+            .set(safetyStock).equalToWhenPresent(row::getSafetyStock)
+            .set(maxInvQty).equalToWhenPresent(row::getMaxInvQty)
+            .set(purchLimitQty).equalToWhenPresent(row::getPurchLimitQty)
+            .set(goodsCls).equalToWhenPresent(row::getGoodsCls)
+            .set(lotNoMgmtCls).equalToWhenPresent(row::getLotNoMgmtCls)
+            .set(itemTypeCd).equalToWhenPresent(row::getItemTypeCd)
+            .set(stdUnitCd).equalToWhenPresent(row::getStdUnitCd)
+            .set(pkgUnitCd).equalToWhenPresent(row::getPkgUnitCd)
+            .set(outstockReqMinQty).equalToWhenPresent(row::getOutstockReqMinQty)
+            .set(outstockUnitCls).equalToWhenPresent(row::getOutstockUnitCls)
+            .set(netWeightPerUnit).equalToWhenPresent(row::getNetWeightPerUnit)
+            .set(ownVolM3).equalToWhenPresent(row::getOwnVolM3)
+            .set(sizeD).equalToWhenPresent(row::getSizeD)
+            .set(sizeW).equalToWhenPresent(row::getSizeW)
+            .set(sizeH).equalToWhenPresent(row::getSizeH)
+            .set(pkgRqmtDesc).equalToWhenPresent(row::getPkgRqmtDesc)
+            .set(stackingRqmtDesc).equalToWhenPresent(row::getStackingRqmtDesc)
+            .set(stgRqmtDesc).equalToWhenPresent(row::getStgRqmtDesc)
+            .set(manufacturer).equalToWhenPresent(row::getManufacturer)
+            .set(pictureId).equalToWhenPresent(row::getPictureId)
+            .set(pictureUrl).equalToWhenPresent(row::getPictureUrl)
+            .where(itemCd, isEqualTo(row::getItemCd))
+        );
+    }
+}

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

@@ -1,94 +1,95 @@
 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 {
+import java.sql.JDBCType;
-    public static final GoodsType goodsType = new GoodsType();
+import java.util.Date;
+
+public final class ItemTypeDynamicSqlSupport {
+    public static final ItemType itemType = new ItemType();
 
     /**
      *   物品类型编码
      */
-    public static final SqlColumn<String> goodsTypeCd = goodsType.goodsTypeCd;
+    public static final SqlColumn<String> itemTypeCd = itemType.itemTypeCd;
 
     /**
      *   从属部门ID
      */
-    public static final SqlColumn<Integer> deptId = goodsType.deptId;
+    public static final SqlColumn<Integer> deptId = itemType.deptId;
 
     /**
      *   物品类型名称
      */
-    public static final SqlColumn<String> goodsTypeName = goodsType.goodsTypeName;
+    public static final SqlColumn<String> itemTypeName = itemType.itemTypeName;
 
     /**
      *   备注1
      */
-    public static final SqlColumn<String> remark1 = goodsType.remark1;
+    public static final SqlColumn<String> remark1 = itemType.remark1;
 
     /**
      *   备注2
      */
-    public static final SqlColumn<String> remark2 = goodsType.remark2;
+    public static final SqlColumn<String> remark2 = itemType.remark2;
 
     /**
      *   备注3
      */
-    public static final SqlColumn<String> remark3 = goodsType.remark3;
+    public static final SqlColumn<String> remark3 = itemType.remark3;
 
     /**
      *   备注4
      */
-    public static final SqlColumn<String> remark4 = goodsType.remark4;
+    public static final SqlColumn<String> remark4 = itemType.remark4;
 
     /**
      *   备注5
      */
-    public static final SqlColumn<String> remark5 = goodsType.remark5;
+    public static final SqlColumn<String> remark5 = itemType.remark5;
 
     /**
      *   更新次数
      */
-    public static final SqlColumn<Integer> updateCount = goodsType.updateCount;
+    public static final SqlColumn<Integer> updateCount = itemType.updateCount;
 
     /**
      *   更新次数
      */
-    public static final SqlColumn<Integer> deleteFlag = goodsType.deleteFlag;
+    public static final SqlColumn<Integer> deleteFlag = itemType.deleteFlag;
 
     /**
      *   创建者
      */
-    public static final SqlColumn<String> createBy = goodsType.createBy;
+    public static final SqlColumn<String> createBy = itemType.createBy;
 
     /**
      *   创建时间
      */
-    public static final SqlColumn<Date> createTime = goodsType.createTime;
+    public static final SqlColumn<Date> createTime = itemType.createTime;
 
     /**
      *   更新者
      */
-    public static final SqlColumn<String> updateBy = goodsType.updateBy;
+    public static final SqlColumn<String> updateBy = itemType.updateBy;
 
     /**
      *   更新时间
      */
-    public static final SqlColumn<Date> updateTime = goodsType.updateTime;
+    public static final SqlColumn<Date> updateTime = itemType.updateTime;
 
     /**
      *   备注
      */
-    public static final SqlColumn<String> remark = goodsType.remark;
+    public static final SqlColumn<String> remark = itemType.remark;
 
-    public static final class GoodsType extends AliasableSqlTable<GoodsType> {
+    public static final class ItemType extends AliasableSqlTable<ItemType> {
-        public final SqlColumn<String> goodsTypeCd = column("GOODS_TYPE_CD", JDBCType.VARCHAR);
+        public final SqlColumn<String> itemTypeCd = column("ITEM_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> itemTypeName = column("ITEM_TYPE_NAME", JDBCType.VARCHAR);
 
         public final SqlColumn<String> remark1 = column("REMARK_1", JDBCType.VARCHAR);
 
@@ -114,8 +115,8 @@ public final class GoodsTypeDynamicSqlSupport {
 
         public final SqlColumn<String> remark = column("remark", JDBCType.VARCHAR);
 
-        public GoodsType() {
+        public ItemType() {
-            super("WMS_M_GOODS_TYPE_INFO", GoodsType::new);
+            super("WMS_M_ITEM_TYPE", ItemType::new);
         }
     }
 }

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

@@ -1,8 +1,18 @@
 package com.ruoyi.wms.mapper;
 
+import static com.ruoyi.wms.mapper.ItemTypeDynamicSqlSupport.*;
+import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
+
 import com.ruoyi.common.security.utils.SecurityUtilsExt;
-import com.ruoyi.wms.domain.GoodsType;
+import com.ruoyi.wms.domain.ItemType;
-import org.apache.ibatis.annotations.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.type.JdbcType;
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
@@ -13,24 +23,21 @@ 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.GoodsTypeDynamicSqlSupport.*;
-import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
 
 @Mapper
-public interface GoodsTypeMapper extends CommonCountMapper, CommonDeleteMapper, CommonInsertMapper<GoodsType>, CommonUpdateMapper {
+public interface ItemTypeMapper extends CommonCountMapper, CommonDeleteMapper, CommonInsertMapper<ItemType>, CommonUpdateMapper {
-    BasicColumn[] selectList = BasicColumn.columnList(goodsTypeCd, deptId, goodsTypeName, remark1, remark2, remark3, remark4, remark5, updateCount, deleteFlag, createBy, createTime, updateBy, updateTime, remark);
+    BasicColumn[] selectList = BasicColumn.columnList(itemTypeCd, deptId, itemTypeName, remark1, remark2, remark3, remark4, remark5, updateCount, deleteFlag, createBy, createTime, updateBy, updateTime, remark);
 
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
-    @Results(id="GoodsTypeResult", value = {
+    @Results(id="ItemTypeResult", value = {
-        @Result(column="GOODS_TYPE_CD", property="goodsTypeCd", jdbcType=JdbcType.VARCHAR, id=true),
+        @Result(column="ITEM_TYPE_CD", property="itemTypeCd", 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="ITEM_TYPE_NAME", property="itemTypeName", 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),
@@ -44,32 +51,32 @@ public interface GoodsTypeMapper extends CommonCountMapper, CommonDeleteMapper,
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR)
     })
-    List<GoodsType> selectMany(SelectStatementProvider selectStatement);
+    List<ItemType> selectMany(SelectStatementProvider selectStatement);
 
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
-    @ResultMap("GoodsTypeResult")
+    @ResultMap("ItemTypeResult")
-    Optional<GoodsType> selectOne(SelectStatementProvider selectStatement);
+    Optional<ItemType> selectOne(SelectStatementProvider selectStatement);
 
     default long count(CountDSLCompleter completer) {
-        return MyBatis3Utils.countFrom(this::count, goodsType, completer);
+        return MyBatis3Utils.countFrom(this::count, itemType, completer);
     }
 
     default int delete(DeleteDSLCompleter completer) {
-        return MyBatis3Utils.deleteFrom(this::delete, goodsType, completer);
+        return MyBatis3Utils.deleteFrom(this::delete, itemType, completer);
     }
 
-    default int deleteByPrimaryKey(String goodsTypeCd_) {
+    default int deleteByPrimaryKey(String itemTypeCd_) {
         return delete(c -> 
-            c.where(goodsTypeCd, isEqualTo(goodsTypeCd_))
+            c.where(itemTypeCd, isEqualTo(itemTypeCd_))
         );
     }
 
-    default int insert(GoodsType row) {
+    default int insert(ItemType row) {
         row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
-        return MyBatis3Utils.insert(this::insert, row, goodsType, c ->
+        return MyBatis3Utils.insert(this::insert, row, itemType, c ->
-            c.map(goodsTypeCd).toProperty("goodsTypeCd")
+            c.map(itemTypeCd).toProperty("itemTypeCd")
             .map(deptId).toProperty("deptId")
-            .map(goodsTypeName).toProperty("goodsTypeName")
+            .map(itemTypeName).toProperty("itemTypeName")
             .map(remark1).toProperty("remark1")
             .map(remark2).toProperty("remark2")
             .map(remark3).toProperty("remark3")
@@ -85,14 +92,14 @@ public interface GoodsTypeMapper extends CommonCountMapper, CommonDeleteMapper,
         );
     }
 
-    default int insertMultiple(Collection<GoodsType> records) {
+    default int insertMultiple(Collection<ItemType> records) {
-        for (GoodsType row : records) {
+        for (ItemType row : records) {
             row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
         }
-        return MyBatis3Utils.insertMultiple(this::insertMultiple, records, goodsType, c ->
+        return MyBatis3Utils.insertMultiple(this::insertMultiple, records, itemType, c ->
-            c.map(goodsTypeCd).toProperty("goodsTypeCd")
+            c.map(itemTypeCd).toProperty("itemTypeCd")
             .map(deptId).toProperty("deptId")
-            .map(goodsTypeName).toProperty("goodsTypeName")
+            .map(itemTypeName).toProperty("itemTypeName")
             .map(remark1).toProperty("remark1")
             .map(remark2).toProperty("remark2")
             .map(remark3).toProperty("remark3")
@@ -108,12 +115,12 @@ public interface GoodsTypeMapper extends CommonCountMapper, CommonDeleteMapper,
         );
     }
 
-    default int insertSelective(GoodsType row) {
+    default int insertSelective(ItemType row) {
         row.setCommonForInsert(SecurityUtilsExt.getUserIdStr());
-        return MyBatis3Utils.insert(this::insert, row, goodsType, c ->
+        return MyBatis3Utils.insert(this::insert, row, itemType, c ->
-            c.map(goodsTypeCd).toPropertyWhenPresent("goodsTypeCd", row::getGoodsTypeCd)
+            c.map(itemTypeCd).toPropertyWhenPresent("itemTypeCd", row::getItemTypeCd)
             .map(deptId).toPropertyWhenPresent("deptId", row::getDeptId)
-            .map(goodsTypeName).toPropertyWhenPresent("goodsTypeName", row::getGoodsTypeName)
+            .map(itemTypeName).toPropertyWhenPresent("itemTypeName", row::getItemTypeName)
             .map(remark1).toPropertyWhenPresent("remark1", row::getRemark1)
             .map(remark2).toPropertyWhenPresent("remark2", row::getRemark2)
             .map(remark3).toPropertyWhenPresent("remark3", row::getRemark3)
@@ -129,32 +136,32 @@ public interface GoodsTypeMapper extends CommonCountMapper, CommonDeleteMapper,
         );
     }
 
-    default Optional<GoodsType> selectOne(SelectDSLCompleter completer) {
+    default Optional<ItemType> selectOne(SelectDSLCompleter completer) {
-        return MyBatis3Utils.selectOne(this::selectOne, selectList, goodsType, completer);
+        return MyBatis3Utils.selectOne(this::selectOne, selectList, itemType, completer);
     }
 
-    default List<GoodsType> select(SelectDSLCompleter completer) {
+    default List<ItemType> select(SelectDSLCompleter completer) {
-        return MyBatis3Utils.selectList(this::selectMany, selectList, goodsType, completer);
+        return MyBatis3Utils.selectList(this::selectMany, selectList, itemType, completer);
     }
 
-    default List<GoodsType> selectDistinct(SelectDSLCompleter completer) {
+    default List<ItemType> selectDistinct(SelectDSLCompleter completer) {
-        return MyBatis3Utils.selectDistinct(this::selectMany, selectList, goodsType, completer);
+        return MyBatis3Utils.selectDistinct(this::selectMany, selectList, itemType, completer);
     }
 
-    default Optional<GoodsType> selectByPrimaryKey(String goodsTypeCd_) {
+    default Optional<ItemType> selectByPrimaryKey(String itemTypeCd_) {
         return selectOne(c ->
-            c.where(goodsTypeCd, isEqualTo(goodsTypeCd_))
+            c.where(itemTypeCd, isEqualTo(itemTypeCd_))
         );
     }
 
     default int update(UpdateDSLCompleter completer) {
-        return MyBatis3Utils.update(this::update, goodsType, completer);
+        return MyBatis3Utils.update(this::update, itemType, completer);
     }
 
-    static UpdateDSL<UpdateModel> updateAllColumns(GoodsType row, UpdateDSL<UpdateModel> dsl) {
+    static UpdateDSL<UpdateModel> updateAllColumns(ItemType row, UpdateDSL<UpdateModel> dsl) {
-        return dsl.set(goodsTypeCd).equalTo(row::getGoodsTypeCd)
+        return dsl.set(itemTypeCd).equalTo(row::getItemTypeCd)
                 .set(deptId).equalTo(row::getDeptId)
-                .set(goodsTypeName).equalTo(row::getGoodsTypeName)
+                .set(itemTypeName).equalTo(row::getItemTypeName)
                 .set(remark1).equalTo(row::getRemark1)
                 .set(remark2).equalTo(row::getRemark2)
                 .set(remark3).equalTo(row::getRemark3)
@@ -169,11 +176,11 @@ public interface GoodsTypeMapper extends CommonCountMapper, CommonDeleteMapper,
                 .set(remark).equalTo(row::getRemark);
     }
 
-    static UpdateDSL<UpdateModel> updateSelectiveColumns(GoodsType row, UpdateDSL<UpdateModel> dsl) {
+    static UpdateDSL<UpdateModel> updateSelectiveColumns(ItemType row, UpdateDSL<UpdateModel> dsl) {
         row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr());
-        return dsl.set(goodsTypeCd).equalToWhenPresent(row::getGoodsTypeCd)
+        return dsl.set(itemTypeCd).equalToWhenPresent(row::getItemTypeCd)
                 .set(deptId).equalToWhenPresent(row::getDeptId)
-                .set(goodsTypeName).equalToWhenPresent(row::getGoodsTypeName)
+                .set(itemTypeName).equalToWhenPresent(row::getItemTypeName)
                 .set(remark1).equalToWhenPresent(row::getRemark1)
                 .set(remark2).equalToWhenPresent(row::getRemark2)
                 .set(remark3).equalToWhenPresent(row::getRemark3)
@@ -188,10 +195,10 @@ public interface GoodsTypeMapper extends CommonCountMapper, CommonDeleteMapper,
                 .set(remark).equalToWhenPresent(row::getRemark);
     }
 
-    default int updateByPrimaryKey(GoodsType row) {
+    default int updateByPrimaryKey(ItemType row) {
         return update(c ->
             c.set(deptId).equalTo(row::getDeptId)
-            .set(goodsTypeName).equalTo(row::getGoodsTypeName)
+            .set(itemTypeName).equalTo(row::getItemTypeName)
             .set(remark1).equalTo(row::getRemark1)
             .set(remark2).equalTo(row::getRemark2)
             .set(remark3).equalTo(row::getRemark3)
@@ -204,15 +211,15 @@ public interface GoodsTypeMapper extends CommonCountMapper, CommonDeleteMapper,
             .set(updateBy).equalTo(row::getUpdateBy)
             .set(updateTime).equalTo(row::getUpdateTime)
             .set(remark).equalTo(row::getRemark)
-            .where(goodsTypeCd, isEqualTo(row::getGoodsTypeCd))
+            .where(itemTypeCd, isEqualTo(row::getItemTypeCd))
         );
     }
 
-    default int updateByPrimaryKeySelective(GoodsType row) {
+    default int updateByPrimaryKeySelective(ItemType row) {
         row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr());
         return update(c ->
             c.set(deptId).equalToWhenPresent(row::getDeptId)
-            .set(goodsTypeName).equalToWhenPresent(row::getGoodsTypeName)
+            .set(itemTypeName).equalToWhenPresent(row::getItemTypeName)
             .set(remark1).equalToWhenPresent(row::getRemark1)
             .set(remark2).equalToWhenPresent(row::getRemark2)
             .set(remark3).equalToWhenPresent(row::getRemark3)
@@ -225,7 +232,7 @@ public interface GoodsTypeMapper extends CommonCountMapper, CommonDeleteMapper,
             .set(updateBy).equalToWhenPresent(row::getUpdateBy)
             .set(updateTime).equalToWhenPresent(row::getUpdateTime)
             .set(remark).equalToWhenPresent(row::getRemark)
-            .where(goodsTypeCd, isEqualTo(row::getGoodsTypeCd))
+            .where(itemTypeCd, isEqualTo(row::getItemTypeCd))
         );
     }
 }

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

@@ -1,61 +0,0 @@
-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/IItemInfoService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.wms.service;
+
+import com.ruoyi.wms.domain.ItemInfo;
+
+import java.util.List;
+
+/**
+ * 物品基础信息Service接口
+ *
+ * @author ryas
+ * created on 2024-02-20
+ */
+public interface IItemInfoService {
+    /**
+     * 查询物品基础信息
+     *
+     * @param itemCd 物品基础信息主键
+     * @return 物品基础信息
+     */
+    ItemInfo selectItemInfoByItemCd(String itemCd);
+
+    /**
+     * 查询物品基础信息列表
+     *
+     * @param itemInfo 物品基础信息
+     * @return 物品基础信息集合
+     */
+    List<ItemInfo> selectItemInfoList(ItemInfo itemInfo);
+
+    /**
+     * 新增物品基础信息
+     *
+     * @param itemInfo 物品基础信息
+     * @return 结果
+     */
+    int insertItemInfo(ItemInfo itemInfo);
+
+    /**
+     * 修改物品基础信息
+     *
+     * @param itemInfo 物品基础信息
+     * @return 结果
+     */
+    int updateItemInfo(ItemInfo itemInfo);
+
+    /**
+     * 批量删除物品基础信息
+     *
+     * @param itemCds 需要删除的物品基础信息主键集合
+     * @return 结果
+     */
+    int deleteItemInfoByItemCds(String[] itemCds);
+
+    /**
+     * 删除物品基础信息信息
+     *
+     * @param itemCd 物品基础信息主键
+     * @return 结果
+     */
+    int deleteItemInfoByItemCd(String itemCd);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.wms.service;
+
+import com.ruoyi.wms.domain.ItemType;
+
+import java.util.List;
+
+/**
+ * 物品类型Service接口
+ *
+ * @author ryas
+ * created on 2024-02-20
+ */
+public interface IItemTypeService {
+    /**
+     * 查询物品类型
+     *
+     * @param itemTypeCd 物品类型主键
+     * @return 物品类型
+     */
+    ItemType selectItemTypeByItemTypeCd(String itemTypeCd);
+
+    /**
+     * 查询物品类型列表
+     *
+     * @param itemType 物品类型
+     * @return 物品类型集合
+     */
+    List<ItemType> selectItemTypeList(ItemType itemType);
+
+    /**
+     * 新增物品类型
+     *
+     * @param itemType 物品类型
+     * @return 结果
+     */
+    int insertItemType(ItemType itemType);
+
+    /**
+     * 修改物品类型
+     *
+     * @param itemType 物品类型
+     * @return 结果
+     */
+    int updateItemType(ItemType itemType);
+
+    /**
+     * 批量删除物品类型
+     *
+     * @param itemTypeCds 需要删除的物品类型主键集合
+     * @return 结果
+     */
+    int deleteItemTypeByItemTypeCds(String[] itemTypeCds);
+
+    /**
+     * 删除物品类型信息
+     *
+     * @param itemTypeCd 物品类型主键
+     * @return 结果
+     */
+    int deleteItemTypeByItemTypeCd(String itemTypeCd);
+}

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

@@ -1,132 +0,0 @@
-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.web.domain.ExtBaseEntity;
-import com.ruoyi.common.security.utils.SecurityUtilsExt;
-import com.ruoyi.common.services.ISysSequenceService;
-import com.ruoyi.common.services.constants.SeqType;
-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 jakarta.annotation.Resource;
-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.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * 物品类型管理Service业务层处理
- *
- * @author ryas
- * created on 2024-02-18
- */
-@Service
-public class GoodsTypeServiceImpl implements IGoodsTypeService {
-
-    @Resource
-    private GoodsTypeMapper goodsTypeMapper;
-    @Resource
-    private ISysSequenceService sequenceService;
-
-    /**
-     * 查询物品类型管理
-     *
-     * @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 结果
-     */
-    @Transactional
-    @Override
-    public int insertGoodsType(GoodsType goodsType) {
-        if (StringUtils.isBlank(goodsType.getGoodsTypeCd())) {
-            String goodsTypeCd = sequenceService.getNextSequence(SeqType.GOODE_TYPE_CD);
-            goodsType.setGoodsTypeCd(goodsTypeCd);
-        }
-        return goodsTypeMapper.insertSelective(goodsType);
-    }
-
-    /**
-     * 修改物品类型管理
-     *
-     * @param goodsType 物品类型管理
-     * @return 结果
-     */
-    @Transactional
-    @Override
-    public int updateGoodsType(GoodsType goodsType) {
-        return goodsTypeMapper.updateByPrimaryKeySelective(goodsType);
-    }
-
-    /**
-     * 批量删除物品类型管理
-     *
-     * @param goodsTypeCds 需要删除的物品类型管理主键
-     * @return 结果
-     */
-    @Transactional
-    @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 结果
-     */
-    @Transactional
-    @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/ItemInfoServiceImpl.java

@@ -0,0 +1,121 @@
+package com.ruoyi.wms.service.impl;
+
+import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.web.domain.ExtBaseEntity;
+import com.ruoyi.common.security.utils.SecurityUtilsExt;
+import com.ruoyi.wms.domain.ItemInfo;
+import com.ruoyi.wms.mapper.ItemInfoDynamicSqlSupport;
+import com.ruoyi.wms.mapper.ItemInfoMapper;
+import com.ruoyi.wms.service.IItemInfoService;
+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 org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 物品基础信息Service业务层处理
+ *
+ * @author ryas
+ * created on 2024-02-20
+ */
+@Service
+public class ItemInfoServiceImpl implements IItemInfoService {
+    @Autowired
+    private ItemInfoMapper itemInfoMapper;
+
+    /**
+     * 查询物品基础信息
+     *
+     * @param itemCd 物品基础信息主键
+     * @return 物品基础信息
+     */
+    @Override
+    public ItemInfo selectItemInfoByItemCd(String itemCd) {
+        Optional<ItemInfo> result = itemInfoMapper.selectOne(dsl -> dsl.where(ItemInfoDynamicSqlSupport.itemCd, SqlBuilder.isEqualTo(itemCd)));
+        return result.orElse(null);
+    }
+
+    /**
+     * 查询物品基础信息列表
+     *
+     * @param itemInfo 物品基础信息
+     * @return 物品基础信息
+     */
+    @Override
+    public List<ItemInfo> selectItemInfoList(ItemInfo itemInfo) {
+        SelectStatementProvider provider = SqlBuilder.select(ItemInfoMapper.selectList)
+                .from(ItemInfoDynamicSqlSupport.itemInfo)
+                .where(ItemInfoDynamicSqlSupport.deleteFlag, SqlBuilder.isEqualTo(ExtBaseEntity.NOT_DELETE))
+                .and(ItemInfoDynamicSqlSupport.itemCd, SqlBuilder.isEqualToWhenPresent(itemInfo.getItemCd()))
+                .and(ItemInfoDynamicSqlSupport.itemName, SqlBuilder.isLikeWhenPresent(itemInfo.getItemName() == null ? null : "%" + itemInfo.getItemName() + "%"))
+                .build()
+                .render(RenderingStrategies.MYBATIS3);
+        return itemInfoMapper.selectMany(provider);
+    }
+
+    /**
+     * 新增物品基础信息
+     *
+     * @param itemInfo 物品基础信息
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int insertItemInfo(ItemInfo itemInfo) {
+        return itemInfoMapper.insertSelective(itemInfo);
+    }
+
+    /**
+     * 修改物品基础信息
+     *
+     * @param itemInfo 物品基础信息
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateItemInfo(ItemInfo itemInfo) {
+        return itemInfoMapper.updateByPrimaryKeySelective(itemInfo);
+    }
+
+    /**
+     * 批量删除物品基础信息
+     *
+     * @param itemCds 需要删除的物品基础信息主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteItemInfoByItemCds(String[] itemCds) {
+        String userId = SecurityUtilsExt.getUserIdStr();
+        UpdateStatementProvider provider = SqlBuilder.update(ItemInfoDynamicSqlSupport.itemInfo)
+                .set(ItemInfoDynamicSqlSupport.deleteFlag).equalTo(ExtBaseEntity.DELETED)
+                .set(ItemInfoDynamicSqlSupport.updateTime).equalTo(DateUtils.getNowDate())
+                .set(ItemInfoDynamicSqlSupport.updateBy).equalTo(userId)
+                .where(ItemInfoDynamicSqlSupport.itemCd, SqlBuilder.isIn(itemCds))
+                .build()
+                .render(RenderingStrategies.MYBATIS3);
+        return itemInfoMapper.update(provider);
+    }
+
+    /**
+     * 删除物品基础信息信息
+     *
+     * @param itemCd 物品基础信息主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteItemInfoByItemCd(String itemCd) {
+        ItemInfo record = new ItemInfo();
+        record.setItemCd(itemCd);
+        record.setDeleteFlag(ExtBaseEntity.DELETED);
+        record.setUpdateTime(DateUtils.getNowDate());
+        return itemInfoMapper.updateByPrimaryKey(record);
+    }
+}

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

@@ -0,0 +1,131 @@
+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.web.domain.ExtBaseEntity;
+import com.ruoyi.common.security.utils.SecurityUtilsExt;
+import com.ruoyi.common.services.ISysSequenceService;
+import com.ruoyi.common.services.constants.SeqType;
+import com.ruoyi.wms.domain.ItemType;
+import com.ruoyi.wms.mapper.ItemTypeDynamicSqlSupport;
+import com.ruoyi.wms.mapper.ItemTypeMapper;
+import com.ruoyi.wms.service.IItemTypeService;
+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 org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 物品类型Service业务层处理
+ *
+ * @author ryas
+ * created on 2024-02-20
+ */
+@Service
+public class ItemTypeServiceImpl implements IItemTypeService {
+    @Autowired
+    private ItemTypeMapper itemTypeMapper;
+
+    @Autowired
+    private ISysSequenceService sequenceService;
+
+    /**
+     * 查询物品类型
+     *
+     * @param itemTypeCd 物品类型主键
+     * @return 物品类型
+     */
+    @Override
+    public ItemType selectItemTypeByItemTypeCd(String itemTypeCd) {
+        Optional<ItemType> result = itemTypeMapper.selectOne(dsl -> dsl.where(ItemTypeDynamicSqlSupport.itemTypeCd, SqlBuilder.isEqualTo(itemTypeCd)));
+        return result.orElse(null);
+    }
+
+    /**
+     * 查询物品类型列表
+     *
+     * @param itemType 物品类型
+     * @return 物品类型
+     */
+    @Override
+    public List<ItemType> selectItemTypeList(ItemType itemType) {
+        SelectStatementProvider provider = SqlBuilder.select(ItemTypeMapper.selectList)
+                .from(ItemTypeDynamicSqlSupport.itemType)
+                .where(ItemTypeDynamicSqlSupport.deleteFlag, SqlBuilder.isEqualTo(ExtBaseEntity.NOT_DELETE))
+                .and(ItemTypeDynamicSqlSupport.itemTypeName, SqlBuilder.isLikeWhenPresent(itemType.getItemTypeName() == null ? null : "%" + itemType.getItemTypeName() + "%"))
+                .and(ItemTypeDynamicSqlSupport.remark1, SqlBuilder.isEqualToWhenPresent(itemType.getRemark1()))
+                .build()
+                .render(RenderingStrategies.MYBATIS3);
+        return itemTypeMapper.selectMany(provider);
+    }
+
+    /**
+     * 新增物品类型
+     *
+     * @param itemType 物品类型
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int insertItemType(ItemType itemType) {
+        if (StringUtils.isBlank(itemType.getItemTypeCd())) {
+            String itemTypeCd = sequenceService.getNextSequence(SeqType.ITEM_TYPE_CD);
+            itemType.setItemTypeCd(itemTypeCd);
+        }
+        return itemTypeMapper.insertSelective(itemType);
+    }
+
+    /**
+     * 修改物品类型
+     *
+     * @param itemType 物品类型
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateItemType(ItemType itemType) {
+        return itemTypeMapper.updateByPrimaryKeySelective(itemType);
+    }
+
+    /**
+     * 批量删除物品类型
+     *
+     * @param itemTypeCds 需要删除的物品类型主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteItemTypeByItemTypeCds(String[] itemTypeCds) {
+        String userId = SecurityUtilsExt.getUserIdStr();
+        UpdateStatementProvider provider = SqlBuilder.update(ItemTypeDynamicSqlSupport.itemType)
+                .set(ItemTypeDynamicSqlSupport.deleteFlag).equalTo(ExtBaseEntity.DELETED)
+                .set(ItemTypeDynamicSqlSupport.updateTime).equalTo(DateUtils.getNowDate())
+                .set(ItemTypeDynamicSqlSupport.updateBy).equalTo(userId)
+                .where(ItemTypeDynamicSqlSupport.itemTypeCd, SqlBuilder.isIn(itemTypeCds))
+                .build()
+                .render(RenderingStrategies.MYBATIS3);
+        return itemTypeMapper.update(provider);
+    }
+
+    /**
+     * 删除物品类型信息
+     *
+     * @param itemTypeCd 物品类型主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteItemTypeByItemTypeCd(String itemTypeCd) {
+        ItemType record = new ItemType();
+        record.setItemTypeCd(itemTypeCd);
+        record.setDeleteFlag(ExtBaseEntity.DELETED);
+        record.setUpdateTime(DateUtils.getNowDate());
+        return itemTypeMapper.updateByPrimaryKey(record);
+    }
+}

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

@@ -41,8 +41,9 @@
 
         <!-- 要生成的表 -->
 <!--        <table tableName="WMS_M_UNIT_INFO" domainObjectName="UnitInfo"/>-->
-<!--        <table tableName="WMS_M_GOODS_TYPE_INFO" domainObjectName="GoodsType"/>-->
+<!--        <table tableName="WMS_M_ITEM_TYPE_INFO" domainObjectName="ItemType"/>-->
-        <table tableName="WMS_M_WAREHOUSE_INFO" domainObjectName="WarehouseInfo"/>
+<!--        <table tableName="WMS_M_WAREHOUSE_INFO" domainObjectName="WarehouseInfo"/>-->
+        <table tableName="WMS_M_ITEM_INFO" domainObjectName="ItemInfo"/>
 
     </context>
 </generatorConfiguration>

ruoyi-ui/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "ruoyi",
+  "name": "ryas",
   "version": "3.6.3",
   "description": "RYAS管理系统",
-  "author": "ruoyi",
+  "author": "ryas",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -11,10 +11,6 @@
     "build:stage": "vite build --mode staging",
     "preview": "vite preview"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/y_project/RuoYi-Cloud.git"
-  },
   "dependencies": {
     "@element-plus/icons-vue": "2.3.1",
     "@vueup/vue-quill": "1.2.0",

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

@@ -1,44 +0,0 @@
-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/ItemInfo.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询物品基础信息列表
+export function listItemInfo(query) {
+  return request({
+    url: '/wms/ItemInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询物品基础信息详细
+export function getItemInfo(itemCd) {
+  return request({
+    url: '/wms/ItemInfo/' + itemCd,
+    method: 'get'
+  })
+}
+
+// 新增物品基础信息
+export function addItemInfo(data) {
+  return request({
+    url: '/wms/ItemInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改物品基础信息
+export function updateItemInfo(data) {
+  return request({
+    url: '/wms/ItemInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除物品基础信息
+export function delItemInfo(itemCd) {
+  return request({
+    url: '/wms/ItemInfo/' + itemCd,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询物品类型列表
+export function listItemType(query) {
+  return request({
+    url: '/wms/ItemType/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询物品类型详细
+export function getItemType(itemTypeCd) {
+  return request({
+    url: '/wms/ItemType/' + itemTypeCd,
+    method: 'get'
+  })
+}
+
+// 新增物品类型
+export function addItemType(data) {
+  return request({
+    url: '/wms/ItemType',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改物品类型
+export function updateItemType(data) {
+  return request({
+    url: '/wms/ItemType',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除物品类型
+export function delItemType(itemTypeCd) {
+  return request({
+    url: '/wms/ItemType/' + itemTypeCd,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/components/SizeSelect/index.vue

@@ -24,13 +24,13 @@ const route = useRoute();
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 const sizeOptions = ref([
-  { label: "较大", value: "large" },
+  { label: "较大", value: "large" },
-  { label: "默认", value: "default" },
+  { label: "默认", value: "default" },
-  { label: "稍小", value: "small" },
+  { label: "稍小", value: "small" },
 ]);
 
 function handleSetSize(size) {
-  proxy.$modal.loading("正在设置布局大小，请稍候...");
+  proxy.$modal.loading("正在设置布局大小，请稍候...");
   appStore.setSize(size);
   setTimeout("window.location.reload()", 1000);
 }

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

@@ -0,0 +1,423 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="物品代码" prop="itemCd">
+        <el-input
+          v-model="queryParams.itemCd"
+          placeholder="请输入物品代码"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物品名称" prop="itemName">
+        <el-input
+          v-model="queryParams.itemName"
+          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:ItemInfo:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['wms:ItemInfo:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['wms:ItemInfo:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['wms:ItemInfo:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="ItemInfoList" @selection-change="handleSelectionChange" show-overflow-tooltip="true">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="物品代码" align="center" prop="itemCd" />
+      <el-table-column label="物品名称" align="center" prop="itemName" />
+      <el-table-column label="默认库位号" align="center" prop="defaultStgBinCd" />
+      <el-table-column label="启用标志" align="center" prop="enableFlg" />
+      <el-table-column label="批号管理区分" align="center" prop="lotNoMgmtCls" />
+      <el-table-column label="物品类型代码" align="center" prop="itemTypeCd" />
+      <el-table-column label="标准单位代码" align="center" prop="stdUnitCd" />
+      <el-table-column label="包装单位代码" align="center" prop="pkgUnitCd" />
+      <el-table-column label="生产商" align="center" prop="manufacturer" />
+      <el-table-column label="供应商" align="center" prop="supplier" />
+      <el-table-column label="安全库存量" align="center" prop="safetyStock" />
+      <el-table-column label="最大库存量" align="center" prop="maxInvQty" />
+      <el-table-column label="购买阈值" align="center" prop="purchLimitQty" />
+<!--      <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:ItemInfo:edit']">修改</el-button>-->
+<!--          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:ItemInfo: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="ItemInfoRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="物品名称" prop="itemName">
+          <el-input v-model="form.itemName" placeholder="请输入物品名称" />
+        </el-form-item>
+        <el-form-item label="供应商" prop="supplier">
+          <el-input v-model="form.supplier" placeholder="请输入供应商" />
+        </el-form-item>
+        <el-form-item label="筹备提前期" prop="prepLeadTime">
+          <el-input v-model="form.prepLeadTime" placeholder="请输入筹备提前期" />
+        </el-form-item>
+        <el-form-item label="入库提前期" prop="instockLeadTime">
+          <el-input v-model="form.instockLeadTime" placeholder="请输入入库提前期" />
+        </el-form-item>
+        <el-form-item label="放置期" prop="restingPeriod">
+          <el-input v-model="form.restingPeriod" placeholder="请输入放置期" />
+        </el-form-item>
+        <el-form-item label="出库提前期" prop="outstockLeadTime">
+          <el-input v-model="form.outstockLeadTime" placeholder="请输入出库提前期" />
+        </el-form-item>
+        <el-form-item label="规格1" prop="spec1">
+          <el-input v-model="form.spec1" placeholder="请输入规格1" />
+        </el-form-item>
+        <el-form-item label="规格2" prop="spec2">
+          <el-input v-model="form.spec2" placeholder="请输入规格2" />
+        </el-form-item>
+        <el-form-item label="规格3" prop="spec3">
+          <el-input v-model="form.spec3" placeholder="请输入规格3" />
+        </el-form-item>
+        <el-form-item label="规格4" prop="spec4">
+          <el-input v-model="form.spec4" placeholder="请输入规格4" />
+        </el-form-item>
+        <el-form-item label="规格5" prop="spec5">
+          <el-input v-model="form.spec5" placeholder="请输入规格5" />
+        </el-form-item>
+        <el-form-item label="分类1" prop="cls1">
+          <el-input v-model="form.cls1" placeholder="请输入分类1" />
+        </el-form-item>
+        <el-form-item label="分类2" prop="cls2">
+          <el-input v-model="form.cls2" placeholder="请输入分类2" />
+        </el-form-item>
+        <el-form-item label="分类3" prop="cls3">
+          <el-input v-model="form.cls3" placeholder="请输入分类3" />
+        </el-form-item>
+        <el-form-item label="分类4" prop="cls4">
+          <el-input v-model="form.cls4" placeholder="请输入分类4" />
+        </el-form-item>
+        <el-form-item label="分类5" prop="cls5">
+          <el-input v-model="form.cls5" placeholder="请输入分类5" />
+        </el-form-item>
+        <el-form-item label="供货周期" prop="deliveryPeriod">
+          <el-input v-model="form.deliveryPeriod" placeholder="请输入供货周期" />
+        </el-form-item>
+        <el-form-item label="默认库位号" prop="defaultStgBinCd">
+          <el-input v-model="form.defaultStgBinCd" placeholder="请输入默认库位号" />
+        </el-form-item>
+        <el-form-item label="启用标志" prop="enableFlg">
+          <el-input v-model="form.enableFlg" placeholder="请输入启用标志" />
+        </el-form-item>
+        <el-form-item label="安全库存量" prop="safetyStock">
+          <el-input v-model="form.safetyStock" placeholder="请输入安全库存量" />
+        </el-form-item>
+        <el-form-item label="最大库存量" prop="maxInvQty">
+          <el-input v-model="form.maxInvQty" placeholder="请输入最大库存量" />
+        </el-form-item>
+        <el-form-item label="购买阈值" prop="purchLimitQty">
+          <el-input v-model="form.purchLimitQty" placeholder="请输入购买阈值" />
+        </el-form-item>
+        <el-form-item label="物品区分" prop="goodsCls">
+          <el-input v-model="form.goodsCls" placeholder="请输入物品区分" />
+        </el-form-item>
+        <el-form-item label="批号管理区分(0:不管理, 1:管理)" prop="lotNoMgmtCls">
+          <el-input v-model="form.lotNoMgmtCls" placeholder="请输入批号管理区分(0:不管理, 1:管理)" />
+        </el-form-item>
+        <el-form-item label="物品类型代码" prop="itemTypeCd">
+          <el-input v-model="form.itemTypeCd" placeholder="请输入物品类型代码" />
+        </el-form-item>
+        <el-form-item label="标准单位代码" prop="stdUnitCd">
+          <el-input v-model="form.stdUnitCd" placeholder="请输入标准单位代码" />
+        </el-form-item>
+        <el-form-item label="包装单位代码" prop="pkgUnitCd">
+          <el-input v-model="form.pkgUnitCd" placeholder="请输入包装单位代码" />
+        </el-form-item>
+        <el-form-item label="出库申请最小数量" prop="outstockReqMinQty">
+          <el-input v-model="form.outstockReqMinQty" placeholder="请输入出库申请最小数量" />
+        </el-form-item>
+        <el-form-item label="出库单位区分" prop="outstockUnitCls">
+          <el-input v-model="form.outstockUnitCls" placeholder="请输入出库单位区分" />
+        </el-form-item>
+        <el-form-item label="单位净重" prop="netWeightPerUnit">
+          <el-input v-model="form.netWeightPerUnit" placeholder="请输入单位净重" />
+        </el-form-item>
+        <el-form-item label="自身体积(M3)" prop="ownVolM3">
+          <el-input v-model="form.ownVolM3" placeholder="请输入自身体积(M3)" />
+        </el-form-item>
+        <el-form-item label="尺寸(长)" prop="sizeD">
+          <el-input v-model="form.sizeD" placeholder="请输入尺寸(长)" />
+        </el-form-item>
+        <el-form-item label="尺寸(宽)" prop="sizeW">
+          <el-input v-model="form.sizeW" placeholder="请输入尺寸(宽)" />
+        </el-form-item>
+        <el-form-item label="尺寸(高)" prop="sizeH">
+          <el-input v-model="form.sizeH" placeholder="请输入尺寸(高)" />
+        </el-form-item>
+        <el-form-item label="包装要求描述" prop="pkgRqmtDesc">
+          <el-input v-model="form.pkgRqmtDesc" placeholder="请输入包装要求描述" />
+        </el-form-item>
+        <el-form-item label="码放要求描述" prop="stackingRqmtDesc">
+          <el-input v-model="form.stackingRqmtDesc" placeholder="请输入码放要求描述" />
+        </el-form-item>
+        <el-form-item label="储存要求描述" prop="stgRqmtDesc">
+          <el-input v-model="form.stgRqmtDesc" placeholder="请输入储存要求描述" />
+        </el-form-item>
+        <el-form-item label="生产商" prop="manufacturer">
+          <el-input v-model="form.manufacturer" placeholder="请输入生产商" />
+        </el-form-item>
+        <el-form-item label="图片ID" prop="pictureId">
+          <el-input v-model="form.pictureId" placeholder="请输入图片ID" />
+        </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="ItemInfo">
+import { listItemInfo, getItemInfo, delItemInfo, addItemInfo, updateItemInfo } from "@/api/wms/ItemInfo";
+
+const { proxy } = getCurrentInstance();
+
+const ItemInfoList = 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,
+    itemCd: null,
+    itemName: null,
+  },
+  rules: {
+    itemCd: [
+      { required: true, message: "物品代码不能为空", trigger: "blur" }
+    ],
+    itemName: [
+      { required: true, message: "物品名称不能为空", trigger: "blur" }
+    ],
+    defaultStgBinCd: [
+      { required: true, message: "默认库位号不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询物品基础信息列表 */
+function getList() {
+  loading.value = true;
+  listItemInfo(queryParams.value).then(response => {
+    ItemInfoList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    deptId: null,
+    itemCd: null,
+    itemName: null,
+    supplier: null,
+    prepLeadTime: null,
+    instockLeadTime: null,
+    restingPeriod: null,
+    outstockLeadTime: null,
+    spec1: null,
+    spec2: null,
+    spec3: null,
+    spec4: null,
+    spec5: null,
+    cls1: null,
+    cls2: null,
+    cls3: null,
+    cls4: null,
+    cls5: null,
+    updateCount: null,
+    deleteFlag: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    remark: null,
+    remark1: null,
+    remark2: null,
+    remark3: null,
+    remark4: null,
+    remark5: null,
+    deliveryPeriod: null,
+    defaultStgBinCd: null,
+    enableFlg: null,
+    safetyStock: null,
+    maxInvQty: null,
+    purchLimitQty: null,
+    goodsCls: null,
+    lotNoMgmtCls: null,
+    itemTypeCd: null,
+    stdUnitCd: null,
+    pkgUnitCd: null,
+    outstockReqMinQty: null,
+    outstockUnitCls: null,
+    netWeightPerUnit: null,
+    ownVolM3: null,
+    sizeD: null,
+    sizeW: null,
+    sizeH: null,
+    pkgRqmtDesc: null,
+    stackingRqmtDesc: null,
+    stgRqmtDesc: null,
+    manufacturer: null,
+    pictureId: null,
+    pictureUrl: null
+  };
+  proxy.resetForm("ItemInfoRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.itemCd);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加物品基础信息";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _itemCd = row.itemCd || ids.value
+  getItemInfo(_itemCd).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改物品基础信息";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["ItemInfoRef"].validate(valid => {
+    if (valid) {
+      if (form.value.itemCd != null) {
+        updateItemInfo(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addItemInfo(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _itemCds = row.itemCd || ids.value;
+  proxy.$modal.confirm('是否确认删除物品基础信息编号为"' + _itemCds + '"的数据项？').then(function() {
+    return delItemInfo(_itemCds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('wms/ItemInfo/export', {
+    ...queryParams.value
+  }, `ItemInfo_${new Date().getTime()}.xlsx`)
+}
+
+//页面打开时查询
+//getList();
+</script>

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

@@ -1,18 +1,18 @@
 <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-form-item label="物品类型名称" prop="itemTypeName">
         <el-input
-          v-model="queryParams.goodsTypeCd"
+          v-model="queryParams.itemTypeName"
-          placeholder="请输入物品类型编码"
+          placeholder="请输入物品类型名称"
           clearable
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物品类型名称" prop="goodsTypeName">
+      <el-form-item label="备注" prop="remark1">
         <el-input
-          v-model="queryParams.goodsTypeName"
+          v-model="queryParams.remark1"
-          placeholder="请输入物品类型名称"
+          placeholder="请输入备注"
           clearable
           @keyup.enter="handleQuery"
         />
@@ -30,7 +30,7 @@
           plain
           icon="Plus"
           @click="handleAdd"
-          v-hasPermi="['wms:GoodsType:add']"
+          v-hasPermi="['wms:ItemType:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -40,7 +40,7 @@
           icon="Edit"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['wms:GoodsType:edit']"
+          v-hasPermi="['wms:ItemType:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -50,7 +50,7 @@
           icon="Delete"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['wms:GoodsType:remove']"
+          v-hasPermi="['wms:ItemType:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -59,21 +59,21 @@
           plain
           icon="Download"
           @click="handleExport"
-          v-hasPermi="['wms:GoodsType:export']"
+          v-hasPermi="['wms:ItemType: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 v-loading="loading" :data="ItemTypeList" @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="itemTypeCd" />
-      <el-table-column label="物品类型名称" align="center" prop="goodsTypeName" />
+      <el-table-column label="物品类型名称" align="center" prop="itemTypeName" />
       <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="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:ItemType:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:GoodsType:remove']">删除</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:ItemType:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -86,11 +86,11 @@
       @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 ref="ItemTypeRef" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="物品类型名称" prop="goodsTypeName">
+        <el-form-item label="物品类型名称" prop="itemTypeName">
-          <el-input v-model="form.goodsTypeName" placeholder="请输入物品类型名称" />
+          <el-input v-model="form.itemTypeName" placeholder="请输入物品类型名称" />
         </el-form-item>
         <el-form-item label="备注" prop="remark1">
           <el-input v-model="form.remark1" placeholder="请输入备注" />
@@ -106,12 +106,12 @@
   </div>
 </template>
 
-<script setup name="GoodsType">
+<script setup name="ItemType">
-import { listGoodsType, getGoodsType, delGoodsType, addGoodsType, updateGoodsType } from "@/api/wms/GoodsType";
+import { listItemType, getItemType, delItemType, addItemType, updateItemType } from "@/api/wms/ItemType";
 
 const { proxy } = getCurrentInstance();
 
-const GoodsTypeList = ref([]);
+const ItemTypeList = ref([]);
 const open = ref(false);
 const loading = ref(false);
 const showSearch = ref(true);
@@ -126,24 +126,32 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    goodsTypeCd: null,
+    itemTypeName: null,
-    goodsTypeName: null,
     remark1: null,
   },
   rules: {
-    goodsTypeName: [
+    deptId: [
+      { required: true, message: "从属部门ID不能为空", trigger: "blur" }
+    ],
+    itemTypeName: [
       { required: true, message: "物品类型名称不能为空", trigger: "blur" }
     ],
+    updateCount: [
+      { required: true, message: "更新次数不能为空", trigger: "blur" }
+    ],
+    deleteFlag: [
+      { required: true, message: "更新次数不能为空", trigger: "blur" }
+    ],
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
 
-/** 查询物品类型管理列表 */
+/** 查询物品类型列表 */
 function getList() {
   loading.value = true;
-  listGoodsType(queryParams.value).then(response => {
+  listItemType(queryParams.value).then(response => {
-    GoodsTypeList.value = response.rows;
+    ItemTypeList.value = response.rows;
     total.value = response.total;
     loading.value = false;
   });
@@ -159,8 +167,8 @@ function cancel() {
 function reset() {
   form.value = {
     deptId: null,
-    goodsTypeCd: null,
+    itemTypeCd: null,
-    goodsTypeName: null,
+    itemTypeName: null,
     remark1: null,
     remark2: null,
     remark3: null,
@@ -174,7 +182,7 @@ function reset() {
     updateTime: null,
     remark: null
   };
-  proxy.resetForm("GoodsTypeRef");
+  proxy.resetForm("ItemTypeRef");
 }
 
 /** 搜索按钮操作 */
@@ -191,7 +199,7 @@ function resetQuery() {
 
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.goodsTypeCd);
+  ids.value = selection.map(item => item.itemTypeCd);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
@@ -200,32 +208,32 @@ function handleSelectionChange(selection) {
 function handleAdd() {
   reset();
   open.value = true;
-  title.value = "添加物品类型管理";
+  title.value = "添加物品类型";
 }
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
-  const _goodsTypeCd = row.goodsTypeCd || ids.value
+  const _itemTypeCd = row.itemTypeCd || ids.value
-  getGoodsType(_goodsTypeCd).then(response => {
+  getItemType(_itemTypeCd).then(response => {
     form.value = response.data;
     open.value = true;
-    title.value = "修改物品类型管理";
+    title.value = "修改物品类型";
   });
 }
 
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["GoodsTypeRef"].validate(valid => {
+  proxy.$refs["ItemTypeRef"].validate(valid => {
     if (valid) {
-      if (form.value.goodsTypeCd != null) {
+      if (form.value.itemTypeCd != null) {
-        updateGoodsType(form.value).then(response => {
+        updateItemType(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
           getList();
         });
       } else {
-        addGoodsType(form.value).then(response => {
+        addItemType(form.value).then(response => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;
           getList();
@@ -237,9 +245,9 @@ function submitForm() {
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const _goodsTypeCds = row.goodsTypeCd || ids.value;
+  const _itemTypeCds = row.itemTypeCd || ids.value;
-  proxy.$modal.confirm('是否确认删除物品类型管理编号为"' + _goodsTypeCds + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除物品类型编号为"' + _itemTypeCds + '"的数据项？').then(function() {
-    return delGoodsType(_goodsTypeCds);
+    return delItemType(_itemTypeCds);
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
@@ -248,9 +256,9 @@ function handleDelete(row) {
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download('wms/GoodsType/export', {
+  proxy.download('wms/ItemType/export', {
     ...queryParams.value
-  }, `GoodsType_${new Date().getTime()}.xlsx`)
+  }, `ItemType_${new Date().getTime()}.xlsx`)
 }
 
 //页面打开时查询

sql/ry-cloud-ryas.sql

@@ -11,20 +11,86 @@
  Target Server Version : 80200 (8.2.0)
  File Encoding         : 65001
 
- Date: 20/02/2024 11:16:45
+ Date: 20/02/2024 16:42:04
 */
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
 -- ----------------------------
--- Table structure for WMS_M_GOODS_TYPE_INFO
+-- Table structure for WMS_M_ITEM_INFO
 -- ----------------------------
-DROP TABLE IF EXISTS `WMS_M_GOODS_TYPE_INFO`;
+DROP TABLE IF EXISTS `WMS_M_ITEM_INFO`;
-CREATE TABLE `WMS_M_GOODS_TYPE_INFO`  (
+CREATE TABLE `WMS_M_ITEM_INFO`  (
   `DEPT_ID` int NOT NULL DEFAULT 100 COMMENT '从属部门ID',
-  `GOODS_TYPE_CD` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '物品类型编码',
+  `ITEM_CD` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '物品代码',
-  `GOODS_TYPE_NAME` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '物品类型名称',
+  `ITEM_NAME` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '物品名称',
+  `SUPPLIER` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '供应商',
+  `PREP_LEAD_TIME` decimal(18, 6) NULL DEFAULT NULL COMMENT '筹备提前期',
+  `INSTOCK_LEAD_TIME` decimal(18, 6) NULL DEFAULT NULL COMMENT '入库提前期',
+  `RESTING_PERIOD` decimal(18, 6) NULL DEFAULT NULL COMMENT '放置期',
+  `OUTSTOCK_LEAD_TIME` decimal(18, 6) NULL DEFAULT NULL COMMENT '出库提前期',
+  `SPEC_1` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '规格1',
+  `SPEC_2` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '规格2',
+  `SPEC_3` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '规格3',
+  `SPEC_4` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '规格4',
+  `SPEC_5` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '规格5',
+  `CLS_1` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '分类1',
+  `CLS_2` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '分类2',
+  `CLS_3` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '分类3',
+  `CLS_4` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '分类4',
+  `CLS_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 '备注',
+  `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',
+  `DELIVERY_PERIOD` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '供货周期',
+  `DEFAULT_STG_BIN_CD` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '默认库位号',
+  `ENABLE_FLG` int NOT NULL DEFAULT 1 COMMENT '启用标志',
+  `SAFETY_STOCK` decimal(18, 6) NOT NULL DEFAULT 0.000000 COMMENT '安全库存量',
+  `MAX_INV_QTY` decimal(18, 6) NOT NULL DEFAULT 0.000000 COMMENT '最大库存量',
+  `PURCH_LIMIT_QTY` decimal(18, 6) NOT NULL DEFAULT 0.000000 COMMENT '发起购买的阈值',
+  `GOODS_CLS` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '物品区分',
+  `LOT_NO_MGMT_CLS` int NOT NULL DEFAULT 0 COMMENT '批号管理区分(0:不管理, 1:管理)',
+  `ITEM_TYPE_CD` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '物品类型代码',
+  `STD_UNIT_CD` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '标准单位代码',
+  `PKG_UNIT_CD` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '包装单位代码',
+  `OUTSTOCK_REQ_MIN_QTY` decimal(18, 6) NOT NULL DEFAULT 0.000000 COMMENT '出库申请最小数量',
+  `OUTSTOCK_UNIT_CLS` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '出库单位区分',
+  `NET_WEIGHT_PER_UNIT` decimal(18, 6) NULL DEFAULT NULL COMMENT '单位净重',
+  `OWN_VOL_M3` decimal(18, 6) NULL DEFAULT NULL COMMENT '自身体积(M3)',
+  `SIZE_D` decimal(18, 6) NULL DEFAULT NULL COMMENT '尺寸(长)',
+  `SIZE_W` decimal(18, 6) NULL DEFAULT NULL COMMENT '尺寸(宽)',
+  `SIZE_H` decimal(18, 6) NULL DEFAULT NULL COMMENT '尺寸(高)',
+  `PKG_RQMT_DESC` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '包装要求描述',
+  `STACKING_RQMT_DESC` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '码放要求描述',
+  `STG_RQMT_DESC` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '储存要求描述',
+  `MANUFACTURER` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '生产商',
+  `PICTURE_ID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '图片ID',
+  `PICTURE_URL` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '图片URL',
+  PRIMARY KEY (`ITEM_CD`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '物品基础信息表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of WMS_M_ITEM_INFO
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for WMS_M_ITEM_TYPE
+-- ----------------------------
+DROP TABLE IF EXISTS `WMS_M_ITEM_TYPE`;
+CREATE TABLE `WMS_M_ITEM_TYPE`  (
+  `DEPT_ID` int NOT NULL DEFAULT 100 COMMENT '从属部门ID',
+  `ITEM_TYPE_CD` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '物品类型编码',
+  `ITEM_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',
@@ -37,14 +103,15 @@ CREATE TABLE `WMS_M_GOODS_TYPE_INFO`  (
   `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
+  PRIMARY KEY (`ITEM_TYPE_CD`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '物品类型表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
--- Records of WMS_M_GOODS_TYPE_INFO
+-- Records of WMS_M_ITEM_TYPE
 -- ----------------------------
-INSERT INTO `WMS_M_GOODS_TYPE_INFO` VALUES (100, 'GT00001', '原材料', NULL, NULL, NULL, NULL, NULL, 0, 0, '1', '2024-02-19 13:41:24', '1', '2024-02-19 13:41:24', NULL);
+INSERT INTO `WMS_M_ITEM_TYPE` VALUES (100, 'ITYPE00001', '原材料', NULL, NULL, NULL, NULL, NULL, 0, 0, '1', '2024-02-20 15:27:52', '1', '2024-02-20 15:27:52', NULL);
-INSERT INTO `WMS_M_GOODS_TYPE_INFO` VALUES (100, 'GT00002', '产品', NULL, NULL, NULL, NULL, NULL, 0, 0, '1', '2024-02-19 13:41:39', '1', '2024-02-19 13:41:39', NULL);
+INSERT INTO `WMS_M_ITEM_TYPE` VALUES (100, 'ITYPE00002', '半成品', NULL, NULL, NULL, NULL, NULL, 0, 0, '1', '2024-02-20 15:28:05', '1', '2024-02-20 15:28:05', NULL);
+INSERT INTO `WMS_M_ITEM_TYPE` VALUES (100, 'ITYPE00003', '成品', NULL, NULL, NULL, NULL, NULL, 0, 0, '1', '2024-02-20 15:28:10', '1', '2024-02-20 15:28:10', NULL);
 
 -- ----------------------------
 -- Table structure for WMS_M_UNIT_INFO
@@ -52,7 +119,7 @@ INSERT INTO `WMS_M_GOODS_TYPE_INFO` VALUES (100, 'GT00002', '产品', NULL, NULL
 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_CODE` varchar(30) 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',
@@ -121,7 +188,7 @@ CREATE TABLE `WMS_M_WAREHOUSE_INFO`  (
 -- ----------------------------
 -- Records of WMS_M_WAREHOUSE_INFO
 -- ----------------------------
-INSERT INTO `WMS_M_WAREHOUSE_INFO` VALUES (100, 'WH001', '仓库1', 'OWN', 'WH1', 'Flat 25, 12/F apartment and floor no. Acacia Building', '', NULL, '08524785441', '200001', '', NULL, '张三', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, '1', '2024-02-19 13:42:34', '1', '2024-02-19 13:42:34', NULL);
+INSERT INTO `WMS_M_WAREHOUSE_INFO` VALUES (100, 'WHS001', '仓库1', 'OWN', 'WHS1', 'Flat 25, 12/F apartment and floor no. Acacia Building', '', NULL, '08524785441', '200001', '', NULL, '张三', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, '1', '2024-02-19 13:42:34', '1', '2024-02-19 13:42:34', NULL);
 
 -- ----------------------------
 -- Table structure for gen_table
@@ -151,16 +218,17 @@ 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 = 15 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 17 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of gen_table
 -- ----------------------------
 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);
 INSERT INTO `gen_table` VALUES (13, 'sys_file', '文件存储记录表', NULL, NULL, 'SysFile', 'crud', 'element-plus', 'mybatis-dynamic', 'com.ruoyi.file', 'file', 'FileRecord', '文件存储记录', 'ryas', '0', '/', '{\"parentMenuId\":\"1\"}', 'admin', '2024-02-19 10:01:22', '', '2024-02-19 10:08:14', NULL);
 INSERT INTO `gen_table` VALUES (14, 'sys_seq_rule', '序列号生成规则表', NULL, NULL, 'SysSeqRule', 'crud', 'element-plus', 'mybatis-dynamic', 'com.ruoyi.system', 'system', 'SeqRule', '序列号生成规则', 'ryas', '0', '/', '{\"parentMenuId\":1}', 'admin', '2024-02-19 10:01:22', '', '2024-02-20 02:07:26', NULL);
+INSERT INTO `gen_table` VALUES (15, 'WMS_M_ITEM_TYPE', '物品类型表', NULL, NULL, 'ItemType', 'crud', 'element-plus', 'mybatis-dynamic', 'com.ruoyi.wms', 'wms', 'ItemType', '物品类型', 'ryas', '0', '/', '{\"parentMenuId\":2000}', 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11', NULL);
+INSERT INTO `gen_table` VALUES (16, 'WMS_M_ITEM_INFO', '物品基础信息表', NULL, NULL, 'ItemInfo', 'crud', 'element-plus', 'mybatis-dynamic', 'com.ruoyi.wms', 'wms', 'ItemInfo', '物品基础信息', 'ryas', '0', '/', '{\"parentMenuId\":2000}', 'admin', '2024-02-20 08:25:28', '', '2024-02-20 08:30:03', NULL);
 
 -- ----------------------------
 -- Table structure for gen_table_column
@@ -190,7 +258,7 @@ 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 = 259 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表字段' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 328 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表字段' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of gen_table_column
@@ -210,21 +278,6 @@ INSERT INTO `gen_table_column` VALUES (143, 9, 'create_time', '创建时间', 'd
 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 (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 (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 (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 (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');
@@ -286,6 +339,75 @@ INSERT INTO `gen_table_column` VALUES (255, 14, 'create_time', '创建时间', '
 INSERT INTO `gen_table_column` VALUES (256, 14, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 18, 'admin', '2024-02-19 10:01:23', '', '2024-02-20 02:07:27');
 INSERT INTO `gen_table_column` VALUES (257, 14, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 19, 'admin', '2024-02-19 10:01:23', '', '2024-02-20 02:07:27');
 INSERT INTO `gen_table_column` VALUES (258, 14, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'textarea', '', 20, 'admin', '2024-02-19 10:01:23', '', '2024-02-20 02:07:27');
+INSERT INTO `gen_table_column` VALUES (259, 15, 'DEPT_ID', '从属部门ID', 'int', 'Long', 'deptId', '0', '0', '1', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (260, 15, 'ITEM_TYPE_CD', '物品类型编码', 'varchar(100)', 'String', 'itemTypeCd', '1', '0', NULL, '0', NULL, NULL, NULL, 'EQ', 'input', '', 2, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (261, 15, 'ITEM_TYPE_NAME', '物品类型名称', 'varchar(100)', 'String', 'itemTypeName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 3, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (262, 15, 'REMARK_1', '备注1', 'varchar(100)', 'String', 'remark1', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 4, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (263, 15, 'REMARK_2', '备注2', 'varchar(100)', 'String', 'remark2', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 5, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (264, 15, 'REMARK_3', '备注3', 'varchar(100)', 'String', 'remark3', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 6, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (265, 15, 'REMARK_4', '备注4', 'varchar(100)', 'String', 'remark4', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 7, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (266, 15, 'REMARK_5', '备注5', 'varchar(100)', 'String', 'remark5', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 8, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (267, 15, 'UPDATE_COUNT', '更新次数', 'int', 'Long', 'updateCount', '0', '0', '1', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 9, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (268, 15, 'DELETE_FLAG', '更新次数', 'int', 'Long', 'deleteFlag', '0', '0', '1', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 10, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (269, 15, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 11, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (270, 15, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 12, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (271, 15, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 13, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (272, 15, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 14, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (273, 15, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'textarea', '', 15, 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11');
+INSERT INTO `gen_table_column` VALUES (274, 16, 'DEPT_ID', '从属部门ID', 'int', 'Long', 'deptId', '0', '0', '1', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (275, 16, 'ITEM_CD', '物品代码', 'varchar(50)', 'String', 'itemCd', '1', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 2, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (276, 16, 'ITEM_NAME', '物品名称', 'varchar(100)', 'String', 'itemName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 3, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (277, 16, 'SUPPLIER', '供应商', 'varchar(100)', 'String', 'supplier', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 4, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (278, 16, 'PREP_LEAD_TIME', '筹备提前期', 'decimal(18,6)', 'BigDecimal', 'prepLeadTime', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 5, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (279, 16, 'INSTOCK_LEAD_TIME', '入库提前期', 'decimal(18,6)', 'BigDecimal', 'instockLeadTime', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 6, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (280, 16, 'RESTING_PERIOD', '放置期', 'decimal(18,6)', 'BigDecimal', 'restingPeriod', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 7, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (281, 16, 'OUTSTOCK_LEAD_TIME', '出库提前期', 'decimal(18,6)', 'BigDecimal', 'outstockLeadTime', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 8, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (282, 16, 'SPEC_1', '规格1', 'varchar(100)', 'String', 'spec1', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 9, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (283, 16, 'SPEC_2', '规格2', 'varchar(100)', 'String', 'spec2', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 10, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (284, 16, 'SPEC_3', '规格3', 'varchar(100)', 'String', 'spec3', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 11, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (285, 16, 'SPEC_4', '规格4', 'varchar(100)', 'String', 'spec4', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 12, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (286, 16, 'SPEC_5', '规格5', 'varchar(100)', 'String', 'spec5', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 13, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (287, 16, 'CLS_1', '分类1', 'varchar(100)', 'String', 'cls1', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 14, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (288, 16, 'CLS_2', '分类2', 'varchar(100)', 'String', 'cls2', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 15, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (289, 16, 'CLS_3', '分类3', 'varchar(100)', 'String', 'cls3', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 16, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (290, 16, 'CLS_4', '分类4', 'varchar(100)', 'String', 'cls4', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 17, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (291, 16, 'CLS_5', '分类5', 'varchar(100)', 'String', 'cls5', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 18, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (292, 16, 'UPDATE_COUNT', '更新次数', 'int', 'Long', 'updateCount', '0', '0', '0', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 19, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (293, 16, 'DELETE_FLAG', '删除标志', 'int', 'Long', 'deleteFlag', '0', '0', '0', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 20, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (294, 16, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 21, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (295, 16, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 22, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (296, 16, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 23, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (297, 16, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 24, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (298, 16, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'textarea', '', 25, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:03');
+INSERT INTO `gen_table_column` VALUES (299, 16, 'REMARK_1', '备注1', 'varchar(100)', 'String', 'remark1', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 26, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (300, 16, 'REMARK_2', '备注2', 'varchar(100)', 'String', 'remark2', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 27, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (301, 16, 'REMARK_3', '备注3', 'varchar(100)', 'String', 'remark3', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 28, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (302, 16, 'REMARK_4', '备注4', 'varchar(100)', 'String', 'remark4', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 29, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (303, 16, 'REMARK_5', '备注5', 'varchar(100)', 'String', 'remark5', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 30, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (304, 16, 'DELIVERY_PERIOD', '供货周期', 'varchar(50)', 'String', 'deliveryPeriod', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 31, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (305, 16, 'DEFAULT_STG_BIN_CD', '默认库位号', 'varchar(25)', 'String', 'defaultStgBinCd', '0', '0', '1', '1', '1', '1', '0', 'EQ', 'input', '', 32, 'admin', '2024-02-20 08:25:29', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (306, 16, 'ENABLE_FLG', '启用标志', 'int', 'Long', 'enableFlg', '0', '0', '1', '1', '1', '1', '0', 'EQ', 'input', '', 33, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (307, 16, 'SAFETY_STOCK', '安全库存量', 'decimal(18,6)', 'BigDecimal', 'safetyStock', '0', '0', '1', '1', '1', '1', '0', 'EQ', 'input', '', 34, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (308, 16, 'MAX_INV_QTY', '最大库存量', 'decimal(18,6)', 'BigDecimal', 'maxInvQty', '0', '0', '1', '1', '1', '1', '0', 'EQ', 'input', '', 35, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (309, 16, 'PURCH_LIMIT_QTY', '购买阈值', 'decimal(18,6)', 'BigDecimal', 'purchLimitQty', '0', '0', '1', '1', '1', '1', '0', 'EQ', 'input', '', 36, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (310, 16, 'GOODS_CLS', '物品区分', 'varchar(10)', 'String', 'goodsCls', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 37, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (311, 16, 'LOT_NO_MGMT_CLS', '批号管理区分(0:不管理, 1:管理)', 'int', 'Long', 'lotNoMgmtCls', '0', '0', '1', '1', '1', '1', '0', 'EQ', 'input', '', 38, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (312, 16, 'ITEM_TYPE_CD', '物品类型代码', 'varchar(30)', 'String', 'itemTypeCd', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 39, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (313, 16, 'STD_UNIT_CD', '标准单位代码', 'varchar(30)', 'String', 'stdUnitCd', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 40, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (314, 16, 'PKG_UNIT_CD', '包装单位代码', 'varchar(30)', 'String', 'pkgUnitCd', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 41, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (315, 16, 'OUTSTOCK_REQ_MIN_QTY', '出库申请最小数量', 'decimal(18,6)', 'BigDecimal', 'outstockReqMinQty', '0', '0', '1', '1', '1', '0', '0', 'EQ', 'input', '', 42, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (316, 16, 'OUTSTOCK_UNIT_CLS', '出库单位区分', 'varchar(30)', 'String', 'outstockUnitCls', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 43, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (317, 16, 'NET_WEIGHT_PER_UNIT', '单位净重', 'decimal(18,6)', 'BigDecimal', 'netWeightPerUnit', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 44, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (318, 16, 'OWN_VOL_M3', '自身体积(M3)', 'decimal(18,6)', 'BigDecimal', 'ownVolM3', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 45, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (319, 16, 'SIZE_D', '尺寸(长)', 'decimal(18,6)', 'BigDecimal', 'sizeD', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 46, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (320, 16, 'SIZE_W', '尺寸(宽)', 'decimal(18,6)', 'BigDecimal', 'sizeW', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 47, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (321, 16, 'SIZE_H', '尺寸(高)', 'decimal(18,6)', 'BigDecimal', 'sizeH', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 48, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (322, 16, 'PKG_RQMT_DESC', '包装要求描述', 'varchar(255)', 'String', 'pkgRqmtDesc', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 49, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (323, 16, 'STACKING_RQMT_DESC', '码放要求描述', 'varchar(255)', 'String', 'stackingRqmtDesc', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 50, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (324, 16, 'STG_RQMT_DESC', '储存要求描述', 'varchar(255)', 'String', 'stgRqmtDesc', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 51, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (325, 16, 'MANUFACTURER', '生产商', 'varchar(100)', 'String', 'manufacturer', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 52, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (326, 16, 'PICTURE_ID', '图片ID', 'varchar(50)', 'String', 'pictureId', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 53, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
+INSERT INTO `gen_table_column` VALUES (327, 16, 'PICTURE_URL', '图片URL', 'varchar(255)', 'String', 'pictureUrl', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 54, 'admin', '2024-02-20 08:25:30', '', '2024-02-20 08:30:04');
 
 -- ----------------------------
 -- Table structure for sys_config
@@ -476,6 +598,7 @@ CREATE TABLE `sys_job`  (
   `misfire_policy` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '3' COMMENT '计划执行错误策略（1立即执行 2执行一次 3放弃执行）',
   `concurrent` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '1' COMMENT '是否并发执行（0允许 1禁止）',
   `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '0' COMMENT '状态（0正常 1暂停）',
+  `custom_job_class` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '自定义QuartzJob类',
   `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 '更新者',
@@ -487,9 +610,34 @@ CREATE TABLE `sys_job`  (
 -- ----------------------------
 -- Records of sys_job
 -- ----------------------------
-INSERT INTO `sys_job` VALUES (1, '系统默认（无参）', 'DEFAULT', 'ryTask.ryNoParams', '0/10 * * * * ?', '3', '1', '1', 'admin', '2024-01-30 05:05:41', 'admin', '2024-01-31 09:19:48', '');
+INSERT INTO `sys_job` VALUES (1, '测试任务（无参）', 'DEFAULT', 'ryTask.ryNoParams', '0/10 * * * * ?', '3', '1', '1', NULL, 'admin', '2024-01-30 05:05:41', 'admin', '2024-01-31 09:19:48', '');
-INSERT INTO `sys_job` VALUES (2, '系统默认（有参）', 'DEFAULT', 'ryTask.ryParams(\'ry\')', '0/15 * * * * ?', '3', '1', '1', 'admin', '2024-01-30 05:05:41', '', NULL, '');
+INSERT INTO `sys_job` VALUES (2, '测试任务（有参）', 'DEFAULT', 'ryTask.ryParams(\'ry\')', '0/15 * * * * ?', '3', '1', '1', NULL, 'admin', '2024-01-30 05:05:41', '', NULL, '');
-INSERT INTO `sys_job` VALUES (3, '系统默认（多参）', 'DEFAULT', 'ryTask.ryMultipleParams(\'ry\', true, 2000L, 316.50D, 100)', '0/20 * * * * ?', '3', '1', '1', 'admin', '2024-01-30 05:05:41', '', NULL, '');
+INSERT INTO `sys_job` VALUES (3, '测试任务（多参）', 'DEFAULT', 'ryTask.ryMultipleParams(\'ry\', true, 2000L, 316.50D, 100)', '0/20 * * * * ?', '3', '1', '1', NULL, 'admin', '2024-01-30 05:05:41', '', NULL, '');
+
+-- ----------------------------
+-- Table structure for sys_job_data_log
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_job_data_log`;
+CREATE TABLE `sys_job_data_log`  (
+  `log_id` bigint NOT NULL COMMENT '任务数据日志ID',
+  `start_time` datetime NULL DEFAULT NULL COMMENT '执行开始时间',
+  `end_time` datetime NULL DEFAULT NULL COMMENT '执行结束时间',
+  `message` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '日志内容',
+  `log_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '日志类型',
+  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '0' COMMENT '状态（0正常执行 1异常）',
+  `job_class` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务执行类',
+  `job_method` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL 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 '' COMMENT '备注信息',
+  PRIMARY KEY (`log_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '定时任务数据日志表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_job_data_log
+-- ----------------------------
 
 -- ----------------------------
 -- Table structure for sys_job_log
@@ -556,7 +704,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 = 2034 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '菜单权限表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 2040 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '菜单权限表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_menu
@@ -645,19 +793,19 @@ 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 (2007, '单位信息管理', 2000, 1, 'UnitInfo', 'wms/UnitInfo/index', NULL, 1, 0, 'C', '0', '0', 'wms:UnitInfo:list', 'tree-table', 'admin', '2024-02-05 08:26:48', '1', '2024-02-20 08:36:41', '单位信息管理菜单');
 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 (2013, '物品类型', 2000, 2, 'ItemType', 'wms/ItemType/index', NULL, 1, 0, 'C', '0', '0', 'wms:ItemType:list', 'tree', 'admin', '2024-02-20 07:21:07', '1', '2024-02-20 07:22: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 (2014, '物品类型查询', 2013, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:ItemType:query', '#', 'admin', '2024-02-20 07:21:07', '', 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 (2015, '物品类型新增', 2013, 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:ItemType:add', '#', 'admin', '2024-02-20 07:21:07', '', 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 (2016, '物品类型修改', 2013, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:ItemType:edit', '#', 'admin', '2024-02-20 07:21:07', '', 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 (2017, '物品类型删除', 2013, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:ItemType:remove', '#', 'admin', '2024-02-20 07:21:07', '', 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 (2018, '物品类型导出', 2013, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:ItemType:export', '#', 'admin', '2024-02-20 07:21:07', '', 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 (2019, '仓库基础信息', 2000, 3, 'WarehouseInfo', 'wms/WarehouseInfo/index', NULL, 1, 0, 'C', '0', '0', 'wms:WarehouseInfo:list', 'tab', 'admin', '2024-02-18 08:34:10', '1', '2024-02-20 08:36:32', '仓库基础信息菜单');
 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, '');
@@ -672,6 +820,12 @@ INSERT INTO `sys_menu` VALUES (2030, '序列号生成规则新增', 2028, 2, '#'
 INSERT INTO `sys_menu` VALUES (2031, '序列号生成规则修改', 2028, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:SeqRule:edit', '#', 'admin', '2024-02-20 02:05:15', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (2032, '序列号生成规则删除', 2028, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:SeqRule:remove', '#', 'admin', '2024-02-20 02:05:15', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (2033, '序列号生成规则导出', 2028, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:SeqRule:export', '#', 'admin', '2024-02-20 02:05:15', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2034, '物品基础信息', 2000, 4, 'ItemInfo', 'wms/ItemInfo/index', NULL, 1, 0, 'C', '0', '0', 'wms:ItemInfo:list', 'build', 'admin', '2024-02-20 08:34:17', '1', '2024-02-20 08:35:07', '物品基础信息菜单');
+INSERT INTO `sys_menu` VALUES (2035, '物品基础信息查询', 2034, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:ItemInfo:query', '#', 'admin', '2024-02-20 08:34:17', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2036, '物品基础信息新增', 2034, 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:ItemInfo:add', '#', 'admin', '2024-02-20 08:34:17', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2037, '物品基础信息修改', 2034, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:ItemInfo:edit', '#', 'admin', '2024-02-20 08:34:17', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2038, '物品基础信息删除', 2034, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:ItemInfo:remove', '#', 'admin', '2024-02-20 08:34:17', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2039, '物品基础信息导出', 2034, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:ItemInfo:export', '#', 'admin', '2024-02-20 08:34:17', '', NULL, '');
 
 -- ----------------------------
 -- Table structure for sys_notice
@@ -723,7 +877,7 @@ 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 = 229 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '操作日志记录' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 247 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '操作日志记录' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_oper_log
@@ -928,6 +1082,7 @@ CREATE TABLE `sys_seq_result`  (
 INSERT INTO `sys_seq_result` VALUES (00000006458374766593, 'UNIT', 'UNIT', NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, '1', '2024-02-19 13:37:19', '1', '2024-02-19 13:38:44', NULL);
 INSERT INTO `sys_seq_result` VALUES (00000006458406061570, 'GT', 'GT', NULL, NULL, NULL, 2, NULL, NULL, NULL, NULL, NULL, '1', '2024-02-19 13:41:24', '1', '2024-02-19 13:41:39', NULL);
 INSERT INTO `sys_seq_result` VALUES (00000006458414990338, 'WHS', 'WH', NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, '1', '2024-02-19 13:42:34', '1', '2024-02-19 13:42:34', NULL);
+INSERT INTO `sys_seq_result` VALUES (00000006470282975873, 'ITYPE', 'ITYPE', NULL, NULL, NULL, 3, NULL, NULL, NULL, NULL, NULL, '1', '2024-02-20 15:27:52', '1', '2024-02-20 15:28:10', NULL);
 
 -- ----------------------------
 -- Table structure for sys_seq_rule
@@ -961,8 +1116,8 @@ CREATE TABLE `sys_seq_rule`  (
 -- Records of sys_seq_rule
 -- ----------------------------
 INSERT INTO `sys_seq_rule` VALUES (1, 'UNIT', '单位代码生成规则', 'UNIT', NULL, NULL, 5, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, '1', '2024-02-19 11:38:35', '1', '2024-02-20 10:48:55', NULL);
-INSERT INTO `sys_seq_rule` VALUES (2, 'GT', '物品类型代码生成规则', 'GT', NULL, NULL, 5, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, '1', '2024-02-19 13:33:21', '1', '2024-02-19 13:33:24', NULL);
+INSERT INTO `sys_seq_rule` VALUES (2, 'ITYPE', '物品类型代码生成规则', 'ITYPE', NULL, NULL, 5, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, '1', '2024-02-19 13:33:21', '1', '2024-02-19 13:33:24', NULL);
-INSERT INTO `sys_seq_rule` VALUES (3, 'WHS', '仓库代码生成规则', 'WH', NULL, NULL, 3, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, '1', '2024-02-19 13:34:28', '1', '2024-02-19 13:34:30', NULL);
+INSERT INTO `sys_seq_rule` VALUES (3, 'WHS', '仓库代码生成规则', 'WHS', NULL, NULL, 3, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, '1', '2024-02-19 13:34:28', '1', '2024-02-19 13:34:30', NULL);
 
 -- ----------------------------
 -- Table structure for sys_user