From fb79dc54d6484146b74d29bf5644df880fc1fa01 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 19 六月 2025 12:16:54 +0800
Subject: [PATCH] WMS添加AGV任务完成取消
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs | 128 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 114 insertions(+), 14 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
index 15b03e3..2debb9b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
@@ -22,17 +22,26 @@
public WebResponseContent ShelfOutboundCarry(Dt_Task outTask)
{
//鍒ゆ柇鏄惁涓虹數鑺簱锛岃緟鏂欏簱浜哄伐澶勭悊(绔嬪簱鐩爣鍦板潃杞崲鎴怉GV绔欑偣鍦板潃)
- Dt_CachePoint cachePoint = GetCachePointByStartPoint(outTask.TargetAddress);
-
+ Dt_RoadwayInfo dt_RoadwayInfo = _basicService.RoadwayInfoService.Repository.QueryFirst(x => x.OutSCStationCode == outTask.TargetAddress);
+ if (dt_RoadwayInfo == null || dt_RoadwayInfo.AreaId == 11) return WebResponseContent.Instance.OK();
+ Dt_CachePoint startcachePoint = new Dt_CachePoint();
+ Dt_CachePoint cachePoint = GetCachePointByStartPoint(dt_RoadwayInfo.OutStationCode, ref startcachePoint);
+ if (startcachePoint.EnableStatus == EnableStatusEnum.Disable.ObjToInt()) return WebResponseContent.Instance.OK();
+ //if (dt_RoadwayInfo.AreaId == 11)//杈呮枡涓嶇敤AGV鎼繍
+ //{
+ // startcachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+ // _basicService.CachePointService.Repository.UpdateData(startcachePoint);
+ // return WebResponseContent.Instance.OK();
+ //}
Dt_Task task = new()
{
- CurrentAddress = outTask.TargetAddress,
+ CurrentAddress = startcachePoint.PointCode,
Grade = 0,
NextAddress = cachePoint.PointCode,
OrderNo = outTask.OrderNo,
PalletCode = outTask.PalletCode + "-AGV",
Roadway = "",
- SourceAddress = outTask.TargetAddress,
+ SourceAddress = startcachePoint.PointCode,
TargetAddress = cachePoint.PointCode,
SourceKey = outTask.TaskId,
TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
@@ -42,10 +51,68 @@
Creater = App.User.UserId > 0 ? App.User.UserName : "System",
};
cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+ //startcachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
_basicService.CachePointService.Repository.UpdateData(cachePoint);
+ //_basicService.CachePointService.Repository.UpdateData(startcachePoint);
Repository.AddData(task);
+ SendAGVTask(task, cachePoint);
return WebResponseContent.Instance.OK();
+ }
+
+ /// <summary>
+ /// 璐т綅缁戝畾
+ /// </summary>
+ /// <param name="qty"></param>
+ /// <param name="Point"></param>
+ /// <returns></returns>
+ public WebResponseContent Bind(string qty, string point)
+ {
+ try
+ {
+ if (Repository.QueryFirst(x => x.SourceAddress == point &&
+ x.TaskStatus < AGVTaskStatusEnum.DoneFetch.ObjToInt() ||
+ x.TargetAddress == point) != null)
+ throw new Exception($"绔欑偣銆恵point}銆戝瓨鍦ㄤ换鍔★紒");
+ Dt_CachePoint? cachePoint = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == point);
+ if (cachePoint == null) throw new Exception("鏈壘鍒扮紦瀛樼偣!");
+ if (cachePoint.AreaId != 4) throw new Exception("褰撳墠缂撳瓨鐐瑰尯鍩熸棤缁戝畾鏉冮檺!");
+ cachePoint.PointStatus = LocationStatusEnum.InStock.ObjToInt();
+ cachePoint.Remark = qty;
+ cachePoint.Modifier = App.User.UserName;
+ _basicService.CachePointService.Repository.UpdateData(cachePoint);
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 閲婃斁缂撳瓨鐐�
+ /// </summary>
+ /// <param name="point"></param>
+ /// <returns></returns>
+ public WebResponseContent AcrossFloorCallMat(string point)
+ {
+ try
+ {
+ if (Repository.QueryFirst(x => x.SourceAddress == point &&
+ x.TaskStatus < AGVTaskStatusEnum.DoneFetch.ObjToInt() ||
+ x.TargetAddress == point) != null)
+ throw new Exception($"绔欑偣銆恵point}銆戝瓨鍦ㄤ换鍔★紒");
+ Dt_CachePoint? cachePoint = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == point);
+ if (cachePoint == null) throw new Exception("鏈壘鍒扮紦瀛樼偣!");
+ if (cachePoint.AreaId != 2 && cachePoint.AreaId != 5 && cachePoint.AreaId != 8)
+ throw new Exception("褰撳墠缂撳瓨鐐瑰尯鍩熸棤閲婃斁鏉冮檺!");
+ cachePoint.PointStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicService.CachePointService.Repository.UpdateData(cachePoint);
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
}
/// <summary>
@@ -57,6 +124,11 @@
{
try
{
+ if (Repository.QueryFirst(x => x.SourceAddress == endPoint &&
+ x.TaskStatus < AGVTaskStatusEnum.DoneFetch.ObjToInt() ||
+ x.TargetAddress == endPoint) != null)
+ throw new Exception($"绔欑偣銆恵endPoint}銆戝瓨鍦ㄤ换鍔★紒");
+
Dt_CachePoint cachePoint = GetCachePointByEndPoint(endPoint);
Dt_Task task = new Dt_Task()
@@ -78,7 +150,7 @@
Db.Ado.BeginTran();
var response = SendAGVTask(task, cachePoint);
- if (response.Status)
+ if (!response.Status)
{
_unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error($"{response.Message}");
@@ -105,7 +177,12 @@
{
try
{
- Dt_CachePoint cachePoint = GetCachePointByStartPoint(startPoint);
+ if (Repository.QueryFirst(x => x.SourceAddress == startPoint &&
+ x.TaskStatus < AGVTaskStatusEnum.DoneFetch.ObjToInt() ||
+ x.TargetAddress == startPoint) != null)
+ throw new Exception($"绔欑偣銆恵startPoint}銆戝瓨鍦ㄤ换鍔★紒");
+ Dt_CachePoint startcachePoint = new Dt_CachePoint();
+ Dt_CachePoint cachePoint = GetCachePointByStartPoint(startPoint, ref startcachePoint);
Dt_Task task = new()
{
@@ -124,12 +201,21 @@
};
cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+ Db.Ado.BeginTran();
+ var response = SendAGVTask(task, cachePoint);
+ if (!response.Status)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error($"{response.Message}");
+ }
_basicService.CachePointService.Repository.UpdateData(cachePoint);
Repository.AddData(task);
+ Db.Ado.CommitTran();
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
+ Db.Ado.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -139,12 +225,12 @@
/// <param name="startPoint"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
- private Dt_CachePoint GetCachePointByStartPoint(string startPoint)
+ private Dt_CachePoint GetCachePointByStartPoint(string startPoint, ref Dt_CachePoint startcachePoint)
{
#region MyRegion
Dt_CachePoint? StartcachePoint = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == startPoint);
if (StartcachePoint == null) throw new Exception("鏈壘鍒扮紦瀛樼偣!");
-
+ startcachePoint = StartcachePoint;
Dt_AreaRouter areaRouter = _basicService.AreaRouterService.Repository.QueryFirst(x => x.StartArea == StartcachePoint.AreaId.ToString());
if (areaRouter == null) throw new Exception("鏈壘鍒拌矾鐢变俊鎭�!");
@@ -219,6 +305,8 @@
{
return new { code = 404, message = "鏈壘鍒拌浠诲姟!" };
}
+ if (task.TaskStatus == ((AGVTaskStatusEnum)Enum.Parse(typeof(AGVTaskStatusEnum), model.Task_status)).ObjToInt())
+ return new { code = 200, message = "鎴愬姛" };
switch ((AGVTaskStatusEnum)Enum.Parse(typeof(AGVTaskStatusEnum), model.Task_status))
{
case AGVTaskStatusEnum.Create:
@@ -242,6 +330,10 @@
if (qty > 0) startCachePoint.PointStatus = LocationStatusEnum.InStock.ObjToInt();
startCachePoint.Remark = qty.ToString();
}
+ //else if (startCachePoint.AreaId == 1)
+ //{
+ // startCachePoint.PointStatus = LocationStatusEnum.PalletLock.ObjToInt();
+ //}
_basicService.CachePointService.Repository.UpdateData(startCachePoint);
}
}
@@ -264,17 +356,25 @@
return new { code = 200, message = "鎴愬姛" };
}
case AGVTaskStatusEnum.Cancel:
+ case AGVTaskStatusEnum.Terminate:
+ case AGVTaskStatusEnum.Error:
{
+ if (task.TaskStatus < AGVTaskStatusEnum.DoneFetch.ObjToInt())
+ {
+ Dt_CachePoint startCachePoint = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == task.SourceAddress);
+ startCachePoint.PointStatus = LocationStatusEnum.InStock.ObjToInt();
+ _basicService.CachePointService.Repository.UpdateData(startCachePoint);
+ }
task.TaskStatus = AGVTaskStatusEnum.Cancel.ObjToInt();
BaseDal.DeleteAndMoveIntoHty(task, OperateType.鑷姩鍒犻櫎);
return new { code = 200, message = "鎴愬姛" };
}
- case AGVTaskStatusEnum.Terminate:
- task.TaskStatus = AGVTaskStatusEnum.Terminate.ObjToInt();
- break;
- case AGVTaskStatusEnum.Error:
- task.TaskStatus = AGVTaskStatusEnum.Error.ObjToInt();
- break;
+ //case AGVTaskStatusEnum.Terminate:
+ // task.TaskStatus = AGVTaskStatusEnum.Terminate.ObjToInt();
+ // break;
+ //case AGVTaskStatusEnum.Error:
+ // task.TaskStatus = AGVTaskStatusEnum.Error.ObjToInt();
+ // break;
default:
return new { code = 404, message = "鏈畾涔変换鍔＄被鍨�!" };
}
--
Gitblit v1.9.3