From 7ca9651f81d7b84f054194d3d46fdbd1d9c8b922 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 09 七月 2025 22:55:27 +0800
Subject: [PATCH] 增加质检出入库逻辑
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_ShuttleCar.cs | 78 ++++++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 30 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_ShuttleCar.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_ShuttleCar.cs"
index 6a3a4cd..57528e2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_ShuttleCar.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_ShuttleCar.cs"
@@ -24,7 +24,6 @@
WebResponseContent content = new WebResponseContent().OK();
try
{
- //var task = GetTaskInfo(taskNum, (int)TaskCarStatusEnum.ShuttleCar_Executing);//鍙兘鏍规嵁浠诲姟鍙锋煡璇换鍔�
var task = GetTaskInfo(taskNum);
if (task != null)
{
@@ -34,12 +33,15 @@
{
if (TaskInboundTypes.Contains(task.TaskType) && task.TaskState == TaskInStatusEnum.Car_InExecuting.ObjToInt())
{
- //int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
- task.CurrentAddress = task.NextAddress;
- task.NextAddress = string.Empty;
- task.TaskState = (int)TaskInStatusEnum.InFinish;
+ task.TaskState = TaskInStatusEnum.InFinish.ObjToInt();
AddTask_Hty(task, TaskOperateTypeEnum.AutoComplete);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"绌挎杞﹀叆搴撳畬鎴�");
+ }
+ else if (TaskRelocationTypes.Contains(task.TaskType) && task.TaskState == TaskRelocationStatusEnum.CarTarget_Executing.ObjToInt())
+ {
+ task.TaskState = TaskRelocationStatusEnum.RelocationFinish.ObjToInt();
+ AddTask_Hty(task, TaskOperateTypeEnum.AutoComplete);
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"绌挎杞︾Щ搴撳畬鎴�");
}
}
break;
@@ -47,19 +49,21 @@
{
if (TaskOutboundTypes.Contains(task.TaskType) && task.TaskState == TaskOutStatusEnum.Car_OutExecuting.ObjToInt())
{
- //int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
- task.TaskState = (int)TaskOutStatusEnum.Car_OutFinish;
- task.ModifyDate = DateTime.Now;
- task.Modifier = "System";
+ task.TaskState = TaskOutStatusEnum.Car_OutFinish.ObjToInt();
+ UpdateData(task);
+ }
+ else if (TaskRelocationTypes.Contains(task.TaskType) && task.TaskState == TaskRelocationStatusEnum.CarSource_Executing.ObjToInt())
+ {
+ task.TaskState = TaskRelocationStatusEnum.CarSource_Finish.ObjToInt();
UpdateData(task);
}
}
break;
case 10://鍏呯數瀹屾垚
{
- if (task.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt() && task.TaskState == (int)CarChargingTask.ShuttleCar_Charging)//绉昏溅鍏呯數
+ if (task.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt() && task.TaskState == (int)CarChargingTaskEnum.CarCharging_Charging)//绉昏溅鍏呯數
{
- task.TaskState = (int)CarChargingTask.RelocationCarFinish;
+ task.TaskState = CarChargingTaskEnum.CarChargingFinish.ObjToInt();
AddTask_Hty(task, TaskOperateTypeEnum.AutoComplete);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"绌挎杞﹀厖鐢靛畬鎴�");
}
@@ -68,22 +72,14 @@
case 13://A渚у洖闆跺畬鎴�
case 14://B渚у洖闆跺畬鎴�
{
- if (TaskRelocationTypes.Contains(task.TaskType))//绉诲簱浠诲姟
+ if (task.TaskType == TaskOtherTypeEnum.RelocationCar.ObjToInt() && task.TaskState == TaskCarStatusEnum.ShuttleCar_Executing.ObjToInt())//绉昏溅浠诲姟
{
- if (task.TaskState == TaskRelocationStatusEnum.CarSource_Executing.ObjToInt())
- task.TaskState = TaskRelocationStatusEnum.CarSource_Finish.ObjToInt();
- else if (task.TaskState == TaskRelocationStatusEnum.CarTarget_Executing.ObjToInt())
- task.TaskState = TaskRelocationStatusEnum.RelocationFinish.ObjToInt();
+ task.TaskState = TaskCarStatusEnum.ShuttleCar_Finish.ObjToInt();
UpdateData(task);
}
- else if (task.TaskType == TaskOtherTypeEnum.RelocationCar.ObjToInt() && task.TaskState == TaskCarStatusEnum.ShuttleCar_Executing.ObjToInt())//绉昏溅浠诲姟
+ else if (task.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt() && task.TaskState == CarChargingTaskEnum.CarCharging_Executing.ObjToInt())//绉昏溅鍏呯數
{
- task.TaskState = (int)TaskCarStatusEnum.ShuttleCar_Finish;
- UpdateData(task);
- }
- else if (task.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt() && task.TaskState == CarChargingTask.ShuttleCar_Executing.ObjToInt())//绉昏溅鍏呯數
- {
- task.TaskState = (int)CarChargingTask.ShuttleCar_Finish;
+ task.TaskState = CarChargingTaskEnum.CarCharging_Finish.ObjToInt();
UpdateData(task);
}
}
@@ -125,7 +121,7 @@
}
return content;
}
-
+ public static int tasktype = 0;
/// <summary>
/// 鏌ヨ绌挎杞﹀嚭鍏ュ簱浠诲姟
/// </summary>
@@ -134,10 +130,27 @@
/// <returns></returns>
public Dt_Task QueryShuttleCarTask(string deviceNo, string currentAddress = "")
{
- if (string.IsNullOrEmpty(currentAddress))
- return BaseDal.QueryFirst(x => x.ShuttleCarCode == deviceNo && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.SC_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy);
+ Dt_Task? _Task = null;
+ if (tasktype == 0)
+ {
+ if (string.IsNullOrEmpty(currentAddress))
+ _Task = BaseDal.QueryFirst(x => x.ShuttleCarCode == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.SC_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState <= (int)TaskOutStatusEnum.Car_OutFinish, TaskOrderBy);
+ else
+ _Task = BaseDal.QueryFirst(x => x.ShuttleCarCode == deviceNo && x.CurrentAddress == currentAddress && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.SC_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState <= (int)TaskOutStatusEnum.Car_OutFinish), TaskOrderBy);
+ }
else
- return BaseDal.QueryFirst(x => x.ShuttleCarCode == deviceNo && x.CurrentAddress == currentAddress && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.SC_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy);
+ {
+ if (TaskInboundTypes.Contains(tasktype))
+ {
+ _Task = BaseDal.QueryFirst(x => TaskOutboundTypes.Contains(x.TaskType) && x.TaskState <= (int)TaskOutStatusEnum.Car_OutFinish, TaskOrderBy) ?? BaseDal.QueryFirst(x => x.ShuttleCarCode == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.SC_InFinish, TaskOrderBy);
+ }
+ else if (TaskOutboundTypes.Contains(tasktype))
+ {
+ _Task = BaseDal.QueryFirst(x => x.ShuttleCarCode == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.SC_InFinish, TaskOrderBy) ?? BaseDal.QueryFirst(x => TaskOutboundTypes.Contains(x.TaskType) && x.TaskState <= (int)TaskOutStatusEnum.Car_OutFinish, TaskOrderBy);
+ }
+ }
+ if (_Task != null) tasktype = _Task.TaskType;
+ return _Task;
}
/// <summary>
/// 鑾峰彇绉诲簱浠诲姟
@@ -148,11 +161,16 @@
public Dt_Task ShuttleCarRelocationTask(string deviceNo, string currentAddress = "")
{
List<Dt_Task> tasks = null;
+ Dt_Task? task = null;
if (string.IsNullOrEmpty(currentAddress))
- tasks = BaseDal.QueryData(x => x.ShuttleCarCode == deviceNo && (TaskRelocationTypes.Contains(x.TaskType) && (x.TaskState == (int)TaskRelocationStatusEnum.SC_RelocationFinish || x.TaskState == (int)TaskRelocationStatusEnum.RelocationNew)));
+ tasks = BaseDal.QueryData(x => /*x.ShuttleCarCode == deviceNo &&*/ TaskRelocationTypes.Contains(x.TaskType) && x.TaskState == (int)TaskRelocationStatusEnum.RelocationNew).OrderBy(x => x.TaskNum).ToList();
else
- tasks = BaseDal.QueryData(x => x.ShuttleCarCode == deviceNo && x.CurrentAddress == currentAddress && (TaskRelocationTypes.Contains(x.TaskType) && (x.TaskState == (int)TaskRelocationStatusEnum.SC_RelocationFinish || x.TaskState == (int)TaskRelocationStatusEnum.RelocationNew)));
- return tasks.OrderBy(x=>x.TaskNum).First();
+ tasks = BaseDal.QueryData(x => /*x.ShuttleCarCode == deviceNo &&*/ x.CurrentAddress == currentAddress && TaskRelocationTypes.Contains(x.TaskType) && x.TaskState == (int)TaskRelocationStatusEnum.RelocationNew).OrderBy(x => x.TaskNum).ToList();
+ if (tasks != null && tasks.Count > 0)
+ {
+ task = tasks[0];
+ }
+ return task;
}
}
}
--
Gitblit v1.9.3