From 1caea0fdc7ed1788d854a2aba8853984b4494e01 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期二, 24 六月 2025 09:56:28 +0800
Subject: [PATCH] 代码提交
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 149 +++++++++++++++++--------------------------------
1 files changed, 52 insertions(+), 97 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 42033f8..48b89a1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -124,46 +124,6 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
- public WebResponseContent InboundTaskCompleted(Dt_Task task)
- {
- try
- {
- _unitOfWorkManage.BeginTran();
- decimal beforeQuantity = 0;
-
- Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
-
- Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
-
- CheckCompleted(stockInfo, locationInfo);
-
- stockInfo.LocationCode = locationInfo.LocationCode;
- stockInfo.StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt();
- _stockService.StockInfoService.Repository.UpdateData(stockInfo);
-
- beforeQuantity = stockInfo.Details.Where(x => x.Id != 0).Sum(x => x.StockQuantity);
-
- int beforeStatus = locationInfo.LocationStatus;
- locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
- _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Inbound.ObjToInt(), false);
-
- _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
- task.TaskStatus = InTaskStatusEnum.InFinish.ObjToInt();
-
- BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
-
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Inbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
- _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) + beforeQuantity, StockChangeType.Inbound, task.TaskNum);
- _unitOfWorkManage.CommitTran();
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
-
- }
/// <summary>
/// 绌烘墭鐩樺叆搴撳畬鎴愬鐞�
@@ -291,56 +251,34 @@
WriteLog.GetLog("浠诲姟瀹屾垚").Write($"鎿嶄綔浜猴細{(App.User.UserId > 0 ? App.User.UserName : "System")}{Environment.NewLine}浠诲姟鍙凤細{taskNum}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "浠诲姟瀹屾垚");
}
}
- public WebResponseContent TaskCancel(int taskNum)
+ public WebResponseContent TaskCancel(string taskNum)
{
WebResponseContent content = new WebResponseContent();
try
{
- Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum && (x.TaskStatus == AGVTaskStatusEnum.AGV_Wait.ObjToInt() || x.TaskStatus == AGVTaskStatusEnum.AGV_Query.ObjToInt()));
- if (task == null)
+ var tasknums = taskNum.Split(',');
+ foreach (var item in tasknums)
{
- return content = WebResponseContent.Instance.Error("鏈壘鍒颁换鍔′俊鎭垨浠诲姟鐘舵�佷笉鍖归厤");
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == item.ObjToInt() && (x.TaskStatus == AGVTaskStatusEnum.AGV_Wait.ObjToInt() || x.TaskStatus == AGVTaskStatusEnum.AGV_Query.ObjToInt()));
+ if (task == null)
+ {
+ return content = WebResponseContent.Instance.Error("鏈壘鍒颁换鍔′俊鎭垨浠诲姟鐘舵�佷笉鍖归厤");
+ }
+ //_unitOfWorkManage.BeginTran();
+ int TaskStatus = AGVTaskStatusEnum.AGV_ManuallyCancel.ObjToInt();
+ _taskHtyService.AddTaskHty(task, TaskStatus);
+ Dt_CachePoint source = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == task.SourceAddress);
+ Dt_CachePoint target = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == task.TargetAddress);
+ var toaddress = JsonConvert.SerializeObject(target);
+ if (target != null && source != null)
+ {
+ source.PointStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicService.CachePointService.Repository.UpdateData(source);
+ target.PointStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicService.CachePointService.Repository.UpdateData(target);
+ }
+ BaseDal.DeleteData(task);
}
- //_unitOfWorkManage.BeginTran();
- int TaskStatus = AGVTaskStatusEnum.AGV_ManuallyCancel.ObjToInt();
- _taskHtyService.AddTaskHty(task, TaskStatus);
- Dt_CachePoint source = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == task.SourceAddress);
- Dt_CachePoint target = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == task.TargetAddress);
- var toaddress = JsonConvert.SerializeObject(target);
- if (target != null && source != null)
- {
- source.PointStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.CachePointService.Repository.UpdateData(source);
- target.PointStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.CachePointService.Repository.UpdateData(target);
- }
- BaseDal.DeleteData(task);
- #region
- //MethodInfo? methodInfo = GetType().GetMethod(((TaskTypeEnum)task.TaskType) + "TaskCancel");
- //if (methodInfo != null)
- //{
- // WebResponseContent? responseContent = (WebResponseContent?)methodInfo.Invoke(this, new object[] { task });
- // if (responseContent != null)
- // {
- // if (responseContent != null)
- // {
- // if (App.User.UserId > 0)
- // {
- // var response = HttpHelper.Post<WebResponseContent>(url + "TaskCancel?taskNum=" + task.TaskNum, "", "浠诲姟鍙栨秷");
- // if (!response.Status)
- // {
- // _unitOfWorkManage.RollbackTran();
- // return content = WebResponseContent.Instance.Error(response.Message);
- // }
- // _unitOfWorkManage.CommitTran();
- // return content = responseContent;
- // }
- // _unitOfWorkManage.CommitTran();
- // return content = responseContent;
- // }
- // }
- //}
- #endregion
return content = WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -447,25 +385,42 @@
Dt_CachePoint source = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == task.SourceAddress);
Dt_CachePoint target = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == task.TargetAddress);
var toaddress = JsonConvert.SerializeObject(target);
- if (target != null && source != null)
+ if (!source.PointCode.Contains("鍘熸潗鏂欏簱"))
{
- if (toaddress.Contains("鎴愬搧搴�"))
+ if (target != null && source != null)
{
- source.PointStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.CachePointService.Repository.UpdateData(source);
- target.PointStatus = LocationStatusEnum.InStock.ObjToInt();
- _basicService.CachePointService.Repository.UpdateData(target);
+ if (toaddress.Contains("鎴愬搧搴�"))
+ {
+ source.PointStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicService.CachePointService.Repository.UpdateData(source);
+ target.PointStatus = LocationStatusEnum.InStock.ObjToInt();
+ _basicService.CachePointService.Repository.UpdateData(target);
+ }
+ else
+ {
+ source.PointStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicService.CachePointService.Repository.UpdateData(source);
+ //target.PointStatus = LocationStatusEnum.Free.ObjToInt();
+ //_basicService.CachePointService.Repository.UpdateData(target);
+ }
}
- else
- {
- source.PointStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.CachePointService.Repository.UpdateData(source);
- //target.PointStatus = LocationStatusEnum.Free.ObjToInt();
- //_basicService.CachePointService.Repository.UpdateData(target);
- }
+ }
+
+ return content;
+ }
+
+ public WebResponseContent HCJCope(Dt_Task task, int TaskStatus)
+ {
+ WebResponseContent content = new WebResponseContent();
+ Dt_CachePoint source = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == task.SourceAddress);
+ if (source != null && source.PointCode.Contains("鍘熸潗鏂欏簱"))
+ {
+ source.PointStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicService.CachePointService.Repository.UpdateData(source);
}
return content;
}
+
public WebResponseContent CacheStatus(SaveModel saveModel)
{
WebResponseContent response = new WebResponseContent();
--
Gitblit v1.9.3