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 | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 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 dee5622..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,10 +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();
@@ -50,12 +51,10 @@
/// </summary>
/// <param name="endPoint"></param>
/// <returns></returns>
- public WebResponseContent CallMateriel(SaveModel saveModel)
+ public WebResponseContent CallMateriel(string endPoint)
{
try
{
- string endPoint = saveModel.MainData["endPoint"].ToString();
-
Dt_CachePoint cachePoint = GetCachePointByEndPoint(endPoint);
Dt_Task task = new Dt_Task()
@@ -91,12 +90,10 @@
/// </summary>
/// <param name="startPoint"></param>
/// <returns></returns>
- public WebResponseContent MaterielCarry(SaveModel saveModel)
+ public WebResponseContent MaterielCarry(string startPoint)
{
try
{
- string startPoint = saveModel.MainData["startPoint"].ToString();
-
Dt_CachePoint cachePoint = GetCachePointByStartPoint(startPoint);
Dt_Task task = new()
@@ -131,18 +128,18 @@
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;
@@ -153,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;
}
@@ -174,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);
@@ -191,7 +188,6 @@
_basicService.CachePointService.Repository.UpdateData(endCachePoint);
}
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- //BaseDal.DeleteData(task);
return new { code = 200, message = "鎴愬姛" };
}
--
Gitblit v1.9.3