From 83f3c63f1cae6224320a8d19251e3bc0404da096 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期五, 26 九月 2025 14:54:44 +0800
Subject: [PATCH] 出入库
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 176 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 139 insertions(+), 37 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 801ae07..2a16ee5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -17,6 +17,7 @@
using Autofac.Core;
using AutoMapper;
+using HslCommunication;
using Magicodes.ExporterAndImporter.Core;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
@@ -73,6 +74,7 @@
private readonly ITask_HtyService _task_HtyService;
private readonly IMapper _mapper;
private readonly IEquipmentStatusService _equipmentStatus;
+ private readonly IAgvStationService _gvStationService;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -87,7 +89,7 @@
public List<int> TaskOutboundTypes => typeof(TaskOutboundTypeEnum).GetEnumIndexList();
- public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, IRouterRepository routerRepository, IEquipmentStatusService equipmentStatus) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, IRouterRepository routerRepository, IEquipmentStatusService equipmentStatus, IAgvStationService agvStationService) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -96,6 +98,7 @@
_mapper = mapper;
_routerRepository = routerRepository;
_equipmentStatus = equipmentStatus;
+ _gvStationService = agvStationService;
}
/// <summary>
@@ -162,26 +165,23 @@
else if (item.type == 2) //鍑哄簱
{
string roadway = "";
- string CurrentAddress = "";
switch (item.startAddress)
{
case "1":
roadway = "RGV110";
- CurrentAddress = "1101";
break;
case "2":
roadway = "RGV112";
- CurrentAddress = "1121";
break;
case "3":
roadway = "RGV114";
- CurrentAddress = "1141";
break;
case "4":
roadway = "RGV115";
- CurrentAddress = "1151";
break;
}
+
+ AGVStation gVStation = _gvStationService.Corridorequipment(roadway);
Dt_Task dt_Task = new Dt_Task();
dt_Task.TaskNum = item.taskNo;
@@ -192,9 +192,9 @@
dt_Task.RGVCurrentexecution = "0"; //鐩墠鏆傛棤
dt_Task.TaskState = (int)TaskOutStatusEnum.OutNew; //鐩墠鏆傛棤
dt_Task.SourceAddress = item.startAddress;
- dt_Task.TargetAddress = "";
- dt_Task.CurrentAddress = CurrentAddress;
- dt_Task.NextAddress = "0"; //鐩墠鏆傛棤
+ dt_Task.TargetAddress ="0";
+ dt_Task.CurrentAddress = gVStation.Motherinlaw.ToString();
+ dt_Task.NextAddress = gVStation.ZicheMotherinlaw.ToString(); //鐩墠鏆傛棤
dt_Task.Grade = item.priority;
dt_Task.WMSId = 0; //鐩墠鏆傛棤
BaseDal.AddData(dt_Task);
@@ -230,6 +230,68 @@
return BaseDal.QueryFirst(x => x.Roadway == DeviceCode, TaskOrderBy);
}
+ public Dt_Task ChildVehicleMission(AGVStation aGVStation)
+ {
+ Dt_Task dt_Tasks =BaseDal.QueryFirst(x => x.Roadway == aGVStation.ChildPosiDeviceCode && x.CurrentAddress== aGVStation.MotherCarDeviceCode.ToString() && x.RGVTaskType== (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ if(dt_Tasks !=null) return dt_Tasks;
+ Dt_Task dt_Tasks2 = BaseDal.QueryFirst(x => x.Roadway == aGVStation.ChildPosiDeviceCode && x.CurrentAddress == aGVStation.MotherCardeputy.ToString() && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ if (dt_Tasks2 != null) return dt_Tasks2;
+ Dt_Task dt_Tasks3 = BaseDal.QueryFirst(x => x.Roadway == aGVStation.ChildPosiDeviceCode && x.CurrentAddress == aGVStation.HCJStorageaddress.ToString() && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ if (dt_Tasks3 != null) return dt_Tasks3;
+ return null;
+ }
+ public Dt_Task GetFinhuoTask(string DeviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing, TaskOrderBy);
+ }
+
+ public Dt_Task GetOutkouFinhuoTask(string DeviceCode,string curraderr,int type)
+ {
+ if (type == 1)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheReleaseFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp && x.CurrentAddress == curraderr, TaskOrderBy);
+ }
+ else
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskOutStatusEnum.RGV_OutPickupFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing && x.NextAddress !="", TaskOrderBy);
+ }
+ }
+
+ public Dt_Task GetInkouFinhuoTask(string DeviceCode,int type)
+ {
+ if (type == 1)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InNew && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ }
+ else
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InPickupFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing, TaskOrderBy);
+ }
+ }
+
+ public Dt_Task GetInzicheTask(string DeviceCode, int type)
+ {
+ if (type == 1)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InReleaseFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ }
+ else
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InZicheFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing, TaskOrderBy);
+ }
+ }
+ public Dt_Task GetInzicheTaskMobile(string DeviceCode, int type)
+ {
+ if (type == 1) //1涓哄瓙杞︾Щ鍔ㄤ换鍔� 2涓烘瘝杞︾Щ鍔ㄤ换鍔�
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly, TaskOrderBy);
+ }
+ else
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InZichemoveFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly, TaskOrderBy);
+ }
+ }
+
public WebResponseContent UpdateRGVTasktype(int taskNum, int RGVTasktype)
{
WebResponseContent content = new WebResponseContent();
@@ -256,8 +318,6 @@
}
task.RGVTaskType = RGvtype;
bool updatesta = BaseDal.UpdateData(task);
- string Meesgt = $"鐩爣鍦板潃锛歿task.CurrentAddress},浠诲姟绫诲瀷锛歿rwlx}锛屼慨鏀圭姸鎬侊細{updatesta}";
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, Meesgt);
content = WebResponseContent.Instance.OK();
}
@@ -294,7 +354,7 @@
task.ExceptionMessage = message;
task.ModifyDate = DateTime.Now;
BaseDal.UpdateData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, task.ExceptionMessage);
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "鏇存柊浠诲姟寮傚父锛�"+task.ExceptionMessage);
content = WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -352,7 +412,14 @@
task.Modifier = "System";
BaseDal.UpdateData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldState}銆戣烦杞埌銆恵task.TaskState}銆�" : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldState}銆戣浆鍒般�恵task.TaskState}銆�");
+ string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //鍓嶄竴涓姸鎬�
+ string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //鍚庝竴涓姸鎬�
+
+ string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //鍚庝竴涓姸鎬�
+
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ?
+ $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣烦杞埌銆恵afterstaterem}銆�"
+ : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣浆鍒般�恵afterstaterem}銆�");
content = WebResponseContent.Instance.OK();
}
@@ -402,7 +469,9 @@
BaseDal.UpdateData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"浜哄伐鎭㈠鎸傝捣浠诲姟,鎭㈠鎸傝捣鏃朵换鍔＄姸鎬併�恵task.TaskState}銆�");
+ string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //鍚庝竴涓姸鎬�
+
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"浜哄伐鎭㈠鎸傝捣浠诲姟,鎭㈠鎸傝捣鏃朵换鍔＄姸鎬併�恵afterstaterem}銆�");
content = WebResponseContent.Instance.OK();
}
@@ -427,7 +496,20 @@
if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
int oldState = task.TaskState;
- Dt_TaskExecuteDetail taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ Dt_TaskExecuteDetail taskExecuteDetail = null;
+
+ if (task.CurrentAddress == "1061")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState > task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+ else
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+
+ }
+
+
+
if (taskExecuteDetail != null)
{
task.TaskState = taskExecuteDetail.TaskState;
@@ -443,7 +525,13 @@
BaseDal.UpdateData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"浜哄伐灏嗕换鍔＄姸鎬佷粠銆恵oldState}銆戝洖婊氬埌銆恵task.TaskState}銆�");
+ string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //鍓嶄竴涓姸鎬�
+ string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //鍚庝竴涓姸鎬�
+
+ string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //鍚庝竴涓姸鎬�
+
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId,
+ $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldstaterem}銆戝洖褰掑埌銆恵afterstaterem}銆�");
content = WebResponseContent.Instance.OK();
}
@@ -515,7 +603,7 @@
/// </summary>
/// <param name="taskNum">浠诲姟缂栧彿</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
- public WebResponseContent UpdateTaskStatus(int taskNum)
+ public WebResponseContent UpdateTaskStatus(int taskNum, int Completetype)
{
WebResponseContent content = new WebResponseContent();
@@ -543,10 +631,19 @@
task.ExceptionMessage = string.Empty;
BaseDal.UpdateData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(
- task.TaskId,
- $"鑷姩浠诲姟鐘舵�佷粠銆恵oldState}銆戣繘鍏ュ埌銆恵task.TaskState}銆�"
- );
+ string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //鍓嶄竴涓姸鎬�
+ string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //鍚庝竴涓姸鎬�
+
+ string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //鍚庝竴涓姸鎬�
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ?
+ $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣烦杞埌銆恵afterstaterem}銆�"
+ : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣浆鍒般�恵afterstaterem}銆�");
+
+
+ if (task.TaskState == (int)TaskInStatusEnum.RGV_InMothercarFinish && Completetype==2) //鍏ュ簱浠诲姟瀹屾垚
+ {
+ CompletedManually(task.TaskId, Completetype);
+ }
return WebResponseContent.Instance.OK();
}
@@ -1075,7 +1172,13 @@
/// <param name="ids"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
- public WebResponseContent CompletedManually(int id)
+ /// <summary>
+ /// 浜哄伐鎵嬪姩瀹屾垚
+ /// </summary>
+ /// <param name="ids"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+ public WebResponseContent CompletedManually(int id, int CompletionType)
{
var db = BaseDal.Db as SqlSugarClient;
@@ -1087,6 +1190,8 @@
Dt_Task dt_task = BaseDal.QueryData().Where(x => x.TaskId == id).FirstOrDefault();
if (dt_task == null) return WebResponseContent.Instance.Error($"鏈煡璇㈠埌浠诲姟");
+ string Remark = CompletionType == 1 ? "浜哄伐鎵嬪姩瀹屾垚" : "鑷姩瀹屾垚";
+
var res = _task_HtyService.AddData(new Dt_Task_hty
{
@@ -1101,38 +1206,33 @@
NextAddress = dt_task.NextAddress,
WMSId = dt_task.WMSId,
Dispatchertime = dt_task.Dispatchertime,
- Remark = "浜哄伐鎵嬪姩瀹屾垚",
+ Remark = Remark,
Creater = App.User.UserName,
CreateDate = DateTime.Now,
RGVTaskType = dt_task.RGVTaskType,
RGVCurrentexecution = dt_task.RGVCurrentexecution
});
- int oldState = dt_task.TaskState;
- _taskExecuteDetailService.AddTaskExecuteDetail(
- dt_task.TaskId,
- $"鑷姩浠诲姟鐘舵�佷粠銆恵oldState}銆戣繘鍏ュ埌銆恵dt_task.TaskState}銆�"
-);
-
if (res.Status == false)
{
db.Ado.RollbackTran();
- return WebResponseContent.Instance.Error("鎵嬪姩瀹屾垚澶辫触锛�");
+ return WebResponseContent.Instance.Error($"{Remark}澶辫触锛�");
}
var deletetask = BaseDal.DeleteData(dt_task);
- if (deletetask == false) {
+ if (deletetask == false)
+ {
db.Ado.RollbackTran();
- return WebResponseContent.Instance.Error("鍒犻櫎浠诲姟澶辫触鎵�鏈夋搷浣滃洖婊氾紒");
+ return WebResponseContent.Instance.Error("鍒犻櫎浠诲姟澶辫触鎵�鏈夋搷浣滃洖婊氾紒");
}
db.Ado.CommitTran();
- return WebResponseContent.Instance.OK("鎵嬪姩瀹屾垚鎴愬姛锛�");
+ return WebResponseContent.Instance.OK($"{Remark}鎴愬姛锛�");
}
catch (Exception ex)
{
db.Ado.RollbackTran();
- return WebResponseContent.Instance.Error("鎵嬪姩瀹屾垚澶辫触锛�");
+ return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触锛�");
}
}
@@ -1186,11 +1286,11 @@
db.Ado.RollbackTran();
return WebResponseContent.Instance.Error("鍙栨秷浠诲姟澶辫触锛�");
}
- int oldState = dt_task.TaskState;
+ /*int oldState = dt_task.TaskState;
_taskExecuteDetailService.AddTaskExecuteDetail(
dt_task.TaskId,
$"鑷姩浠诲姟鐘舵�佷粠銆恵oldState}銆戣繘鍏ュ埌銆恵dt_Task_Hty.TaskState}銆�"
-);
+);*/
bool deletetask = BaseDal.DeleteData(dt_task);
if (!deletetask) {
@@ -1258,8 +1358,10 @@
case (int)TaskOutStatusEnum.RGV_OutReleaseExecuting:
//鍑哄簱鐘舵��
//璋冨彇瀹屾垚鎺ュ彛
- responseContent = UpdateTaskStatus(task.TaskNum);
+ responseContent = UpdateTaskStatus(task.TaskNum, 1);
break;
+ case (int)TaskInStatusEnum.RGV_InMothercarFinish:
+ return WebResponseContent.Instance.Error("浠诲姟宸�");
default:
return WebResponseContent.Instance.Error("浠诲姟鐘舵�侀敊璇紝鎵ц涓嬩竴姝ュけ璐�");
}
--
Gitblit v1.9.3