From dfb67ae65d678da26d0fa880efa185591d6ff970 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 28 十一月 2025 14:46:31 +0800
Subject: [PATCH] """ 支持任务状态分组及路径与配置更新
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 148 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 104 insertions(+), 44 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
index cd322d0..e9f8f4b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
@@ -105,6 +105,13 @@
WebResponseContent content = new WebResponseContent();
try
{
+ if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
+ {
+ var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.Free, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticOutbound);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
+ await _locationRepository.UpdateDataAsync(result1.Item2);
+ }
+
task.TaskState = (int)TaskOutStatusEnum.OutFinish;
var taskHty = task.Adapt<Dt_Task_Hty>();
taskHty.FinishTime = DateTime.Now;
@@ -113,14 +120,15 @@
stock.ModifyDate = DateTime.Now;
stock.LocationCode = task.TargetAddress;
var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.InStock, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticOutbound);
+
DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
var orderDetails = _orderOutDetailsRepository.QueryData(x => x.PalletCode == task.PalletCode);
List<Dt_OrderOutDetails_Hty> orderdetailshtys = new List<Dt_OrderOutDetails_Hty>();
orderDetails.ForEach(item =>
- {
- orderdetailshtys.Add(item.Adapt<Dt_OrderOutDetails_Hty>());
- });
+ {
+ orderdetailshtys.Add(item.Adapt<Dt_OrderOutDetails_Hty>());
+ });
await ERPAllocateOut(stock);
@@ -172,8 +180,9 @@
boxingInfo.BoxingInfoDetails = mergedDetails;
}
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
+ //await _unitOfWorkManage.UseTranAsync(async () =>
+ //{
+ _unitOfWorkManage.BeginTran();
await DeleteStockInfoAsync(stock.Id);
_boxingInfoRepository.UpdateDataNav(boxingInfo);
await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
@@ -185,12 +194,14 @@
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
- });
+ _unitOfWorkManage.CommitTran();
+ //});
content.OK("鍑哄簱瀹屾垚");
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
task.ErrorMessage = ex.Message;
await BaseDal.UpdateDataAsync(task);
return content.Error(ex.Message);
@@ -268,7 +279,15 @@
{
return content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
}
- await ERPAllocate(boxinfo);
+
+ if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
+ {
+ var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.Free, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticInbound);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
+ await _locationRepository.UpdateDataAsync(result1.Item2);
+ }
+
+
var stock = CreateStock(boxinfo, task);
@@ -280,18 +299,22 @@
var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.InStock, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticInbound);
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
- await _stockInfoRepository.AddDataNavAsync(stock);
+ //await _unitOfWorkManage.UseTranAsync(async () =>
+ //{
+ _unitOfWorkManage.BeginTran();
+ await _stockInfoRepository.AddDataNavAsync(stock);
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
await _locationRepository.UpdateDataAsync(result2.Item2);
- });
+ _unitOfWorkManage.CommitTran();
+ //});
+ await ERPAllocate(boxinfo);
content.OK("鍏ュ簱瀹屾垚");
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
task.ErrorMessage = ex.Message;
await BaseDal.UpdateDataAsync(task);
return content.Error(ex.Message);
@@ -501,7 +524,7 @@
foreach (var item in boxingInfo.BoxingInfoDetails)
{
- var ERPStock = SqlSugarHelper.DBERPtext.Queryable<鐢ㄥ弸鍗虫椂搴撳瓨_ST>().Where(x => x.瀛樺偍鍦扮偣鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName && x.搴撳瓨鏁伴噺 >= item.Quantity).ToList().FirstOrDefault();
+ var ERPStock = SqlSugarHelper.DBERP.Queryable<鐢ㄥ弸鍗虫椂搴撳瓨_ST>().Where(x => x.瀛樺偍鍦扮偣鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName && x.搴撳瓨鏁伴噺 >= item.Quantity).ToList().FirstOrDefault();
if (ERPStock == null)
{
return content.Error($"缁勭洏鏁版嵁鏈湪ERP搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
@@ -964,6 +987,74 @@
}
#endregion 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
+ #region 璇锋眰绉诲簱浠诲姟
+ public async Task<WebResponseContent> RequestRelocationTaskAsync(string SourceAddress,string TargetAddress)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var startLocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == SourceAddress);
+ var endLocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == TargetAddress);
+
+ if (!startLocation.IsNotEmptyOrNull() || !endLocation.IsNotEmptyOrNull())
+ {
+ return content.Error("搴撲綅淇℃伅涓嶅瓨鍦�");
+ }
+ if (endLocation.LocationStatus != (int)LocationEnum.Free)
+ {
+ return content.Error($"缁堢偣搴撲綅{endLocation.LocationCode}鏈浜庣┖闂茬姸鎬侊紝璇蜂汉宸ョ‘璁ゅ簱浣嶇姸鎬�");
+ }
+ if ((startLocation.AreaId == 1 || endLocation.AreaId == 1) && startLocation.AreaId != endLocation.AreaId)
+ {
+ return content.Error("绉诲簱璧风偣搴撲綅涓庣粓鐐瑰簱浣嶄笉鍦ㄥ悓涓�鍖哄煙");
+ }
+ if (startLocation.Floor != endLocation.Floor)
+ {
+ return content.Error("绉诲簱璧风偣搴撲綅涓庣粓鐐瑰簱浣嶄笉鍦ㄥ悓涓�妤煎眰");
+ }
+
+ var stock = await _stockInfoRepository.QueryFirstAsync(x => x.LocationCode == startLocation.LocationCode);
+ var taskNew = new Dt_Task
+ {
+ Grade = startLocation.Floor == "1F" ? 10 : 1,
+ Roadway = endLocation.RoadwayNo,
+ TargetAddress = endLocation.LocationCode,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = endLocation.LocationCode,
+ OrderNo = null,
+ PalletCode = stock == null ? "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000) : stock.PalletCode,
+ SourceAddress = startLocation.LocationCode,
+ CurrentAddress = startLocation.LocationCode,
+ TaskState = startLocation.AreaId == 1 ? (int)TaskRelocationStatusEnum.RelocationNew : (int)TaskRelocationStatusEnum.RelocationNewAGV,
+ TaskType = (int)TaskRelocationTypeEnum.Relocation,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ AGVTaskNum = GenerateUniqueId(),
+ Floor = startLocation.Floor,
+ };
+
+
+ var result = AddTaskAsync(new List<Dt_Task>() { taskNew });
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item2);
+ await _locationRepository.UpdateDataAsync(result.Item1);
+ await BaseDal.AddDataAsync(taskNew);
+ });
+ await SendWCSTask(CreateListTaskDTO(taskNew));
+ return content.OK("鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+
+ #endregion
+
#region 璇锋眰璺ㄦゼ灞�2浠诲姟
/// <summary>
/// 璇锋眰璺ㄦゼ灞�2浠诲姟
@@ -1258,7 +1349,7 @@
PalletCode = stock == null ? "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000) : stock.PalletCode,
SourceAddress = item.LocationCode,
CurrentAddress = item.LocationCode,
- TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
+ TaskState = (int)TaskRelocationStatusEnum.RelocationNewAGV,
TaskType = (int)TaskRelocationTypeEnum.Relocation,
TaskNum = BaseDal.GetTaskNo().Result,
CreateDate = DateTime.Now,
@@ -1404,37 +1495,6 @@
}
return content;
}
- #endregion
-
- #region 鑾峰彇浠诲姟鏁版嵁
- public async Task<WebResponseContent> GetTaskData()
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var task = await BaseDal.QueryDataAsync(x => true);
- var taskData = new List<TaskData>
- {
- new TaskData { Status = "宸插彇娑�", Count = task.Count+50 },
- new TaskData { Status = "宸插畬鎴�", Count = 735 }
- };
-
- // 鏋勫缓绗﹀悎瑕佹眰鐨勬牸寮�
- var result = taskData.Select(item => new
- {
- value = item.Count,
- name = item.Status,
- itemStyle = new { color = item.Status == "宸插彇娑�" ? "#FF0000" : "#00FF00" }
- }).ToList();
-
- return content.OK(data: result);
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- }
-
#endregion
#endregion 澶栭儴鎺ュ彛鏂规硶
--
Gitblit v1.9.3