From d023edd7b8912fd5feb5135dde14a6d71fea5052 Mon Sep 17 00:00:00 2001
From: Lin-XCC <754310653@QQ.COM>
Date: Tue, 9 Nov 2021 09:08:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E4=BB=BB=E5=8A=A1=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=AA=91=E7=82=89id=EF=BC=8C=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=9F=BA=E7=A1=80=E4=BB=A3=E7=A0=81?=
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 | 10 +++++++++-
 .../com/mt/wms/core/dal/mapper/CurrTaskMapper.java     |  2 +-
 .../java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml |  3 ++-
 .../mt/wms/core/dal/service/CurrTaskServiceBiz.java    |  2 +-
 .../core/dal/service/impl/CurrTaskServiceBizImpl.java  |  2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

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 cdfff34..6239b64 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
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author mt
- * @since 2021-09-29
+ * @since 2021-11-09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -118,6 +118,12 @@ public class CurrTask extends Model<CurrTask> {
     @TableField("target_position")
     private String targetPosition;
 
+    /**
+     * 目标窑炉id
+     */
+    @TableField("kiln_id")
+    private Long kilnId;
+
     /**
      * 车辆id，关联车辆表：t_vehicle_info
      */
@@ -173,6 +179,8 @@ public class CurrTask extends Model<CurrTask> {
 
     public static final String TARGET_POSITION = "target_position";
 
+    public static final String KILN_ID = "kiln_id";
+
     public static final String VEHICLE_ID = "vehicle_id";
 
     public static final String IS_CACHE = "is_cache";
diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.java
index 66b53ab..a5d9cc9 100644
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author mt
- * @since 2021-09-29
+ * @since 2021-11-09
  */
 public interface CurrTaskMapper extends BaseMapper<CurrTask> {
 
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 f5cf4c4..4ae88a2 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
@@ -19,6 +19,7 @@
         <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="vehicle_id" property="vehicleId" />
         <result column="is_cache" property="isCache" />
         <result column="location_id" property="locationId" />
@@ -27,7 +28,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, vehicle_id, is_cache, location_id, location_name
+        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
     </sql>
 
 </mapper>
diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/CurrTaskServiceBiz.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/CurrTaskServiceBiz.java
index 39cdb4d..479ad93 100644
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/CurrTaskServiceBiz.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/CurrTaskServiceBiz.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author mt
- * @since 2021-09-29
+ * @since 2021-11-09
  */
 public interface CurrTaskServiceBiz extends IService<CurrTask> {
 
diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/CurrTaskServiceBizImpl.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/CurrTaskServiceBizImpl.java
index 693f1d2..decae37 100644
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/CurrTaskServiceBizImpl.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/CurrTaskServiceBizImpl.java
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author mt
- * @since 2021-09-29
+ * @since 2021-11-09
  */
 @Service
 public class CurrTaskServiceBizImpl extends ServiceImpl<CurrTaskMapper, CurrTask> implements CurrTaskServiceBiz {