From 7d173d42cba04b4243f13c6ce013b04e1be4dc95 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 07 三月 2025 16:59:34 +0800
Subject: [PATCH] 成品输送线
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index ebdb88a..5be0087 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -16,6 +16,7 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
using AutoMapper;
+using HslCommunication.Enthernet;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
@@ -65,6 +66,7 @@
private Dictionary<string, OrderByType> _taskOrderBy = new()
{
{nameof(Dt_Task.Grade),OrderByType.Desc },
+ {nameof(Dt_Task.TaskNum),OrderByType.Asc},
{nameof(Dt_Task.CreateDate),OrderByType.Asc},
};
@@ -169,6 +171,14 @@
if (taskTypeGroup == TaskTypeGroup.InboundGroup)
{
stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == item.SourceAddress || x.StationDeviceCode == item.SourceAddress);
+ if (stationManger==null && task.TaskType==TaskTypeEnum.InProduct.ObjToInt())
+ {
+ stationManger = _stationMangerRepository.QueryFirst(x => x.StackerCraneCode==task.SourceAddress);
+ //杞崲鎴愬搧浠撹捣鐐圭珯鍙�
+ item.SourceAddress = stationManger.StationCode;
+ task.CurrentAddress = stationManger.StationCode;
+ task.SourceAddress = stationManger.StationCode;
+ }
}
else
{
@@ -198,18 +208,34 @@
task.NextAddress = router.NextPosi;
task.DeviceCode = router.ChildPosi;
}
- else if (item.TaskType == TaskTypeEnum.MesOutbound.ObjToInt() || item.TaskType == TaskTypeEnum.MesHandOutbound.ObjToInt() || item.TaskType == TaskTypeEnum.MesHandPickOutbound.ObjToInt())
+ else if (item.TaskType == TaskTypeEnum.MesPalletReturn.ObjToInt() && router.IsEnd)
{
task.NextAddress = router.NextPosi;
+ task.DeviceCode = router.ChildPosi;
+ }
+ else if (item.TaskType == TaskTypeEnum.MesOutbound.ObjToInt() || item.TaskType == TaskTypeEnum.MesHandOutbound.ObjToInt() || item.TaskType == TaskTypeEnum.MesHandPickOutbound.ObjToInt() || (item.TaskType == TaskTypeEnum.OutAllocate.ObjToInt() && item.RoadWay.Contains("BC")))
+ {
+ task.NextAddress = router.NextPosi;
+ task.DeviceCode = stationManger.StackerCraneCode;
+ task.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();
+ }
+ else if (item.TaskType == TaskTypeEnum.MesOutbound.ObjToInt() && item.RoadWay.Contains("ZH"))
+ {
+ task.NextAddress = stationManger.StackerCraneStationCode;
task.DeviceCode = stationManger.StackerCraneCode;
task.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();
}
else
{
task.NextAddress = taskTypeGroup == TaskTypeGroup.InboundGroup ? task.TargetAddress : router.NextPosi;
- if (item.RoadWay.Contains("AGV"))
+ if (item.RoadWay.Contains("AGV_FL"))
{
task.DeviceCode = item.RoadWay;
+ task.AgvTaskNum = task.DeviceCode + DateTime.Now.ToString("yyyyMMdd") + item.TaskNum;
+ }
+ else if(item.RoadWay.Contains("AGV_FL"))
+ {
+ task.DeviceCode = stationManger.StationDeviceCode;
task.AgvTaskNum = task.DeviceCode + DateTime.Now.ToString("yyyyMMdd") + item.TaskNum;
}
else
@@ -244,7 +270,6 @@
return WebResponseContent.Instance.Error($"鏈壘鍒拌矾鐢遍厤缃俊鎭�");
}
router = routers.FirstOrDefault();
-
task.NextAddress = router?.StartPosi ?? "";
task.DeviceCode = item.RoadWay;
task.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();
@@ -258,8 +283,7 @@
return WebResponseContent.Instance.Error($"鏈壘鍒拌矾鐢遍厤缃俊鎭�");
}
router = routers.FirstOrDefault();
- string stationCode = router?.NextPosi ?? "";
- Dt_StationManger? stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == stationCode);
+ Dt_StationManger? stationManger = _stationMangerRepository.QueryData(x => true).FirstOrDefault(x=>x.StationCode== router?.NextPosi);
if (stationManger == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒扮珯鍙伴厤缃俊鎭�");
@@ -813,5 +837,12 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+ /// <summary>
+ /// //鍒ゆ柇绉诲簱璐т綅浠诲姟鏄惁宸插瓨鍦紝濡傚瓨鍦ㄥ厛鎵ц
+ /// </summary>
+ public Dt_Task QueryStackerExistTask(string PalletCode, string locationCode)
+ {
+ return BaseDal.QueryFirst(x => x.PalletCode == PalletCode && x.SourceAddress == locationCode && x.TaskState == (int)TaskStatusEnum.SC_Execute);
+ }
}
}
--
Gitblit v1.9.3