From ccf5c6a4396e810b46676e545f7ad8970b3787f1 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期日, 15 十二月 2024 09:23:25 +0800
Subject: [PATCH] 更新项目依赖，修复代码注释，调整开发环境配置
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 169 ++++++++++++++++++++++++-------------------------------
1 files changed, 74 insertions(+), 95 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
index 058f3e0..0b56001 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -391,61 +391,9 @@
}
}
- //if (input.area != 3)
- //{
- // if (input.PalletCode == null || input.PalletCode.Trim() == "")
- // return content.Error("鎵樼洏鏉＄爜涓虹┖");
- //}
- //鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
- //TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
- //{
- // Software = "WMS",
- // TrayBarcode = input.PalletCode,
- // //EquipmentCode = "EQ_CWJZ01"
- // EquipmentCode = input.EquiCodeMOM
- //};
-
- // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
- //content = await GetTrayCellStatusAsync(trayCells);
- // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
- //if (!content.Status) return content;
-
- // 娣诲姞缁勭洏淇℃伅
- // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
- //var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
- //if (result.SerialNos.Count <= 0)
- // return content.Error(result.MOMMessage);
-
- //Console.WriteLine(result);
- //// TODO 鑾峰彇鏈湴鏂欐灞炴�т笌鏁寸洏鐢佃姱灞炴�ц幏鍙栫殑鍊艰繘琛屽姣旓紝濡傛灉涓�鑷村垯缁х画锛屽惁鍒欒繑鍥為敊璇俊鎭�
- ////var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));
- ////if (productions.Count <= 0)
- //// return content.Error("鏂欐灞炴�т笉瀛樺湪");
-
- //// 璋冪敤CreateBoxingInfo鏂规硶锛屽垱寤虹粍鐩樹俊鎭�
- //var boxing = CreateBoxingInfo(result, input.PalletCode);
- //if (boxing == null) return content.Error("缁勭洏澶辫触");
-
- //// 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
- //ProcessApplyDto process = await GetProcessApplyAsync(input, result);
-
- //// 濡傛灉process涓簄ull锛屽垯杩斿洖content
- //if (process == null) return content;
-
- //// 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
- //content = await _processApplyService.GetProcessApplyAsync(process);
-
- //// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
- //if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
-
- ////// 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
- ////var processResponse = await GetProcessResponseAsync(process, input.Position);
+
// 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
content = await CreateNewTask(input);
- //if (content.Status)
- //{
- // var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
- //}
}
catch (Exception err)
{
@@ -482,26 +430,8 @@
}
var task = await CreateNewTaskByStation(input, stationinfo);
- // 鍒涘缓鏂颁换鍔″疄渚�
- //var task = new Dt_Task
- //{
- // CurrentAddress = input.Position,
- // Grade = 1,
- // Roadway = input.Roadways,
- // TargetAddress = locationInfo.LocationCode,
- // Dispatchertime = DateTime.Now,
- // MaterialNo = "",
- // NextAddress = input.Roadways,
- // OrderNo = null,
- // PalletCode = input.PalletCode,
- // SourceAddress = stationinfo.stationLocation,
- // TaskState = (int)TaskInStatusEnum.Line_InFinish,
- // TaskType = (int)TaskInboundTypeEnum.Inbound,
- // TaskNum = await BaseDal.GetTaskNo(),
- // Creater = "Systeam"
- //};
-
// 灏濊瘯娣诲姞鏂颁换鍔�
+ if (task == null) return content.Error() ;
var taskId = await BaseDal.AddDataAsync(task);
bool isResult = taskId > 0;
if (isResult)
@@ -521,7 +451,7 @@
};
content.OK(data: taskDTO);
-
+
}
else
content.Error("娣诲姞浠诲姟澶辫触");
@@ -599,11 +529,15 @@
PalletCode = input.PalletCode,
SourceAddress = stationManager.stationLocation,
TaskState = (int)TaskInStatusEnum.Line_InFinish,
- TaskType = (int)TaskOutboundTypeEnum.OutNG,
+ TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam"
};
return taskNG;
+ }
+ else
+ {
+ return null;
}
}
@@ -712,7 +646,7 @@
PalletCode = input.PalletCode,
SourceAddress = stationManager.stationLocation,
TaskState = (int)TaskInStatusEnum.Line_InFinish,
- TaskType = (int)TaskOutboundTypeEnum.OutNG,
+ TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam"
};
@@ -763,8 +697,9 @@
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam"
};
-
+ ConsoleHelper.WriteSuccessLine($"淇敼鍓嶏細" + locationInfo.LocationStatus.ToString());
locationInfo.LocationStatus = (int)LocationEnum.FreeDisable;
+ ConsoleHelper.WriteSuccessLine($"淇敼鍚庯細" + locationInfo.LocationStatus.ToString());
await UpdateLocationAsync(locationInfo);
return task;
@@ -789,7 +724,7 @@
}
else
{
- locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.FreeDisable && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Distribute && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
}
if (locations == null)
@@ -868,7 +803,6 @@
}
}
-
#region 鐩存帴鍑哄簱浠诲姟瀹屾垚
public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task)
{
@@ -890,6 +824,47 @@
}
#endregion
+
+ #region MyRegion
+ private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo fromLocation,DtLocationInfo toLocation, int taskId)
+ {
+ _unitOfWorkManage.BeginTran();
+ try
+ {
+ var isUpdateStock = true;
+
+ // 娣诲姞鍘嗗彶浠诲姟
+ var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
+
+ // 淇敼绉诲簱鍓嶈揣浣嶇姸鎬�
+ var isUpdateLocF = _locationRepository.UpdateData(fromLocation);
+ var isUpdateLocT = _locationRepository.UpdateData(toLocation);
+
+ // 鍒犻櫎浠诲姟鏁版嵁
+ var isTaskDelete = await Delete(taskId);
+
+ // 鎻愪氦鎴栧洖婊氫簨鍔�
+ if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLocF && isUpdateLocT)
+ {
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"浜嬪姟澶勭悊瀹屾垚,鎻愪氦浜嬪姟銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊鎴栨坊鍔犲簱瀛橈細{isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLocF}");
+ _unitOfWorkManage.CommitTran();
+ return true;
+ }
+ else
+ {
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"鏁版嵁澶勭悊澶辫触,璇锋鏌ユ暟鎹槸鍚︽纭�,鏁版嵁鍥炴粴銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊搴撳瓨锛歿isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLocF}");
+ _unitOfWorkManage.RollbackTran();
+ return false;
+ }
+ }
+ catch (Exception err)
+ {
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"浠诲姟瀹屾垚,绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}", "鏃犲弬鏁�");
+ _unitOfWorkManage.RollbackTran();
+ throw new Exception(err.Message); // 鎶涘嚭寮傚父浠ヤ究澶栭儴鎹曡幏
+ }
+ }
+ #endregion
#region 妫�娴嬮珮娓╁簱鏄惁鏈夊彲鍑哄簱搴撳瓨
@@ -992,26 +967,30 @@
var location = locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
- var stockInfo = await QueryStockInfoForEmptyTrayAsync("CWSC1", new List<string>());
+ var stockInfo = await QueryStockInfoForEmptyTrayAsync("CWSC1");
-
- var task = CreateTask(stockInfo, taskDTO.Position, (int)TaskOutboundTypeEnum.OutTray);
-
- // 鍒涘缓浠诲姟DTO
- WMSTaskDTO wmsTask = CreateTaskDTO(task);
-
- // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
- stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
- location.LocationStatus = (int)LocationEnum.FreeDisable;
- await _unitOfWorkManage.UseTranAsync(async () =>
+ if (stockInfo != null)
{
- await BaseDal.AddDataAsync(task);
- await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
- await _locationRepository.UpdateDataAsync(location);
- });
+ var task = CreateTask(stockInfo, taskDTO.Position, (int)TaskOutboundTypeEnum.OutTray);
- // 杩斿洖鎴愬姛鍝嶅簲
- return content.OK(data: wmsTask);
+ // 鍒涘缓浠诲姟DTO
+ WMSTaskDTO wmsTask = CreateTaskDTO(task);
+
+ // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+ stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
+ location.LocationStatus = (int)LocationEnum.Distribute;
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await BaseDal.AddDataAsync(task);
+ await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
+ await _locationRepository.UpdateDataAsync(location);
+ });
+
+ // 杩斿洖鎴愬姛鍝嶅簲
+ return content.OK(data: wmsTask);
+ }
+ else
+ content.Error("甯告俯绌烘墭鐩樻暟閲忎笉瓒�");
}
}
catch (Exception ex)
--
Gitblit v1.9.3