diff --git a/WcsMain/DataBase/Dao/AppConveyTaskDao.cs b/WcsMain/DataBase/Dao/AppConveyTaskDao.cs
index 806bc73..20bdf60 100644
--- a/WcsMain/DataBase/Dao/AppConveyTaskDao.cs
+++ b/WcsMain/DataBase/Dao/AppConveyTaskDao.cs
@@ -167,53 +167,5 @@ public class AppConveyTaskDao
}
}
- ///
- /// 联表查询任务,带出站台号,区域
- ///
- ///
- ///
- public List? QueryWithStandInfo(AppConveyTask conveyTask)
- {
- try
- {
- var sqlFuc = CommonTool.DbServe.Queryable()
- .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((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;
- }
- }
-
-
}
diff --git a/WcsMain/DataBase/TableEntity/JoinAppConveyTaskAndAppConveyStand.cs b/WcsMain/DataBase/TableEntity/JoinAppConveyTaskAndAppConveyStand.cs
deleted file mode 100644
index a99b2cb..0000000
--- a/WcsMain/DataBase/TableEntity/JoinAppConveyTaskAndAppConveyStand.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using SqlSugar;
-
-namespace WcsMain.DataBase.TableEntity;
-
-
-///
-/// 联表查询
-///
-public class JoinAppConveyTaskAndAppConveyStand
-{
-
- ///
- /// 任务号
- ///
- [SugarColumn(ColumnName = "task_id")]
- public string? TaskId { get; set; }
-
- ///
- /// 任务组
- ///
- [SugarColumn(ColumnName = "task_group")]
- public string? TaskGroup { get; set; }
-
- ///
- /// 载具号
- ///
- [SugarColumn(ColumnName = "vehicle_no")]
- public string? VehicleNo { get; set; }
-
- ///
- /// 任务类型
- ///
- [SugarColumn(ColumnName = "task_type")]
- public int? TaskType { get; set; }
-
- ///
- /// 任务状态
- ///
- [SugarColumn(ColumnName = "task_status")]
- public int? TaskStatus { get; set; }
-
- ///
- /// 点位
- ///
- [SugarColumn(ColumnName = "location")]
- public string? Location { get; set; }
-
-
- ///
- /// 实际到达的点位
- ///
- [SugarColumn(ColumnName = "arrive_location")]
- public string? ArriveLocation { get; set; }
-
- ///
- /// 创建人
- ///
- [SugarColumn(ColumnName = "create_person")]
- public string? CreatePerson { get; set; }
-
- ///
- /// 创建时间
- ///
- [SugarColumn(ColumnName = "create_time")]
- public DateTime? CreateTime { get; set; }
-
- ///
- /// 移栽时间
- ///
- [SugarColumn(ColumnName = "move_time")]
- public DateTime? MoveTime { get; set; }
-
- ///
- /// 完成时间
- ///
- [SugarColumn(ColumnName = "complete_time")]
- public DateTime? CompleteTime { get; set; }
-
- ///
- /// 备注信息
- ///
- [SugarColumn(ColumnName = "remark")]
- public string? Remark { get; set; }
-
-
-
- ///
- /// 站台号
- ///
- [SugarColumn(ColumnName = "stand_id")]
- public string? StandId { get; set; }
-
- ///
- /// 站台类型
- ///
- [SugarColumn(ColumnName = "stand_type")]
- public int? StandType { get; set; }
-}