From c38154df95a2c2fa1bd32c45f6be9c0d98e37440 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 29 四月 2025 10:52:14 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 101 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 93 insertions(+), 8 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 c5ab563..5877ad4 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"
@@ -137,7 +137,53 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+ public WebResponseContent AgvCarrying(int row,int startColumn, int endColumn, int startlayer,int targetLayer)
+ {
+ try
+ {
+ List<Dt_Task> tasks = new List<Dt_Task>();
+ for (int i = startColumn; i <= endColumn; i++)
+ {
+ string column = i.ToString();
+ if (i<10)
+ {
+ column = "0" + i.ToString();
+ }
+ string layer = targetLayer.ToString();
+ if (targetLayer<10)
+ {
+ layer = "0"+targetLayer.ToString();
+ }
+ Dt_Task task = new Dt_Task()
+ {
+ WarehouseId = 7,
+ TaskNum = DateTime.Now.ToString("yyMMddHHmm").ObjToInt() + i,
+ PalletCode= DateTime.Now.ToString("yyMMddHHmm") +i,
+ PalletType=0,
+ DeviceCode="AGV_CP",
+ Roadway= "AGV_CP",
+ TaskType =999,
+ SourceAddress=string.Format($"AGV_CP-00{row}-0{column}-00{startlayer}-01"),
+ CurrentAddress=string.Format($"AGV_CP-00{row}-0{column}-00{startlayer}-01"),
+ TargetAddress= string.Format($"AGV_CP-00{row}-0{column}-00{layer}-01"),
+ NextAddress= string.Format($"AGV_CP-00{row}-0{column}-00{layer}-01"),
+ Grade=0,
+ WMSId=0,
+ AgvTaskNum = "CP" + DateTime.Now.ToString("yyMMddHHmm").ObjToInt() + i,
+ TaskState = TaskStatusEnum.New.ObjToInt(),
+ Remark= "娴嬭瘯绌烘"
+ };
+ tasks.Add(task);
+ }
+ BaseDal.AddData(tasks);
+ return WebResponseContent.Instance.OK("");
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
/// <summary>
/// 鎺ユ敹WMS浠诲姟淇℃伅
/// </summary>
@@ -208,7 +254,7 @@
task.NextAddress = router.NextPosi;
task.DeviceCode = router.ChildPosi;
}
- else if (item.TaskType == TaskTypeEnum.MesPalletReturn.ObjToInt() && router.IsEnd)
+ else if ((item.TaskType == TaskTypeEnum.MesPalletLargeReturn.ObjToInt() || item.TaskType == TaskTypeEnum.MesPalletSmallReturn.ObjToInt()) && router.IsEnd)
{
task.NextAddress = router.NextPosi;
task.DeviceCode = router.ChildPosi;
@@ -236,7 +282,7 @@
else if(item.RoadWay.Contains("AGV_CP") && taskTypeGroup == TaskTypeGroup.InboundGroup)
{
task.DeviceCode = stationManger.StationDeviceCode;
- task.AgvTaskNum = task.DeviceCode + DateTime.Now.ToString("yyyyMMdd") + item.TaskNum;
+ task.AgvTaskNum = task.Roadway + DateTime.Now.ToString("yyyyMMdd") + item.TaskNum;
}
else
{
@@ -246,16 +292,33 @@
}
else
{
- List<Dt_Router> dt_Routers = _routerService.QueryNextRoutes(item.SourceAddress, item.RoadWay, item.TaskType);
- if (dt_Routers != null && dt_Routers.Count > 0)
+ if (item.RoadWay=="AGV_CP")
{
- task.NextAddress = dt_Routers.FirstOrDefault().NextPosi;
- task.DeviceCode = dt_Routers.FirstOrDefault().ChildPosi;
+ Dt_Router routerSelect = _routerRepository.QueryFirst(x => x.InOutType == item.TaskType && item.RoadWay == x.StartPosi && x.NextPosi==item.TargetAddress);
+ if (routerSelect != null)
+ {
+ task.NextAddress = routerSelect.NextPosi;
+ task.DeviceCode = routerSelect.ChildPosi;
+ task.AgvTaskNum = item.RoadWay + DateTime.Now.ToString("yyyyMMdd") + item.TaskNum;
+ }
+ else
+ {
+ return content.Error("鏈壘鍒拌矾鐢变俊鎭�");
+ }
}
else
{
- task.NextAddress = "";
- task.DeviceCode = "";
+ List<Dt_Router> dt_Routers = _routerService.QueryNextRoutes(item.SourceAddress, item.RoadWay, item.TaskType);
+ if (dt_Routers != null && dt_Routers.Count > 0)
+ {
+ task.NextAddress = dt_Routers.FirstOrDefault().NextPosi;
+ task.DeviceCode = dt_Routers.FirstOrDefault().ChildPosi;
+ }
+ else
+ {
+ task.NextAddress = "";
+ task.DeviceCode = "";
+ }
}
}
}
@@ -844,5 +907,27 @@
{
return BaseDal.QueryFirst(x => x.PalletCode == PalletCode && x.SourceAddress == locationCode && (x.TaskState == (int)TaskStatusEnum.SC_Execute || x.TaskState == (int)TaskStatusEnum.SC_Executing));
}
+ /// <summary>
+ /// 鎺ュ彈WMS鎵嬪姩瀹屾垚浠诲姟
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ public WebResponseContent RecWMSTaskCompleted(int taskNum)
+ {
+ try
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task != null)
+ {
+ task.TaskState = TaskStatusEnum.Finish.ObjToInt();
+ BaseDal.DeleteAndMoveIntoHty(task, OperateTypeEnum.浜哄伐瀹屾垚);
+ }
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
}
}
--
Gitblit v1.9.3