车辆执行任务到缓存区

6.program/wms-core/src/main/java/com/mt/wms/core/MyGenerator.java

@@ -106,7 +106,7 @@ public class MyGenerator {
 
     @Test
     public void generateCodeWithInjectConfigForAllTable() {
-        generateByTablesWithInjectConfig(new String[]{"t_[a-zA-Z0-9_]*"});
+        generateByTablesWithInjectConfig(new String[]{"t_in_stock_info"});
     }
 
     public static void main(String[] args) {

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/InStockInfo.java

@@ -15,11 +15,11 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 缓存表存储情况
+ * 缓存区存储情况
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-11-19
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -89,16 +89,16 @@ public class InStockInfo extends Model<InStockInfo> {
     private String taskCode;
 
     /**
-     * 历史任务id，关联当前任务表：t_task_his
+     * 任务id，关联当前任务表：currTask
      */
     @TableField("task_id")
-    private Integer taskId;
+    private Long taskId;
 
     /**
      * 窑炉id ，if(status == 0){从窑炉出来等待库存} else if(status == 1){到目标窑炉前缓存到库位}关联设备窑炉表：t_kiln_info
      */
     @TableField("kiln_id")
-    private Integer kilnId;
+    private Long kilnId;
 
     /**
      * 窑炉名称
@@ -110,7 +110,7 @@ public class InStockInfo extends Model<InStockInfo> {
      * 库位id，关联库位表：t_location
      */
     @TableField("location_id")
-    private Integer locationId;
+    private Long locationId;
 
     /**
      * 库位名称

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/RunTask.java

@@ -0,0 +1,125 @@
+package com.mt.wms.core.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 执行任务信息表
+ * </p>
+ *
+ * @author mt
+ * @since 2021-11-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_run_task")
+public class RunTask extends Model<RunTask> {
+
+    private static final long serialVersionUID = 1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 删除标志，是否有效:1 可用 0不可用
+     */
+    @TableField("valid")
+    @TableLogic
+    private Integer valid;
+
+    /**
+     * 添加时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人id
+     */
+    @TableField("creator_id")
+    private Integer creatorId;
+
+    /**
+     * 更新人id
+     */
+    @TableField("updater_id")
+    private Integer updaterId;
+
+    /**
+     * 修改时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 版本号 默认为 1
+     */
+    @TableField("version")
+    @Version
+    private String version;
+
+    /**
+     * 任务id,关联wcs_task表
+     */
+    @TableField("task_id")
+    private Long taskId;
+
+    /**
+     * 开始位置
+     */
+    @TableField("start_position")
+    private String startPosition;
+
+    /**
+     * 结束位置
+     */
+    @TableField("end_position")
+    private String endPosition;
+
+    /**
+     * 状态，0：未执行，1：正在执行，2：执行成功，3：执行失败
+     */
+    @TableField("status")
+    private Integer status;
+
+
+    public static final String ID = "id";
+
+    public static final String VALID = "valid";
+
+    public static final String CREATE_TIME = "create_time";
+
+    public static final String CREATOR_ID = "creator_id";
+
+    public static final String UPDATER_ID = "updater_id";
+
+    public static final String UPDATE_TIME = "update_time";
+
+    public static final String VERSION = "version";
+
+    public static final String TASK_ID = "task_id";
+
+    public static final String START_POSITION = "start_position";
+
+    public static final String END_POSITION = "end_position";
+
+    public static final String STATUS = "status";
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/InStockInfoMapper.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 缓存表存储情况 Mapper 接口
+ * 缓存区存储情况 Mapper 接口
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-11-19
  */
 public interface InStockInfoMapper extends BaseMapper<InStockInfo> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/RunTaskMapper.java

@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.mapper;
+
+import com.mt.wms.core.dal.entity.RunTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 执行任务信息表 Mapper 接口
+ * </p>
+ *
+ * @author mt
+ * @since 2021-11-19
+ */
+public interface RunTaskMapper extends BaseMapper<RunTask> {
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/RunTaskMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mt.wms.core.dal.mapper.RunTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mt.wms.core.dal.entity.RunTask">
+        <id column="id" property="id" />
+        <result column="valid" property="valid" />
+        <result column="create_time" property="createTime" />
+        <result column="creator_id" property="creatorId" />
+        <result column="updater_id" property="updaterId" />
+        <result column="update_time" property="updateTime" />
+        <result column="version" property="version" />
+        <result column="task_id" property="taskId" />
+        <result column="start_position" property="startPosition" />
+        <result column="end_position" property="endPosition" />
+        <result column="status" property="status" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, valid, create_time, creator_id, updater_id, update_time, version, task_id, start_position, end_position, status
+    </sql>
+
+</mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/InStockInfoServiceBiz.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 缓存表存储情况 服务类
+ * 缓存区存储情况 服务类
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-11-19
  */
 public interface InStockInfoServiceBiz extends IService<InStockInfo> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/RunTaskServiceBiz.java

@@ -0,0 +1,16 @@
+package com.mt.wms.core.dal.service;
+
+import com.mt.wms.core.dal.entity.RunTask;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 执行任务信息表 服务类
+ * </p>
+ *
+ * @author mt
+ * @since 2021-11-19
+ */
+public interface RunTaskServiceBiz extends IService<RunTask> {
+
+}

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/InStockInfoServiceBizImpl.java

@@ -8,11 +8,11 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 缓存表存储情况 服务实现类
+ * 缓存区存储情况 服务实现类
  * </p>
  *
  * @author mt
- * @since 2021-11-18
+ * @since 2021-11-19
  */
 @Service
 public class InStockInfoServiceBizImpl extends ServiceImpl<InStockInfoMapper, InStockInfo> implements InStockInfoServiceBiz {

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/RunTaskServiceBizImpl.java

@@ -0,0 +1,20 @@
+package com.mt.wms.core.dal.service.impl;
+
+import com.mt.wms.core.dal.entity.RunTask;
+import com.mt.wms.core.dal.mapper.RunTaskMapper;
+import com.mt.wms.core.dal.service.RunTaskServiceBiz;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 执行任务信息表 服务实现类
+ * </p>
+ *
+ * @author mt
+ * @since 2021-11-19
+ */
+@Service
+public class RunTaskServiceBizImpl extends ServiceImpl<RunTaskMapper, RunTask> implements RunTaskServiceBiz {
+
+}