From 7f67da210d632ea7fc6a91472d7035ea2ec14ae3 Mon Sep 17 00:00:00 2001
From: Lin-XCC <754310653@QQ.COM>
Date: Tue, 9 Nov 2021 10:57:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=A1=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mt/wms/core/dal/entity/CurrTask.java    | 8 ++++++++
 .../java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml    | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTask.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTask.java
index 6239b64..eaa8307 100644
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTask.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTask.java
@@ -88,6 +88,12 @@ public class CurrTask extends Model<CurrTask> {
     @TableField("task_code")
     private String taskCode;
 
+    /**
+     * 任务类型：0:入库到窑炉，1:入库到缓存区，2出库到	窑炉到缓存区，3缓存区出库
+     */
+    @TableField("task_type")
+    private Integer taskType;
+
     /**
      * 托盘编码
      */
@@ -169,6 +175,8 @@ public class CurrTask extends Model<CurrTask> {
 
     public static final String TASK_CODE = "task_code";
 
+    public static final String TASK_TYPE = "task_type";
+
     public static final String PALLET_CODE = "pallet_code";
 
     public static final String A_BEGIN_TIME = "a_begin_time";
diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml
index 4ae88a2..be334a0 100644
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml
@@ -14,6 +14,7 @@
         <result column="status" property="status" />
         <result column="inter_code" property="interCode" />
         <result column="task_code" property="taskCode" />
+        <result column="task_type" property="taskType" />
         <result column="pallet_code" property="palletCode" />
         <result column="a_begin_time" property="aBeginTime" />
         <result column="a_end_time" property="aEndTime" />
@@ -28,7 +29,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, 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_type, pallet_code, a_begin_time, a_end_time, start_position, target_position, kiln_id, vehicle_id, is_cache, location_id, location_name
     </sql>
 
 </mapper>