From 2d6beef4c3840735a4d079e2632591c764a0e9a2 Mon Sep 17 00:00:00 2001 From: Lin-XCC <754310653@QQ.COM> Date: Wed, 10 Nov 2021 09:36:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=96=87=E4=BB=B6=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mt/wms/core/dal/entity/CurrTask.java | 22 ++++++++++++++++--- .../mt/wms/core/dal/entity/CurrTaskDet.java | 2 +- .../mt/wms/core/dal/mapper/CurrTaskMapper.xml | 4 +++- 3 files changed, 23 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 eaa8307..ff6fd9f 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 { @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 { 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 { * 库位id，关联库位表：t_location */ @TableField("location_id") - private Integer locationId; + private Long locationId; /** * 库位名称 @@ -175,6 +187,8 @@ public class CurrTask extends Model { 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 { 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"; diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTaskDet.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTaskDet.java index eba317f..e9c9279 100644 --- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTaskDet.java +++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTaskDet.java @@ -92,7 +92,7 @@ public class CurrTaskDet extends Model { * 当前任务id，关联当前任务表：t_curr_task */ @TableField("curr_task_id") - private Integer currTaskId; + private Long currTaskId; /** * 订单号， 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 be334a0..a8c2cc8 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 @@ + @@ -21,6 +22,7 @@ + @@ -29,7 +31,7 @@ - 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