From 01030b05f7ea9b14878102718a2004b4f908dcfc Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 28 五月 2025 11:15:12 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs | 118 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 67 insertions(+), 51 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 b3d50db..9846deb 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"
@@ -33,9 +33,11 @@
SourceAddress = outTask.TargetAddress,
TargetAddress = cachePoint.PointCode,
SourceKey = outTask.TaskId,
- TaskNum = outTask.TaskNum,
+ TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
TaskStatus = AGVTaskStatusEnum.AGV_New.ObjToInt(),
TaskType = TaskTypeEnum.AGVCarry.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserId > 0 ? App.User.UserName : "System",
};
cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
@@ -51,28 +53,36 @@
/// <returns></returns>
public WebResponseContent CallMateriel(string endPoint)
{
- Dt_CachePoint cachePoint = GetCachePointByEndPoint(endPoint);
-
- Dt_Task task = new Dt_Task()
+ try
{
- CurrentAddress = cachePoint.PointCode,
- Grade = 0,
- NextAddress = endPoint,
- OrderNo = "",
- PalletCode = cachePoint.Remark,
- Roadway = "",
- SourceAddress = cachePoint.PointCode,
- TargetAddress = endPoint,
- SourceKey = 0,
- TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- TaskStatus = AGVTaskStatusEnum.AGV_New.ObjToInt(),
- TaskType = TaskTypeEnum.AGVCarry.ObjToInt(),
- };
- cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+ Dt_CachePoint cachePoint = GetCachePointByEndPoint(endPoint);
- _basicService.CachePointService.Repository.UpdateData(cachePoint);
- Repository.AddData(task);
- return WebResponseContent.Instance.OK();
+ Dt_Task task = new Dt_Task()
+ {
+ CurrentAddress = cachePoint.PointCode,
+ Grade = 0,
+ NextAddress = endPoint,
+ OrderNo = "",
+ PalletCode = cachePoint.Remark,
+ Roadway = "",
+ SourceAddress = cachePoint.PointCode,
+ TargetAddress = endPoint,
+ SourceKey = 0,
+ TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
+ TaskStatus = AGVTaskStatusEnum.AGV_New.ObjToInt(),
+ TaskType = TaskTypeEnum.AGVCarry.ObjToInt(),
+ };
+ cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+
+ _basicService.CachePointService.Repository.UpdateData(cachePoint);
+ Repository.AddData(task);
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+
}
/// <summary>
@@ -82,47 +92,54 @@
/// <returns></returns>
public WebResponseContent MaterielCarry(string startPoint)
{
- Dt_CachePoint cachePoint = GetCachePointByStartPoint(startPoint);
-
- Dt_Task task = new()
+ try
{
- CurrentAddress = startPoint,
- Grade = 0,
- NextAddress = cachePoint.PointCode,
- OrderNo = "",
- PalletCode = startPoint + "-AGV",
- Roadway = "",
- SourceAddress = startPoint,
- TargetAddress = cachePoint.PointCode,
- SourceKey = 0,
- TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- TaskStatus = AGVTaskStatusEnum.AGV_New.ObjToInt(),
- TaskType = TaskTypeEnum.AGVCarry.ObjToInt(),
- };
- cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+ Dt_CachePoint cachePoint = GetCachePointByStartPoint(startPoint);
- _basicService.CachePointService.Repository.UpdateData(cachePoint);
- Repository.AddData(task);
- return WebResponseContent.Instance.OK();
- }
+ Dt_Task task = new()
+ {
+ CurrentAddress = startPoint,
+ Grade = 0,
+ NextAddress = cachePoint.PointCode,
+ OrderNo = "",
+ PalletCode = startPoint + "-AGV",
+ Roadway = "",
+ SourceAddress = startPoint,
+ TargetAddress = cachePoint.PointCode,
+ SourceKey = 0,
+ TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
+ TaskStatus = AGVTaskStatusEnum.AGV_New.ObjToInt(),
+ TaskType = TaskTypeEnum.AGVCarry.ObjToInt(),
+ };
+ cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+
+ _basicService.CachePointService.Repository.UpdateData(cachePoint);
+ Repository.AddData(task);
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+}
private Dt_CachePoint GetCachePointByStartPoint(string startPoint)
{
Dt_AreaRouter areaRouter = _basicService.AreaRouterService.Repository.QueryFirst(x => x.StartArea == startPoint);
if (areaRouter == null)
{
- throw new Exception("鏈壘鍒拌矾鐢变俊鎭�");
+ throw new Exception("鏈壘鍒拌矾鐢变俊鎭�!");
}
Dt_AreaInfo areaInfo = _basicService.AreaInfoService.Repository.QueryFirst(x => x.AreaCode == areaRouter.NextArea);
if (areaInfo == null)
{
- throw new Exception("鏈壘鍒颁笅涓�鍖哄煙淇℃伅");
+ throw new Exception("鏈壘鍒颁笅涓�鍖哄煙淇℃伅!");
}
Dt_CachePoint? cachePoint = _basicService.CachePointService.AssignCachePoint(areaInfo.Id);
if (cachePoint == null)
{
- throw new Exception("鏈壘鍒扮┖闂茬紦瀛樼偣");
+ throw new Exception("鏈壘鍒扮┖闂茬紦瀛樼偣!");
}
return cachePoint;
@@ -133,18 +150,18 @@
Dt_AreaRouter areaRouter = _basicService.AreaRouterService.Repository.QueryFirst(x => x.NextArea == endPoint);
if (areaRouter == null)
{
- throw new Exception("鏈壘鍒拌矾鐢变俊鎭�");
+ throw new Exception("鏈壘鍒拌矾鐢变俊鎭�!");
}
Dt_AreaInfo areaInfo = _basicService.AreaInfoService.Repository.QueryFirst(x => x.AreaCode == areaRouter.StartArea);
if (areaInfo == null)
{
- throw new Exception("鏈壘鍒拌捣鐐圭紦瀛樺尯鍩熶俊鎭�");
+ throw new Exception("鏈壘鍒拌捣鐐圭紦瀛樺尯鍩熶俊鎭�!");
}
Dt_CachePoint? cachePoint = _basicService.CachePointService.GetIbStockCachePoint(areaInfo.Id);
if (cachePoint == null)
{
- throw new Exception("鏈壘鍒版湁璐х紦瀛樼偣");
+ throw new Exception("鏈壘鍒版湁璐х紦瀛樼偣!");
}
return cachePoint;
}
@@ -154,7 +171,7 @@
Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == Convert.ToInt32(model.Task_id));
if (task == null)
{
- return new { code = 404, message = "鏈壘鍒拌浠诲姟" };
+ return new { code = 404, message = "鏈壘鍒拌浠诲姟!" };
}
Dt_CachePoint startCachePoint = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == task.SourceAddress);
@@ -170,8 +187,7 @@
endCachePoint.PointStatus = LocationStatusEnum.InStock.ObjToInt();
_basicService.CachePointService.Repository.UpdateData(endCachePoint);
}
-
- BaseDal.DeleteData(task);
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
return new { code = 200, message = "鎴愬姛" };
}
--
Gitblit v1.9.3