基础文件同步数据库变更

This commit is contained in:
徐晨晨 2021-11-10 09:36:52 +08:00
parent 2e5f6dab8e
commit 2d6beef4c3
3 changed files with 23 additions and 5 deletions

View File

@ -88,6 +88,12 @@ public class CurrTask extends Model<CurrTask> {
@TableField("task_code")
private String taskCode;
/**
* 任务来源 0人工 扩展字段
*/
@TableField("task_source")
private Integer taskSource;
/**
* 任务类型0:入库到窑炉1:入库到缓存区2出库到 窑炉到缓存区3缓存区出库
*/
@ -125,16 +131,22 @@ public class CurrTask extends Model<CurrTask> {
private String targetPosition;
/**
* 目标窑炉id
* 窑炉id关联设备窑炉表t_kiln_info
*/
@TableField("kiln_id")
private Long kilnId;
/**
* 窑炉名称
*/
@TableField("kiln_name")
private String kilnName;
/**
* 车辆id关联车辆表t_vehicle_info
*/
@TableField("vehicle_id")
private Integer vehicleId;
private Long vehicleId;
/**
* 是否缓存如果当前指的窑炉正在加工系统自动分配货物到缓存位置 并且记录缓存库位这是当指定窑炉加工完成后系统先判断是否当前缓存有当前等待执行的任务然后按照先来先执行原则等待多个任务自动调用车辆来执行
@ -146,7 +158,7 @@ public class CurrTask extends Model<CurrTask> {
* 库位id关联库位表t_location
*/
@TableField("location_id")
private Integer locationId;
private Long locationId;
/**
* 库位名称
@ -175,6 +187,8 @@ public class CurrTask extends Model<CurrTask> {
public static final String TASK_CODE = "task_code";
public static final String TASK_SOURCE = "task_source";
public static final String TASK_TYPE = "task_type";
public static final String PALLET_CODE = "pallet_code";
@ -189,6 +203,8 @@ public class CurrTask extends Model<CurrTask> {
public static final String KILN_ID = "kiln_id";
public static final String KILN_NAME = "kiln_name";
public static final String VEHICLE_ID = "vehicle_id";
public static final String IS_CACHE = "is_cache";

View File

@ -92,7 +92,7 @@ public class CurrTaskDet extends Model<CurrTaskDet> {
* 当前任务id关联当前任务表t_curr_task
*/
@TableField("curr_task_id")
private Integer currTaskId;
private Long currTaskId;
/**
* 订单号

View File

@ -14,6 +14,7 @@
<result column="status" property="status" />
<result column="inter_code" property="interCode" />
<result column="task_code" property="taskCode" />
<result column="task_source" property="taskSource" />
<result column="task_type" property="taskType" />
<result column="pallet_code" property="palletCode" />
<result column="a_begin_time" property="aBeginTime" />
@ -21,6 +22,7 @@
<result column="start_position" property="startPosition" />
<result column="target_position" property="targetPosition" />
<result column="kiln_id" property="kilnId" />
<result column="kiln_name" property="kilnName" />
<result column="vehicle_id" property="vehicleId" />
<result column="is_cache" property="isCache" />
<result column="location_id" property="locationId" />
@ -29,7 +31,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_type, pallet_code, a_begin_time, a_end_time, start_position, target_position, kiln_id, vehicle_id, is_cache, location_id, location_name
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_source, task_type, pallet_code, a_begin_time, a_end_time, start_position, target_position, kiln_id, kiln_name, vehicle_id, is_cache, location_id, location_name
</sql>
</mapper>