mt-ck/mt-qj-wms-hd
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

表修改代码生成

Browse Source
This commit is contained in:
李广豪 2021-12-14 12:03:38 +08:00
parent 7ec2a6554b
commit 25178732f8
42 changed files with 1386 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

348
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/AutoExeTask.java Normal file
View File

@ -0,0 +1,348 @@
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-12-14
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_auto_exe_task")
public class AutoExeTask extends Model<AutoExeTask> {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 删除标志，是否有效:1 可用 0不可用，2停止
*/
@TableField("valid")
@TableLogic
private Integer valid;
/**
* 添加时间，入库时间
*/
@TableField("create_time")
private LocalDateTime createTime;
/**
* 状态，0：新增，1：执行中，2完成
*/
@TableField("status")
private Integer status;
/**
* 内部编码，系统自动生成
*/
@TableField("inter_code")
private String interCode;
/**
* 工艺流程ID
*/
@TableField("process_flow_id")
private Long processFlowId;
/**
* 工艺流程名称
*/
@TableField("process_flow_name")
private String processFlowName;
/**
* 工艺类型，1表示第一种工艺流程，2表示第二种工艺流程
*/
@TableField("process_flow_type")
private Integer processFlowType;
/**
* 工艺号ID
*/
@TableField("craft_code_id")
private Long craftCodeId;
/**
* 工艺编码
*/
@TableField("craft_code")
private String craftCode;
/**
* 区域ID，区分不同操作区域
*/
@TableField("warehouse_id")
private Long warehouseId;
/**
* 执行任务ID，关联任务表：t_curr_task
*/
@TableField("f_task_id")
private Long fTaskId;
/**
* 任务编码,子任务编码对应任务表t_curr_task中task_code编码
*/
@TableField("f_det_task_code")
private String fDetTaskCode;
/**
* 设备类型ID，关联设备类型表：t_equipment_type
*/
@TableField("f_equipment_type_id")
private Long fEquipmentTypeId;
/**
* 设备ID，关联设备表：t_kiln_info
*/
@TableField("f_equipment_id")
private Long fEquipmentId;
/**
* 工艺号ID，关联工艺号表：t_craft_info
*/
@TableField("f_craft_code_id")
private Long fCraftCodeId;
/**
* 工艺号对应PLC值
*/
@TableField("f_plc_value")
private Integer fPlcValue;
/**
* 进炉运输状态，0：开始，1：运输中，2：运输完成
*/
@TableField("f_in_tran_status")
private Integer fInTranStatus;
/**
* 加工状态，0：加工开始，1：加工中，2：加工完成
*/
@TableField("f_pro_status")
private Integer fProStatus;
/**
* 出炉运输状态，0：开始，1：运输中，2：运输完成
*/
@TableField("f_out_tran_status")
private Integer fOutTranStatus;
/**
* 执行任务ID，关联任务表：t_curr_task
*/
@TableField("t_task_id")
private Long tTaskId;
/**
* 任务编码,子任务编码对应任务表t_curr_task中task_code编码
*/
@TableField("t_det_task_code")
private String tDetTaskCode;
/**
* 设备类型ID，关联设备类型表：t_equipment_type
*/
@TableField("t_equipment_type_id")
private Long tEquipmentTypeId;
/**
* 设备ID，关联设备表：t_kiln_info
*/
@TableField("t_equipment_id")
private Long tEquipmentId;
/**
* 工艺号ID，关联工艺号表：t_craft_info
*/
@TableField("t_craft_code_id")
private Long tCraftCodeId;
/**
* 工艺号对应PLC值
*/
@TableField("t_plc_value")
private Integer tPlcValue;
/**
* 进炉运输状态，0：开始，1：运输中，2：运输完成
*/
@TableField("t_in_tran_status")
private Integer tInTranStatus;
/**
* 加工状态，0：加工开始，1：加工中，2：加工完成
*/
@TableField("t_pro_status")
private Integer tProStatus;
/**
* 出炉运输状态，0：开始，1：运输中，2：运输完成
*/
@TableField("t_out_tran_status")
private Integer tOutTranStatus;
/**
* 执行任务ID，关联任务表：t_curr_task
*/
@TableField("th_task_id")
private Long thTaskId;
/**
* 任务编码,子任务编码对应任务表t_curr_task中task_code编码
*/
@TableField("th_det_task_code")
private String thDetTaskCode;
/**
* 设备类型ID，关联设备类型表：t_equipment_type
*/
@TableField("th_equipment_type_id")
private Long thEquipmentTypeId;
/**
* 设备ID，关联设备表：t_kiln_info
*/
@TableField("th_equipment_id")
private Long thEquipmentId;
/**
* 工艺号ID，关联工艺号表：t_craft_info
*/
@TableField("th_craft_code_id")
private Long thCraftCodeId;
/**
* 工艺号对应PLC值
*/
@TableField("th_plc_value")
private Integer thPlcValue;
/**
* 进炉运输状态，0：开始，1：运输中，2：运输完成
*/
@TableField("th_in_tran_status")
private Integer thInTranStatus;
/**
* 加工状态，0：加工开始，1：加工中，2：加工完成
*/
@TableField("th_pro_status")
private Integer thProStatus;
/**
* 出炉运输状态，0：开始，1：运输中，2：运输完成
*/
@TableField("th_out_tran_status")
private Integer thOutTranStatus;
/**
* 备注
*/
@TableField("content")
private String content;
public static final String ID = "id";
public static final String VALID = "valid";
public static final String CREATE_TIME = "create_time";
public static final String STATUS = "status";
public static final String INTER_CODE = "inter_code";
public static final String PROCESS_FLOW_ID = "process_flow_id";
public static final String PROCESS_FLOW_NAME = "process_flow_name";
public static final String PROCESS_FLOW_TYPE = "process_flow_type";
public static final String CRAFT_CODE_ID = "craft_code_id";
public static final String CRAFT_CODE = "craft_code";
public static final String WAREHOUSE_ID = "warehouse_id";
public static final String F_TASK_ID = "f_task_id";
public static final String F_DET_TASK_CODE = "f_det_task_code";
public static final String F_EQUIPMENT_TYPE_ID = "f_equipment_type_id";
public static final String F_EQUIPMENT_ID = "f_equipment_id";
public static final String F_CRAFT_CODE_ID = "f_craft_code_id";
public static final String F_PLC_VALUE = "f_plc_value";
public static final String F_IN_TRAN_STATUS = "f_in_tran_status";
public static final String F_PRO_STATUS = "f_pro_status";
public static final String F_OUT_TRAN_STATUS = "f_out_tran_status";
public static final String T_TASK_ID = "t_task_id";
public static final String T_DET_TASK_CODE = "t_det_task_code";
public static final String T_EQUIPMENT_TYPE_ID = "t_equipment_type_id";
public static final String T_EQUIPMENT_ID = "t_equipment_id";
public static final String T_CRAFT_CODE_ID = "t_craft_code_id";
public static final String T_PLC_VALUE = "t_plc_value";
public static final String T_IN_TRAN_STATUS = "t_in_tran_status";
public static final String T_PRO_STATUS = "t_pro_status";
public static final String T_OUT_TRAN_STATUS = "t_out_tran_status";
public static final String TH_TASK_ID = "th_task_id";
public static final String TH_DET_TASK_CODE = "th_det_task_code";
public static final String TH_EQUIPMENT_TYPE_ID = "th_equipment_type_id";
public static final String TH_EQUIPMENT_ID = "th_equipment_id";
public static final String TH_CRAFT_CODE_ID = "th_craft_code_id";
public static final String TH_PLC_VALUE = "th_plc_value";
public static final String TH_IN_TRAN_STATUS = "th_in_tran_status";
public static final String TH_PRO_STATUS = "th_pro_status";
public static final String TH_OUT_TRAN_STATUS = "th_out_tran_status";
public static final String CONTENT = "content";
@Override
protected Serializable pkVal() {
return this.id;
}
}

348
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/AutoExeTaskHis.java Normal file
View File

@ -0,0 +1,348 @@
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-12-14
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_auto_exe_task_his")
public class AutoExeTaskHis extends Model<AutoExeTaskHis> {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 删除标志，是否有效:1 可用 0不可用，2停止
*/
@TableField("valid")
@TableLogic
private Integer valid;
/**
* 添加时间，入库时间
*/
@TableField("create_time")
private LocalDateTime createTime;
/**
* 状态，0：新增，1：执行中，2完成
*/
@TableField("status")
private Integer status;
/**
* 内部编码，系统自动生成
*/
@TableField("inter_code")
private String interCode;
/**
* 工艺流程ID
*/
@TableField("process_flow_id")
private Long processFlowId;
/**
* 工艺流程名称
*/
@TableField("process_flow_name")
private String processFlowName;
/**
* 工艺类型，1表示第一种工艺流程，2表示第二种工艺流程
*/
@TableField("process_flow_type")
private Integer processFlowType;
/**
* 工艺号ID
*/
@TableField("craft_code_id")
private Long craftCodeId;
/**
* 工艺编码
*/
@TableField("craft_code")
private String craftCode;
/**
* 区域ID，区分不同操作区域
*/
@TableField("warehouse_id")
private Long warehouseId;
/**
* 执行任务ID，关联任务表：t_curr_task
*/
@TableField("f_task_id")
private Long fTaskId;
/**
* 任务编码,子任务编码对应任务表t_curr_task中task_code编码
*/
@TableField("f_det_task_code")
private String fDetTaskCode;
/**
* 设备类型ID，关联设备类型表：t_equipment_type
*/
@TableField("f_equipment_type_id")
private Long fEquipmentTypeId;
/**
* 设备ID，关联设备表：t_kiln_info
*/
@TableField("f_equipment_id")
private Long fEquipmentId;
/**
* 工艺号ID，关联工艺号表：t_craft_info
*/
@TableField("f_craft_code_id")
private Long fCraftCodeId;
/**
* 工艺号对应PLC值
*/
@TableField("f_plc_value")
private Integer fPlcValue;
/**
* 进炉运输状态，0：开始，1：运输中，2：运输完成
*/
@TableField("f_in_tran_status")
private Integer fInTranStatus;
/**
* 加工状态，0：加工开始，1：加工中，2：加工完成
*/
@TableField("f_pro_status")
private Integer fProStatus;
/**
* 出炉运输状态，0：开始，1：运输中，2：运输完成
*/
@TableField("f_out_tran_status")
private Integer fOutTranStatus;
/**
* 执行任务ID，关联任务表：t_curr_task
*/
@TableField("t_task_id")
private Long tTaskId;
/**
* 任务编码,子任务编码对应任务表t_curr_task中task_code编码
*/
@TableField("t_det_task_code")
private String tDetTaskCode;
/**
* 设备类型ID，关联设备类型表：t_equipment_type
*/
@TableField("t_equipment_type_id")
private Long tEquipmentTypeId;
/**
* 设备ID，关联设备表：t_kiln_info
*/
@TableField("t_equipment_id")
private Long tEquipmentId;
/**
* 工艺号ID，关联工艺号表：t_craft_info
*/
@TableField("t_craft_code_id")
private Long tCraftCodeId;
/**
* 工艺号对应PLC值
*/
@TableField("t_plc_value")
private Integer tPlcValue;
/**
* 进炉运输状态，0：开始，1：运输中，2：运输完成
*/
@TableField("t_in_tran_status")
private Integer tInTranStatus;
/**
* 加工状态，0：加工开始，1：加工中，2：加工完成
*/
@TableField("t_pro_status")
private Integer tProStatus;
/**
* 出炉运输状态，0：开始，1：运输中，2：运输完成
*/
@TableField("t_out_tran_status")
private Integer tOutTranStatus;
/**
* 执行任务ID，关联任务表：t_curr_task
*/
@TableField("th_task_id")
private Long thTaskId;
/**
* 任务编码,子任务编码对应任务表t_curr_task中task_code编码
*/
@TableField("th_det_task_code")
private String thDetTaskCode;
/**
* 设备类型ID，关联设备类型表：t_equipment_type
*/
@TableField("th_equipment_type_id")
private Long thEquipmentTypeId;
/**
* 设备ID，关联设备表：t_kiln_info
*/
@TableField("th_equipment_id")
private Long thEquipmentId;
/**
* 工艺号ID，关联工艺号表：t_craft_info
*/
@TableField("th_craft_code_id")
private Long thCraftCodeId;
/**
* 工艺号对应PLC值
*/
@TableField("th_plc_value")
private Integer thPlcValue;
/**
* 进炉运输状态，0：开始，1：运输中，2：运输完成
*/
@TableField("th_in_tran_status")
private Integer thInTranStatus;
/**
* 加工状态，0：加工开始，1：加工中，2：加工完成
*/
@TableField("th_pro_status")
private Integer thProStatus;
/**
* 出炉运输状态，0：开始，1：运输中，2：运输完成
*/
@TableField("th_out_tran_status")
private Integer thOutTranStatus;
/**
* 备注
*/
@TableField("content")
private String content;
public static final String ID = "id";
public static final String VALID = "valid";
public static final String CREATE_TIME = "create_time";
public static final String STATUS = "status";
public static final String INTER_CODE = "inter_code";
public static final String PROCESS_FLOW_ID = "process_flow_id";
public static final String PROCESS_FLOW_NAME = "process_flow_name";
public static final String PROCESS_FLOW_TYPE = "process_flow_type";
public static final String CRAFT_CODE_ID = "craft_code_id";
public static final String CRAFT_CODE = "craft_code";
public static final String WAREHOUSE_ID = "warehouse_id";
public static final String F_TASK_ID = "f_task_id";
public static final String F_DET_TASK_CODE = "f_det_task_code";
public static final String F_EQUIPMENT_TYPE_ID = "f_equipment_type_id";
public static final String F_EQUIPMENT_ID = "f_equipment_id";
public static final String F_CRAFT_CODE_ID = "f_craft_code_id";
public static final String F_PLC_VALUE = "f_plc_value";
public static final String F_IN_TRAN_STATUS = "f_in_tran_status";
public static final String F_PRO_STATUS = "f_pro_status";
public static final String F_OUT_TRAN_STATUS = "f_out_tran_status";
public static final String T_TASK_ID = "t_task_id";
public static final String T_DET_TASK_CODE = "t_det_task_code";
public static final String T_EQUIPMENT_TYPE_ID = "t_equipment_type_id";
public static final String T_EQUIPMENT_ID = "t_equipment_id";
public static final String T_CRAFT_CODE_ID = "t_craft_code_id";
public static final String T_PLC_VALUE = "t_plc_value";
public static final String T_IN_TRAN_STATUS = "t_in_tran_status";
public static final String T_PRO_STATUS = "t_pro_status";
public static final String T_OUT_TRAN_STATUS = "t_out_tran_status";
public static final String TH_TASK_ID = "th_task_id";
public static final String TH_DET_TASK_CODE = "th_det_task_code";
public static final String TH_EQUIPMENT_TYPE_ID = "th_equipment_type_id";
public static final String TH_EQUIPMENT_ID = "th_equipment_id";
public static final String TH_CRAFT_CODE_ID = "th_craft_code_id";
public static final String TH_PLC_VALUE = "th_plc_value";
public static final String TH_IN_TRAN_STATUS = "th_in_tran_status";
public static final String TH_PRO_STATUS = "th_pro_status";
public static final String TH_OUT_TRAN_STATUS = "th_out_tran_status";
public static final String CONTENT = "content";
@Override
protected Serializable pkVal() {
return this.id;
}
}

218
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTask.java
View File

@ -1,21 +1,25 @@
package com.mt.wms.core.dal.entity;
import com.baomidou.mybatisplus.annotation.*;
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;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 当前任务
* 任务表
* </p>
*
* @author mt
* @since 2021-12-09
* @since 2021-12-14
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ -67,7 +71,7 @@ public class CurrTask extends Model<CurrTask> {
private String version;
/**
* 状态： 0等待执行，1执行中，2执行完成，3追加后完成（追加后就按完成来算）
* 状态： 0等待执行，1执行中，2执行完成
*/
@TableField("status")
private Integer status;
@ -79,64 +83,16 @@ public class CurrTask extends Model<CurrTask> {
private String interCode;
/**
* 任务编码, 查看任务编码规则
* 是否自动执行： 0手动，1自动，如果是自动任务这里要监控进出和到缓存区的调度任务
*/
@TableField("task_code")
private String taskCode;
@TableField("is_auto")
private Integer isAuto;
/**
* 生产单号 APMS生成生产单后返回
* 任务流程ID，关联流程表：t_auto_exe_task
*/
@TableField("sheet_no")
private String sheetNo;
/**
* 任务来源 0：人工 扩展字段
*/
@TableField("task_source")
private Integer taskSource;
/**
* 任务类型：0:入库到窑炉，1:入库到缓存区，2出库到 窑炉到缓存区，3缓存区出库
*/
@TableField("task_type")
private Integer taskType;
/**
* 加工类型：0 初始加工，1 复加工 ，2 追加加工
*/
@TableField("process_type")
private Integer processType;
/**
* 托盘编码
*/
@TableField("pallet_code")
private String palletCode;
/**
* 缓存前开始时间，车辆开始执行
*/
@TableField("a_begin_time")
private LocalDateTime aBeginTime;
/**
* 完成当前任务时间（可能是到缓存区，有可能直接到窑炉），车辆放完货物到缓存区收到的时间
*/
@TableField("a_end_time")
private LocalDateTime aEndTime;
/**
* 开始位置
*/
@TableField("start_position")
private String startPosition;
/**
* 目标位置指的是窑炉的位置
*/
@TableField("target_position")
private String targetPosition;
@TableField("auto_exe_task_id")
private Long autoExeTaskId;
/**
* 窑炉id，关联设备窑炉表：t_kiln_info
@ -151,10 +107,52 @@ public class CurrTask extends Model<CurrTask> {
private String kilnName;
/**
* 车辆id，关联车辆表：t_vehicle_info
* 工艺号ID，关联工艺号表：t_craft_info
*/
@TableField("vehicle_id")
private Long vehicleId;
@TableField("craft_code_id")
private Long craftCodeId;
/**
* 工艺号对应PLC值
*/
@TableField("plc_value")
private Integer plcValue;
/**
* 开始加工时间
*/
@TableField("begin_time")
private LocalDateTime beginTime;
/**
* 加工结束时间
*/
@TableField("end_time")
private LocalDateTime endTime;
/**
* 进炉状态： 0准备进炉，1正在加工，2加工完成
*/
@TableField("is_in")
private Integer isIn;
/**
* 调度任务ID，关联调度表：t_run_task
*/
@TableField("run_task_id")
private Long runTaskId;
/**
* 开始位置
*/
@TableField("start_position")
private String startPosition;
/**
* 目标位置指的是窑炉的位置
*/
@TableField("target_position")
private String targetPosition;
/**
* 是否缓存，如果当前指的窑炉正在加工，系统自动分配货物到缓存位置， 并且记录缓存库位，这是当指定窑炉加工完成后系统先判断是否当前缓存有当前等待执行的任务，然后按照先来先执行原则（等待多个任务）自动调用车辆来执行
@ -162,6 +160,18 @@ public class CurrTask extends Model<CurrTask> {
@TableField("is_cache")
private Integer isCache;
/**
* 缓存状态状态： 0准备进入缓存区，1正在进入缓存区，2缓存完成
*/
@TableField("cache_satatus")
private Integer cacheSatatus;
/**
* 调度任务ID，关联调度表：t_run_task
*/
@TableField("cache_run_task_id")
private Long cacheRunTaskId;
/**
* 库位id，关联库位表：t_location
*/
@ -175,16 +185,34 @@ public class CurrTask extends Model<CurrTask> {
private String locationName;
/**
* 工艺号ID，关联工艺号表：t_craft_info
* 出炉状态： 0准备出炉，1正在加工，2加工完成
*/
@TableField("f_craft_code_id")
private Long fCraftCodeId;
@TableField("is_out")
private Integer isOut;
/**
* 工艺号对应PLC值
* 调度任务ID，关联调度表：t_run_task
*/
@TableField("f_plc_value")
private Integer fPlcValue;
@TableField("out_run_task_id")
private Long outRunTaskId;
/**
* 开始位置
*/
@TableField("out_start_position")
private String outStartPosition;
/**
* 目标位置，指缓存位置
*/
@TableField("out_target_position")
private String outTargetPosition;
/**
* 任务编码
*/
@TableField("task_code")
private String taskCode;
public static final String ID = "id";
@ -205,41 +233,49 @@ public class CurrTask extends Model<CurrTask> {
public static final String INTER_CODE = "inter_code";
public static final String TASK_CODE = "task_code";
public static final String IS_AUTO = "is_auto";
public static final String SHEET_NO = "sheet_no";
public static final String TASK_SOURCE = "task_source";
public static final String TASK_TYPE = "task_type";
public static final String PROCESS_TYPE = "process_type";
public static final String PALLET_CODE = "pallet_code";
public static final String A_BEGIN_TIME = "a_begin_time";
public static final String A_END_TIME = "a_end_time";
public static final String START_POSITION = "start_position";
public static final String TARGET_POSITION = "target_position";
public static final String AUTO_EXE_TASK_ID = "auto_exe_task_id";
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 CRAFT_CODE_ID = "craft_code_id";
public static final String PLC_VALUE = "plc_value";
public static final String BEGIN_TIME = "begin_time";
public static final String END_TIME = "end_time";
public static final String IS_IN = "is_in";
public static final String RUN_TASK_ID = "run_task_id";
public static final String START_POSITION = "start_position";
public static final String TARGET_POSITION = "target_position";
public static final String IS_CACHE = "is_cache";
public static final String CACHE_SATATUS = "cache_satatus";
public static final String CACHE_RUN_TASK_ID = "cache_run_task_id";
public static final String LOCATION_ID = "location_id";
public static final String LOCATION_NAME = "location_name";
public static final String F_CRAFT_CODE_ID = "f_craft_code_id";
public static final String IS_OUT = "is_out";
public static final String F_PLC_VALUE = "f_plc_value";
public static final String OUT_RUN_TASK_ID = "out_run_task_id";
public static final String OUT_START_POSITION = "out_start_position";
public static final String OUT_TARGET_POSITION = "out_target_position";
public static final String TASK_CODE = "task_code";
@Override
protected Serializable pkVal() {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTaskDet.java
View File

@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2021-12-14
*/
@Data
@EqualsAndHashCode(callSuper = false)

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

@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author mt
* @since 2021-11-19
* @since 2021-12-14
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ -71,7 +71,7 @@ public class InStockInfo extends Model<InStockInfo> {
private String version;
/**
* 状态： 0等待出库，1到窑炉前缓存
* 状态： 0未开始执行，1正在执行，2执行完成
*/
@TableField("status")
private Integer status;
@ -124,6 +124,18 @@ public class InStockInfo extends Model<InStockInfo> {
@TableField("pallet_code")
private String palletCode;
/**
* 类型： 0等待出库，1到窑炉前缓存，2插单任务缓存
*/
@TableField("type")
private Integer type;
/**
* 进入缓存区的时间，插单任务按倒叙执行，正常任务按顺序执行
*/
@TableField("in_time")
private LocalDateTime inTime;
public static final String ID = "id";
@ -157,6 +169,10 @@ public class InStockInfo extends Model<InStockInfo> {
public static final String PALLET_CODE = "pallet_code";
public static final String TYPE = "type";
public static final String IN_TIME = "in_time";
@Override
protected Serializable pkVal() {
return this.id;

22
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/InStockInfoHis.java
View File

@ -15,11 +15,11 @@ import lombok.experimental.Accessors;
/**
* <p>
* 缓存表存储历史情况
* 缓存区存储历史情况
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2021-12-14
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ -71,7 +71,7 @@ public class InStockInfoHis extends Model<InStockInfoHis> {
private String version;
/**
* 状态： 0等待出库，1到窑炉前缓存
* 状态： 0未开始执行，1正在执行，2执行完成
*/
@TableField("status")
private Integer status;
@ -124,6 +124,18 @@ public class InStockInfoHis extends Model<InStockInfoHis> {
@TableField("pallet_code")
private String palletCode;
/**
* 类型： 0等待出库，1到窑炉前缓存，2插单任务缓存
*/
@TableField("type")
private Integer type;
/**
* 进入缓存区的时间，插单任务按倒叙执行，正常任务按顺序执行
*/
@TableField("in_time")
private String inTime;
public static final String ID = "id";
@ -157,6 +169,10 @@ public class InStockInfoHis extends Model<InStockInfoHis> {
public static final String PALLET_CODE = "pallet_code";
public static final String TYPE = "type";
public static final String IN_TIME = "in_time";
@Override
protected Serializable pkVal() {
return this.id;

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

@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author mt
* @since 2021-11-19
* @since 2021-12-14
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ -71,11 +71,17 @@ public class RunTask extends Model<RunTask> {
private String version;
/**
* 任务id,关联wcs_task表
* 任务id,关联curr_task表
*/
@TableField("task_id")
private Long taskId;
/**
* 任务编码, 查看任务编码规则
*/
@TableField("task_code")
private String taskCode;
/**
* 开始位置
*/
@ -88,6 +94,24 @@ public class RunTask extends Model<RunTask> {
@TableField("end_position")
private String endPosition;
/**
* 车辆id，关联车辆表：t_vehicle_info
*/
@TableField("vehicle_id")
private Integer vehicleId;
/**
* 任务开始时间，车辆接收任务时间
*/
@TableField("begin_time")
private LocalDateTime beginTime;
/**
* 结束时间，车辆完成送货时间
*/
@TableField("end_time")
private LocalDateTime endTime;
/**
* 状态，0：未执行，1：正在执行，2：执行成功，3：执行失败
*/
@ -111,10 +135,18 @@ public class RunTask extends Model<RunTask> {
public static final String TASK_ID = "task_id";
public static final String TASK_CODE = "task_code";
public static final String START_POSITION = "start_position";
public static final String END_POSITION = "end_position";
public static final String VEHICLE_ID = "vehicle_id";
public static final String BEGIN_TIME = "begin_time";
public static final String END_TIME = "end_time";
public static final String STATUS = "status";
@Override

218
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskHis.java
View File

@ -1,21 +1,25 @@
package com.mt.wms.core.dal.entity;
import com.baomidou.mybatisplus.annotation.*;
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;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 任务历史
* 任务历史表
* </p>
*
* @author mt
* @since 2021-12-09
* @since 2021-12-14
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ -67,7 +71,7 @@ public class TaskHis extends Model<TaskHis> {
private String version;
/**
* 状态： 0等待执行，1执行中，2执行完成，3追加后完成（追加后就按完成来算）
* 状态： 0等待执行，1执行中，2执行完成
*/
@TableField("status")
private Integer status;
@ -79,64 +83,16 @@ public class TaskHis extends Model<TaskHis> {
private String interCode;
/**
* 任务编码, 查看任务编码规则
* 是否自动执行： 0手动，1自动，如果是自动任务这里要监控进出和到缓存区的调度任务
*/
@TableField("task_code")
private String taskCode;
@TableField("is_auto")
private Integer isAuto;
/**
* 生产单号 APMS生成生产单后返回
* 任务流程ID，关联流程表：t_auto_exe_task
*/
@TableField("sheet_no")
private String sheetNo;
/**
* 任务来源 0：人工 扩展字段
*/
@TableField("task_source")
private Integer taskSource;
/**
* 任务类型：0:入库到窑炉，1:入库到缓存区，2:出库到窑炉到缓存区，3:缓存区出库
*/
@TableField("task_type")
private Integer taskType;
/**
* 加工类型：0 初始加工，1 复加工 ，2 追加加工
*/
@TableField("process_type")
private Integer processType;
/**
* 托盘编码
*/
@TableField("pallet_code")
private String palletCode;
/**
* 缓存前开始时间，车辆开始执行
*/
@TableField("a_begin_time")
private LocalDateTime aBeginTime;
/**
* 完成当前任务时间（可能是到缓存区，有可能直接到窑炉），车辆放完货物到缓存区收到的时间
*/
@TableField("a_end_time")
private LocalDateTime aEndTime;
/**
* 开始位置
*/
@TableField("start_position")
private String startPosition;
/**
* 目标位置指的是窑炉的位置
*/
@TableField("target_position")
private String targetPosition;
@TableField("auto_exe_task_id")
private Long autoExeTaskId;
/**
* 窑炉id，关联设备窑炉表：t_kiln_info
@ -151,10 +107,52 @@ public class TaskHis extends Model<TaskHis> {
private String kilnName;
/**
* 车辆id，关联车辆表：t_vehicle_info
* 工艺号ID，关联工艺号表：t_craft_info
*/
@TableField("vehicle_id")
private Long vehicleId;
@TableField("craft_code_id")
private Long craftCodeId;
/**
* 工艺号对应PLC值
*/
@TableField("plc_value")
private Integer plcValue;
/**
* 开始加工时间
*/
@TableField("begin_time")
private LocalDateTime beginTime;
/**
* 加工结束时间
*/
@TableField("end_time")
private LocalDateTime endTime;
/**
* 进炉状态： 0准备进炉，1正在加工，2加工完成
*/
@TableField("is_in")
private Integer isIn;
/**
* 调度任务ID，关联调度表：t_run_task
*/
@TableField("run_task_id")
private Long runTaskId;
/**
* 开始位置
*/
@TableField("start_position")
private String startPosition;
/**
* 目标位置指的是窑炉的位置
*/
@TableField("target_position")
private String targetPosition;
/**
* 是否缓存，如果当前指的窑炉正在加工，系统自动分配货物到缓存位置， 并且记录缓存库位，这是当指定窑炉加工完成后系统先判断是否当前缓存有当前等待执行的任务，然后按照先来先执行原则（等待多个任务）自动调用车辆来执行
@ -162,6 +160,18 @@ public class TaskHis extends Model<TaskHis> {
@TableField("is_cache")
private Integer isCache;
/**
* 缓存状态状态： 0准备进入缓存区，1正在进入缓存区，2缓存完成
*/
@TableField("cache_satatus")
private Integer cacheSatatus;
/**
* 调度任务ID，关联调度表：t_run_task
*/
@TableField("cache_run_task_id")
private Long cacheRunTaskId;
/**
* 库位id，关联库位表：t_location
*/
@ -175,16 +185,34 @@ public class TaskHis extends Model<TaskHis> {
private String locationName;
/**
* 工艺号ID，关联工艺号表：t_craft_info
* 出炉状态： 0准备出炉，1正在加工，2加工完成
*/
@TableField("f_craft_code_id")
private Long fCraftCodeId;
@TableField("is_out")
private Integer isOut;
/**
* 工艺号对应PLC值
* 调度任务ID，关联调度表：t_run_task
*/
@TableField("f_plc_value")
private Integer fPlcValue;
@TableField("out_run_task_id")
private Long outRunTaskId;
/**
* 开始位置
*/
@TableField("out_start_position")
private String outStartPosition;
/**
* 目标位置，指缓存位置
*/
@TableField("out_target_position")
private String outTargetPosition;
/**
* 任务编码
*/
@TableField("task_code")
private String taskCode;
public static final String ID = "id";
@ -205,41 +233,49 @@ public class TaskHis extends Model<TaskHis> {
public static final String INTER_CODE = "inter_code";
public static final String TASK_CODE = "task_code";
public static final String IS_AUTO = "is_auto";
public static final String SHEET_NO = "sheet_no";
public static final String TASK_SOURCE = "task_source";
public static final String TASK_TYPE = "task_type";
public static final String PROCESS_TYPE = "process_type";
public static final String PALLET_CODE = "pallet_code";
public static final String A_BEGIN_TIME = "a_begin_time";
public static final String A_END_TIME = "a_end_time";
public static final String START_POSITION = "start_position";
public static final String TARGET_POSITION = "target_position";
public static final String AUTO_EXE_TASK_ID = "auto_exe_task_id";
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 CRAFT_CODE_ID = "craft_code_id";
public static final String PLC_VALUE = "plc_value";
public static final String BEGIN_TIME = "begin_time";
public static final String END_TIME = "end_time";
public static final String IS_IN = "is_in";
public static final String RUN_TASK_ID = "run_task_id";
public static final String START_POSITION = "start_position";
public static final String TARGET_POSITION = "target_position";
public static final String IS_CACHE = "is_cache";
public static final String CACHE_SATATUS = "cache_satatus";
public static final String CACHE_RUN_TASK_ID = "cache_run_task_id";
public static final String LOCATION_ID = "location_id";
public static final String LOCATION_NAME = "location_name";
public static final String F_CRAFT_CODE_ID = "f_craft_code_id";
public static final String IS_OUT = "is_out";
public static final String F_PLC_VALUE = "f_plc_value";
public static final String OUT_RUN_TASK_ID = "out_run_task_id";
public static final String OUT_START_POSITION = "out_start_position";
public static final String OUT_TARGET_POSITION = "out_target_position";
public static final String TASK_CODE = "task_code";
@Override
protected Serializable pkVal() {

16
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AutoExeTaskHisMapper.java Normal file
View File

@ -0,0 +1,16 @@
package com.mt.wms.core.dal.mapper;
import com.mt.wms.core.dal.entity.AutoExeTaskHis;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 自动执行任务表 Mapper 接口
* </p>
*
* @author mt
* @since 2021-12-14
*/
public interface AutoExeTaskHisMapper extends BaseMapper<AutoExeTaskHis> {
}

53
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AutoExeTaskHisMapper.xml Normal file
View File

@ -0,0 +1,53 @@
<?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.AutoExeTaskHisMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.mt.wms.core.dal.entity.AutoExeTaskHis">
<id column="id" property="id" />
<result column="valid" property="valid" />
<result column="create_time" property="createTime" />
<result column="status" property="status" />
<result column="inter_code" property="interCode" />
<result column="process_flow_id" property="processFlowId" />
<result column="process_flow_name" property="processFlowName" />
<result column="process_flow_type" property="processFlowType" />
<result column="craft_code_id" property="craftCodeId" />
<result column="craft_code" property="craftCode" />
<result column="warehouse_id" property="warehouseId" />
<result column="f_task_id" property="fTaskId" />
<result column="f_det_task_code" property="fDetTaskCode" />
<result column="f_equipment_type_id" property="fEquipmentTypeId" />
<result column="f_equipment_id" property="fEquipmentId" />
<result column="f_craft_code_id" property="fCraftCodeId" />
<result column="f_plc_value" property="fPlcValue" />
<result column="f_in_tran_status" property="fInTranStatus" />
<result column="f_pro_status" property="fProStatus" />
<result column="f_out_tran_status" property="fOutTranStatus" />
<result column="t_task_id" property="tTaskId" />
<result column="t_det_task_code" property="tDetTaskCode" />
<result column="t_equipment_type_id" property="tEquipmentTypeId" />
<result column="t_equipment_id" property="tEquipmentId" />
<result column="t_craft_code_id" property="tCraftCodeId" />
<result column="t_plc_value" property="tPlcValue" />
<result column="t_in_tran_status" property="tInTranStatus" />
<result column="t_pro_status" property="tProStatus" />
<result column="t_out_tran_status" property="tOutTranStatus" />
<result column="th_task_id" property="thTaskId" />
<result column="th_det_task_code" property="thDetTaskCode" />
<result column="th_equipment_type_id" property="thEquipmentTypeId" />
<result column="th_equipment_id" property="thEquipmentId" />
<result column="th_craft_code_id" property="thCraftCodeId" />
<result column="th_plc_value" property="thPlcValue" />
<result column="th_in_tran_status" property="thInTranStatus" />
<result column="th_pro_status" property="thProStatus" />
<result column="th_out_tran_status" property="thOutTranStatus" />
<result column="content" property="content" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, valid, create_time, status, inter_code, process_flow_id, process_flow_name, process_flow_type, craft_code_id, craft_code, warehouse_id, f_task_id, f_det_task_code, f_equipment_type_id, f_equipment_id, f_craft_code_id, f_plc_value, f_in_tran_status, f_pro_status, f_out_tran_status, t_task_id, t_det_task_code, t_equipment_type_id, t_equipment_id, t_craft_code_id, t_plc_value, t_in_tran_status, t_pro_status, t_out_tran_status, th_task_id, th_det_task_code, th_equipment_type_id, th_equipment_id, th_craft_code_id, th_plc_value, th_in_tran_status, th_pro_status, th_out_tran_status, content
</sql>
</mapper>

16
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AutoExeTaskMapper.java Normal file
View File

@ -0,0 +1,16 @@
package com.mt.wms.core.dal.mapper;
import com.mt.wms.core.dal.entity.AutoExeTask;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 自动执行任务表 Mapper 接口
* </p>
*
* @author mt
* @since 2021-12-14
*/
public interface AutoExeTaskMapper extends BaseMapper<AutoExeTask> {
}

53
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AutoExeTaskMapper.xml Normal file
View File

@ -0,0 +1,53 @@
<?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.AutoExeTaskMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.mt.wms.core.dal.entity.AutoExeTask">
<id column="id" property="id" />
<result column="valid" property="valid" />
<result column="create_time" property="createTime" />
<result column="status" property="status" />
<result column="inter_code" property="interCode" />
<result column="process_flow_id" property="processFlowId" />
<result column="process_flow_name" property="processFlowName" />
<result column="process_flow_type" property="processFlowType" />
<result column="craft_code_id" property="craftCodeId" />
<result column="craft_code" property="craftCode" />
<result column="warehouse_id" property="warehouseId" />
<result column="f_task_id" property="fTaskId" />
<result column="f_det_task_code" property="fDetTaskCode" />
<result column="f_equipment_type_id" property="fEquipmentTypeId" />
<result column="f_equipment_id" property="fEquipmentId" />
<result column="f_craft_code_id" property="fCraftCodeId" />
<result column="f_plc_value" property="fPlcValue" />
<result column="f_in_tran_status" property="fInTranStatus" />
<result column="f_pro_status" property="fProStatus" />
<result column="f_out_tran_status" property="fOutTranStatus" />
<result column="t_task_id" property="tTaskId" />
<result column="t_det_task_code" property="tDetTaskCode" />
<result column="t_equipment_type_id" property="tEquipmentTypeId" />
<result column="t_equipment_id" property="tEquipmentId" />
<result column="t_craft_code_id" property="tCraftCodeId" />
<result column="t_plc_value" property="tPlcValue" />
<result column="t_in_tran_status" property="tInTranStatus" />
<result column="t_pro_status" property="tProStatus" />
<result column="t_out_tran_status" property="tOutTranStatus" />
<result column="th_task_id" property="thTaskId" />
<result column="th_det_task_code" property="thDetTaskCode" />
<result column="th_equipment_type_id" property="thEquipmentTypeId" />
<result column="th_equipment_id" property="thEquipmentId" />
<result column="th_craft_code_id" property="thCraftCodeId" />
<result column="th_plc_value" property="thPlcValue" />
<result column="th_in_tran_status" property="thInTranStatus" />
<result column="th_pro_status" property="thProStatus" />
<result column="th_out_tran_status" property="thOutTranStatus" />
<result column="content" property="content" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, valid, create_time, status, inter_code, process_flow_id, process_flow_name, process_flow_type, craft_code_id, craft_code, warehouse_id, f_task_id, f_det_task_code, f_equipment_type_id, f_equipment_id, f_craft_code_id, f_plc_value, f_in_tran_status, f_pro_status, f_out_tran_status, t_task_id, t_det_task_code, t_equipment_type_id, t_equipment_id, t_craft_code_id, t_plc_value, t_in_tran_status, t_pro_status, t_out_tran_status, th_task_id, th_det_task_code, th_equipment_type_id, th_equipment_id, th_craft_code_id, th_plc_value, th_in_tran_status, th_pro_status, th_out_tran_status, content
</sql>
</mapper>

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskDetMapper.java
View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2021-12-14
*/
public interface CurrTaskDetMapper extends BaseMapper<CurrTaskDet> {

4
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.java
View File

@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 当前任务 Mapper 接口
* 任务表 Mapper 接口
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2021-12-14
*/
public interface CurrTaskMapper extends BaseMapper<CurrTask> {

42
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml
View File

@ -13,31 +13,33 @@
<result column="version" property="version" />
<result column="status" property="status" />
<result column="inter_code" property="interCode" />
<result column="is_auto" property="isAuto" />
<result column="auto_exe_task_id" property="autoExeTaskId" />
<result column="kiln_id" property="kilnId" />
<result column="kiln_name" property="kilnName" />
<result column="craft_code_id" property="craftCodeId" />
<result column="plc_value" property="plcValue" />
<result column="begin_time" property="beginTime" />
<result column="end_time" property="endTime" />
<result column="is_in" property="isIn" />
<result column="run_task_id" property="runTaskId" />
<result column="start_position" property="startPosition" />
<result column="target_position" property="targetPosition" />
<result column="is_cache" property="isCache" />
<result column="cache_satatus" property="cacheSatatus" />
<result column="cache_run_task_id" property="cacheRunTaskId" />
<result column="location_id" property="locationId" />
<result column="location_name" property="locationName" />
<result column="is_out" property="isOut" />
<result column="out_run_task_id" property="outRunTaskId" />
<result column="out_start_position" property="outStartPosition" />
<result column="out_target_position" property="outTargetPosition" />
<result column="task_code" property="taskCode" />
<result column="sheet_no" property="sheetNo"/>
<result column="task_source" property="taskSource" />
<result column="task_type" property="taskType" />
<result column="process_type" property="processType" />
<result column="pallet_code" property="palletCode" />
<result column="a_begin_time" property="aBeginTime"/>
<result column="a_end_time" property="aEndTime"/>
<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"/>
<result column="location_name" property="locationName"/>
<result column="f_craft_code_id" property="fCraftCodeId"/>
<result column="f_plc_value" property="fPlcValue"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, sheet_no,
task_source, task_type, process_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, f_craft_code_id, f_plc_value
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, is_auto, auto_exe_task_id, kiln_id, kiln_name, craft_code_id, plc_value, begin_time, end_time, is_in, run_task_id, start_position, target_position, is_cache, cache_satatus, cache_run_task_id, location_id, location_name, is_out, out_run_task_id, out_start_position, out_target_position, task_code
</sql>
</mapper>

4
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/InStockInfoHisMapper.java
View File

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

4
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/InStockInfoHisMapper.xml
View File

@ -20,11 +20,13 @@
<result column="location_id" property="locationId" />
<result column="location_name" property="locationName" />
<result column="pallet_code" property="palletCode" />
<result column="type" property="type" />
<result column="in_time" property="inTime" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_id, kiln_id, kiln_name, location_id, location_name, pallet_code
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_id, kiln_id, kiln_name, location_id, location_name, pallet_code, type, in_time
</sql>
</mapper>

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

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author mt
* @since 2021-11-19
* @since 2021-12-14
*/
public interface InStockInfoMapper extends BaseMapper<InStockInfo> {

4
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/InStockInfoMapper.xml
View File

@ -20,11 +20,13 @@
<result column="location_id" property="locationId" />
<result column="location_name" property="locationName" />
<result column="pallet_code" property="palletCode" />
<result column="type" property="type" />
<result column="in_time" property="inTime" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_id, kiln_id, kiln_name, location_id, location_name, pallet_code
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_id, kiln_id, kiln_name, location_id, location_name, pallet_code, type, in_time
</sql>
</mapper>

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

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author mt
* @since 2021-11-19
* @since 2021-12-14
*/
public interface RunTaskMapper extends BaseMapper<RunTask> {

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

@ -12,14 +12,18 @@
<result column="update_time" property="updateTime" />
<result column="version" property="version" />
<result column="task_id" property="taskId" />
<result column="task_code" property="taskCode" />
<result column="start_position" property="startPosition" />
<result column="end_position" property="endPosition" />
<result column="vehicle_id" property="vehicleId" />
<result column="begin_time" property="beginTime" />
<result column="end_time" property="endTime" />
<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
id, valid, create_time, creator_id, updater_id, update_time, version, task_id, task_code, start_position, end_position, vehicle_id, begin_time, end_time, status
</sql>
</mapper>

4
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskHisMapper.java
View File

@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 任务历史 Mapper 接口
* 任务历史表 Mapper 接口
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2021-12-14
*/
public interface TaskHisMapper extends BaseMapper<TaskHis> {

42
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskHisMapper.xml
View File

@ -13,31 +13,33 @@
<result column="version" property="version" />
<result column="status" property="status" />
<result column="inter_code" property="interCode" />
<result column="is_auto" property="isAuto" />
<result column="auto_exe_task_id" property="autoExeTaskId" />
<result column="kiln_id" property="kilnId" />
<result column="kiln_name" property="kilnName" />
<result column="craft_code_id" property="craftCodeId" />
<result column="plc_value" property="plcValue" />
<result column="begin_time" property="beginTime" />
<result column="end_time" property="endTime" />
<result column="is_in" property="isIn" />
<result column="run_task_id" property="runTaskId" />
<result column="start_position" property="startPosition" />
<result column="target_position" property="targetPosition" />
<result column="is_cache" property="isCache" />
<result column="cache_satatus" property="cacheSatatus" />
<result column="cache_run_task_id" property="cacheRunTaskId" />
<result column="location_id" property="locationId" />
<result column="location_name" property="locationName" />
<result column="is_out" property="isOut" />
<result column="out_run_task_id" property="outRunTaskId" />
<result column="out_start_position" property="outStartPosition" />
<result column="out_target_position" property="outTargetPosition" />
<result column="task_code" property="taskCode" />
<result column="sheet_no" property="sheetNo"/>
<result column="task_source" property="taskSource" />
<result column="task_type" property="taskType" />
<result column="process_type" property="processType" />
<result column="pallet_code" property="palletCode" />
<result column="a_begin_time" property="aBeginTime"/>
<result column="a_end_time" property="aEndTime"/>
<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"/>
<result column="location_name" property="locationName"/>
<result column="f_craft_code_id" property="fCraftCodeId"/>
<result column="f_plc_value" property="fPlcValue"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, sheet_no,
task_source, task_type, process_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, f_craft_code_id, f_plc_value
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, is_auto, auto_exe_task_id, kiln_id, kiln_name, craft_code_id, plc_value, begin_time, end_time, is_in, run_task_id, start_position, target_position, is_cache, cache_satatus, cache_run_task_id, location_id, location_name, is_out, out_run_task_id, out_start_position, out_target_position, task_code
</sql>
</mapper>

16
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/AutoExeTaskHisServiceBiz.java Normal file
View File

@ -0,0 +1,16 @@
package com.mt.wms.core.dal.service;
import com.mt.wms.core.dal.entity.AutoExeTaskHis;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 自动执行任务表 服务类
* </p>
*
* @author mt
* @since 2021-12-14
*/
public interface AutoExeTaskHisServiceBiz extends IService<AutoExeTaskHis> {
}

16
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/AutoExeTaskServiceBiz.java Normal file
View File

@ -0,0 +1,16 @@
package com.mt.wms.core.dal.service;
import com.mt.wms.core.dal.entity.AutoExeTask;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 自动执行任务表 服务类
* </p>
*
* @author mt
* @since 2021-12-14
*/
public interface AutoExeTaskServiceBiz extends IService<AutoExeTask> {
}

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/CurrTaskDetServiceBiz.java
View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2021-12-14
*/
public interface CurrTaskDetServiceBiz extends IService<CurrTaskDet> {

4
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/CurrTaskServiceBiz.java
View File

@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 当前任务 服务类
* 任务表 服务类
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2021-12-14
*/
public interface CurrTaskServiceBiz extends IService<CurrTask> {

4
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/InStockInfoHisServiceBiz.java
View File

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

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

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author mt
* @since 2021-11-19
* @since 2021-12-14
*/
public interface InStockInfoServiceBiz extends IService<InStockInfo> {

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

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author mt
* @since 2021-11-19
* @since 2021-12-14
*/
public interface RunTaskServiceBiz extends IService<RunTask> {

4
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/TaskHisServiceBiz.java
View File

@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 任务历史 服务类
* 任务历史表 服务类
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2021-12-14
*/
public interface TaskHisServiceBiz extends IService<TaskHis> {

20
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/AutoExeTaskHisServiceBizImpl.java Normal file
View File

@ -0,0 +1,20 @@
package com.mt.wms.core.dal.service.impl;
import com.mt.wms.core.dal.entity.AutoExeTaskHis;
import com.mt.wms.core.dal.mapper.AutoExeTaskHisMapper;
import com.mt.wms.core.dal.service.AutoExeTaskHisServiceBiz;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 自动执行任务表 服务实现类
* </p>
*
* @author mt
* @since 2021-12-14
*/
@Service
public class AutoExeTaskHisServiceBizImpl extends ServiceImpl<AutoExeTaskHisMapper, AutoExeTaskHis> implements AutoExeTaskHisServiceBiz {
}

20
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/AutoExeTaskServiceBizImpl.java Normal file
View File

@ -0,0 +1,20 @@
package com.mt.wms.core.dal.service.impl;
import com.mt.wms.core.dal.entity.AutoExeTask;
import com.mt.wms.core.dal.mapper.AutoExeTaskMapper;
import com.mt.wms.core.dal.service.AutoExeTaskServiceBiz;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 自动执行任务表 服务实现类
* </p>
*
* @author mt
* @since 2021-12-14
*/
@Service
public class AutoExeTaskServiceBizImpl extends ServiceImpl<AutoExeTaskMapper, AutoExeTask> implements AutoExeTaskServiceBiz {
}

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/CurrTaskDetServiceBizImpl.java
View File

@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2021-12-14
*/
@Service
public class CurrTaskDetServiceBizImpl extends ServiceImpl<CurrTaskDetMapper, CurrTaskDet> implements CurrTaskDetServiceBiz {

4
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/CurrTaskServiceBizImpl.java
View File

@ -8,11 +8,11 @@ import org.springframework.stereotype.Service;
/**
* <p>
* 当前任务 服务实现类
* 任务表 服务实现类
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2021-12-14
*/
@Service
public class CurrTaskServiceBizImpl extends ServiceImpl<CurrTaskMapper, CurrTask> implements CurrTaskServiceBiz {

4
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/InStockInfoHisServiceBizImpl.java
View File

@ -8,11 +8,11 @@ import org.springframework.stereotype.Service;
/**
* <p>
* 缓存表存储历史情况 服务实现类
* 缓存区存储历史情况 服务实现类
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2021-12-14
*/
@Service
public class InStockInfoHisServiceBizImpl extends ServiceImpl<InStockInfoHisMapper, InStockInfoHis> implements InStockInfoHisServiceBiz {

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

@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author mt
* @since 2021-11-19
* @since 2021-12-14
*/
@Service
public class InStockInfoServiceBizImpl extends ServiceImpl<InStockInfoMapper, InStockInfo> implements InStockInfoServiceBiz {

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

@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author mt
* @since 2021-11-19
* @since 2021-12-14
*/
@Service
public class RunTaskServiceBizImpl extends ServiceImpl<RunTaskMapper, RunTask> implements RunTaskServiceBiz {

4
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/TaskHisServiceBizImpl.java
View File

@ -8,11 +8,11 @@ import org.springframework.stereotype.Service;
/**
* <p>
* 任务历史 服务实现类
* 任务历史表 服务实现类
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2021-12-14
*/
@Service
public class TaskHisServiceBizImpl extends ServiceImpl<TaskHisMapper, TaskHis> implements TaskHisServiceBiz {

39
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
View File

@ -1,6 +1,7 @@
package com.mt.wms.empty.task;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mt.wms.core.base.BaseService;
import com.mt.wms.core.dal.entity.*;
import com.mt.wms.core.dal.service.*;
import com.mt.wms.core.utils.IDGenerator;
@ -21,7 +22,7 @@ import java.time.LocalDateTime;
*/
@Service
@Transactional
public class AsynRunTaskService {
public class AsynRunTaskService extends BaseService {
@Resource
private CurrTaskServiceBiz currTaskServiceBiz;
@ -37,25 +38,31 @@ public class AsynRunTaskService {
public void asynRunTask(CurrTask currTask){
//新建一条执行任务的关系表存放任务执行信息
RunTask runTask=new RunTask();
runTask.setCreateTime(LocalDateTime.now());
runTask.setTaskId(currTask.getId());
// TODO: 2021/12/13 currTask code、车辆id、开始执行时间
runTask.setStartPosition(currTask.getStartPosition());
runTask.setEndPosition(currTask.getTargetPosition());
setCommonField(runTask);
runTaskServiceBiz.save(runTask);
//调用车辆填入起终点
//得到车辆执行结果
//车辆执行不成功，记录日志，推送消息到前端提醒？
//执行成功,托盘进炉(存疑，进入窑炉不算任务完成的话，窑炉怎么给出是哪条任务加工完成了)
if (true){
//更新关系表状态为完成
runTask.setUpdateTime(LocalDateTime.now());
runTask.setStatus(2);
// TODO: 2021/12/13 结束时间
runTaskServiceBiz.updateById(runTask);
//更新currTask表状态为完成
currTask.setStatus(2);
//更新currTask表状态
// TODO: 2021/12/13 is_in 改为 1、runTaskId、起终点
currTask.setUpdateTime(LocalDateTime.now());
currTaskServiceBiz.updateById(currTask);
}else {
// TODO: 2021/12/13 车辆执行不成功，记录日志，推送消息到前端提醒？
}
}
//窑炉已满，调用车辆起点为提升台，终点为缓存区
@ -66,7 +73,8 @@ public class AsynRunTaskService {
.eq(Location.VALID, 1)).get(0);
//新建一条执行任务的关系表存放任务执行信息,终点为缓存区空闲库位
RunTask runTask=new RunTask();
runTask.setCreateTime(LocalDateTime.now());
setCommonField(runTask);
// TODO: 2021/12/13 currTask code、车辆id、开始执行时间
runTask.setTaskId(currTask.getId());
runTask.setStartPosition(currTask.getStartPosition());
runTask.setEndPosition(location.getCode());
@ -77,7 +85,6 @@ public class AsynRunTaskService {
locationServiceBiz.updateById(location);
//添加一条库位详情到in_stock_info表
InStockInfo inStockInfo=new InStockInfo();
inStockInfo.setCreateTime(LocalDateTime.now());
inStockInfo.setStatus(1);
inStockInfo.setInterCode(IDGenerator.gen("HCT", "yyyyMMddHHmm", 2, "WAREHOUSE_CODE"));
inStockInfo.setTaskId(currTask.getId());
@ -86,7 +93,7 @@ public class AsynRunTaskService {
inStockInfo.setKilnName(currTask.getKilnName());
inStockInfo.setLocationId(location.getId());
inStockInfo.setLocationName(location.getLocationNameAlias());
inStockInfo.setPalletCode(currTask.getPalletCode());
setCommonField(inStockInfo);
inStockInfoServiceBiz.save(inStockInfo);
//修改currTask的是否缓存,库位id,库位名称
currTask.setIsCache(1);
@ -95,9 +102,21 @@ public class AsynRunTaskService {
currTaskServiceBiz.updateById(currTask);
//调用车辆
//车辆执行不成功，记录日志，推送消息到前端提醒？
if (true){
//更新关系表状态为完成
runTask.setUpdateTime(LocalDateTime.now());
runTask.setStatus(2);
// TODO: 2021/12/13 结束时间
runTaskServiceBiz.updateById(runTask);
//更新currTask表
// TODO: 2021/12/13 is_cache 、runTaskId
currTask.setUpdateTime(LocalDateTime.now());
currTaskServiceBiz.updateById(currTask);
}else {
// TODO: 2021/12/13 车辆执行不成功，记录日志，推送消息到前端提醒？
}
//车辆执行执行成功后加入窑炉的缓存区任务队列
// TODO: 2021/12/13 车辆执行执行成功后加入窑炉的缓存区任务队列
}
}

31
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java
View File

@ -29,9 +29,14 @@ public class RunTaskUtils {
@Resource
private VehicleInfoServiceBiz vehicleInfoServiceBiz;
public R runTask(Integer wcsTaskId) throws InterruptedException {
CurrTask currTask = currTaskServiceBiz.getById(wcsTaskId);
/**
* 进炉加工
* @param currTaskId
* @return
* @throws InterruptedException
*/
public R runTaskForInKiln(Integer currTaskId) throws InterruptedException {
CurrTask currTask = currTaskServiceBiz.getById(currTaskId);
//传入任务id,起始点，若终点是窑炉，获取窑炉状态
int kilnStatus = 1;
@ -58,6 +63,7 @@ public class RunTaskUtils {
return R.failed("暂无可用车辆!请稍后重试！");
}
//异步调用车辆
// TODO: 2021/12/13 传入车辆id
asynRunTaskService.asynRunTask(currTask);
return R.ok("操作成功");
}
@ -69,10 +75,6 @@ public class RunTaskUtils {
.eq(Location.VALID, 1));
//缓存区未满
if (count >0) {
//更改任务状态为执行中
currTask.setStatus(1);
currTask.setUpdateTime(LocalDateTime.now());
currTaskServiceBiz.updateById(currTask);
//查询是否有空闲车辆，若有。占用车辆，若无，返回暂无可用车辆
List<VehicleInfo> vehicleInfoList = vehicleInfoServiceBiz.list(new QueryWrapper<VehicleInfo>()
.eq(VehicleInfo.STATUS, 0)
@ -85,7 +87,12 @@ public class RunTaskUtils {
}else {
return R.failed("暂无可用车辆!请稍后重试！");
}
// TODO: 2021/12/13 更改 is_cache 、库位id、库位名称
currTask.setUpdateTime(LocalDateTime.now());
currTaskServiceBiz.updateById(currTask);
//异步调用车辆
// TODO: 2021/12/13 传入车辆id
asynRunTaskService.asynRunTaskToWarehouse(currTask);
return R.ok("操作成功！当前目标窑炉已满，托盘加入缓存区待加工队列。");
}
@ -93,4 +100,14 @@ public class RunTaskUtils {
}
return null;
}
/**
* 加工完成、出炉。传入窑炉id，查询正在该窑炉加工的currTask,查询是否有空闲车辆，有，
* （查询是否为自动任务，是，查询下一步的窑炉是否空闲，是，调车去下一窑炉加工，否，暂存缓存区）
* 呼叫车辆暂存缓存区，车辆调度任务结束后，（结束后再查询缓存区队列避免车辆路线冲突）查询该窑炉的缓存区队列，开始下一托盘货物调度进窑炉
* @return
*/
public R runTaskForOutKiln(){
return null;
}
}

19
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java Normal file
View File

@ -0,0 +1,19 @@
package com.mt.wms.empty.task;
import org.springframework.scheduling.annotation.Scheduled;
/**
* @Author: liguanghao
* @Date: 2021/12/13 19:54
* @Version 1.0
*/
public class ScheduledTask {
/**
* 查询缓存区队列中待加工的
*/
@Scheduled
public void taskForStockToKiln(){
}
}