icewint/wcs_server_kate_suzhou
5
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

<fix>[normal]删除不用的输送线联表查询逻辑

Browse Source
This commit is contained in:
葛林强 2024-06-19 10:11:46 +08:00
parent 66c6b0789a
commit 79d5f2b0b5
2 changed files with 0 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
WcsMain/DataBase/Dao/AppConveyTaskDao.cs
View File

@ -167,53 +167,5 @@ public class AppConveyTaskDao
}
}
/// <summary>
/// 联表查询任务，带出站台号，区域
/// </summary>
/// <param name="conveyTask"></param>
/// <returns></returns>
public List<JoinAppConveyTaskAndAppConveyStand>? QueryWithStandInfo(AppConveyTask conveyTask)
{
try
{
var sqlFuc = CommonTool.DbServe.Queryable<AppConveyTask>()
.WhereIF(conveyTask.TaskId != default, w => w.TaskId == conveyTask.TaskId)
.WhereIF(conveyTask.TaskGroup != default, w => w.TaskGroup == conveyTask.TaskGroup)
.WhereIF(conveyTask.VehicleNo != default, w => w.VehicleNo == conveyTask.VehicleNo)
.WhereIF(conveyTask.TaskType != default, w => w.TaskType == conveyTask.TaskType)
.WhereIF(conveyTask.TaskStatus != default, w => w.TaskStatus == conveyTask.TaskStatus)
.WhereIF(conveyTask.Location != default, w => w.Location == conveyTask.Location)
.WhereIF(conveyTask.ArriveLocation != default, w => w.ArriveLocation == conveyTask.ArriveLocation)
.WhereIF(conveyTask.CreatePerson != default, w => w.CreatePerson == conveyTask.CreatePerson)
.WhereIF(conveyTask.Remark != default, w => w.Remark == conveyTask.Remark)
.LeftJoin<AppConveyStand>((ct, cs) => ct.Location == cs.StandId)
.OrderBy(ct => ct.CreateTime)
.Select((ct, cs) => new JoinAppConveyTaskAndAppConveyStand
{
TaskId = ct.TaskId,
TaskGroup = ct.TaskGroup,
VehicleNo = ct.VehicleNo,
TaskType = ct.TaskType,
TaskStatus = ct.TaskStatus,
Location = ct.Location,
ArriveLocation = ct.ArriveLocation,
CreatePerson = ct.CreatePerson,
CreateTime = ct.CreateTime,
MoveTime = ct.MoveTime,
CompleteTime = ct.CompleteTime,
Remark = ct.Remark,
StandId = cs.StandId,
StandType = cs.StandType,
});
return sqlFuc.ToList();
}
catch (Exception ex)
{
_ = ex;
return default;
}
}
}

98
WcsMain/DataBase/TableEntity/JoinAppConveyTaskAndAppConveyStand.cs
View File

@ -1,98 +0,0 @@
using SqlSugar;
namespace WcsMain.DataBase.TableEntity;
/// <summary>
/// 联表查询
/// </summary>
public class JoinAppConveyTaskAndAppConveyStand
{
/// <summary>
/// 任务号
/// </summary>
[SugarColumn(ColumnName = "task_id")]
public string? TaskId { get; set; }
/// <summary>
/// 任务组
/// </summary>
[SugarColumn(ColumnName = "task_group")]
public string? TaskGroup { get; set; }
/// <summary>
/// 载具号
/// </summary>
[SugarColumn(ColumnName = "vehicle_no")]
public string? VehicleNo { get; set; }
/// <summary>
/// 任务类型
/// </summary>
[SugarColumn(ColumnName = "task_type")]
public int? TaskType { get; set; }
/// <summary>
/// 任务状态
/// </summary>
[SugarColumn(ColumnName = "task_status")]
public int? TaskStatus { get; set; }
/// <summary>
/// 点位
/// </summary>
[SugarColumn(ColumnName = "location")]
public string? Location { get; set; }
/// <summary>
/// 实际到达的点位
/// </summary>
[SugarColumn(ColumnName = "arrive_location")]
public string? ArriveLocation { get; set; }
/// <summary>
/// 创建人
/// </summary>
[SugarColumn(ColumnName = "create_person")]
public string? CreatePerson { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[SugarColumn(ColumnName = "create_time")]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 移栽时间
/// </summary>
[SugarColumn(ColumnName = "move_time")]
public DateTime? MoveTime { get; set; }
/// <summary>
/// 完成时间
/// </summary>
[SugarColumn(ColumnName = "complete_time")]
public DateTime? CompleteTime { get; set; }
/// <summary>
/// 备注信息
/// </summary>
[SugarColumn(ColumnName = "remark")]
public string? Remark { get; set; }
/// <summary>
/// 站台号
/// </summary>
[SugarColumn(ColumnName = "stand_id")]
public string? StandId { get; set; }
/// <summary>
/// 站台类型
/// </summary>
[SugarColumn(ColumnName = "stand_type")]
public int? StandType { get; set; }
}