From 824853fe17b79ed253cd52db58459806bf0371ee Mon Sep 17 00:00:00 2001
From: xiaoyang <xiaoyang@hnkhzn.com>
Date: 星期五, 08 十一月 2024 17:27:50 +0800
Subject: [PATCH] 11.08
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 811 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 527 insertions(+), 284 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index 8149a7f..5901b8a 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -1,10 +1,13 @@
-锘縰sing Mapster;
+锘縰sing log4net.Core;
+using Mapster;
using Masuit.Tools;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
using WIDESEA_IStorageBasicRepository;
using WIDESEA_IStoragIntegrationServices;
+using WIDESEA_Model.Models;
using WIDESEA_StorageBasicRepository;
+using WIDESEA_StorageTaskRepository;
using WIDESEA_StoragIntegrationServices;
namespace WIDESEA_StorageOutTaskServices;
@@ -83,6 +86,101 @@
/// </summary>
/// <param name="saveModel">浠诲姟鏁版嵁鍚堥泦</param>
/// <returns>杩斿洖缁撴灉闆�</returns>
+ //public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task, DtStockInfo stock)
+ //{
+ // WebResponseContent content = new WebResponseContent();
+ // try
+ // {
+ // if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ // {
+ // var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
+ // .FirstAsync(x => x.EquipmentName == task.Roadway);
+ // EquipmentParameterInfo info = JsonConvert.DeserializeObject<EquipmentParameterInfo>(process.ProcessValue);
+ // AgingOutputDto agingOutputDto = new AgingOutputDto()
+ // {
+ // OpFlag = 1,
+ // EquipmentCode = stock.LocationInfo.RoadwayNo,
+ // TrayBarcode = stock.PalletCode,
+ // SerialNos = stock.StockInfoDetails.Select(x => new SerialNoOutDto()
+ // {
+ // SlotNo = x.OrderNo.ToInt32(),
+ // SerialNo = x.SerialNumber,
+ // SerialNoResult = true,
+ // ParameterInfo = new List<ParameterInfo>()
+ // {
+ // new ParameterInfo()
+ // {
+ // LowerLomit =info.LowerControlLimit,
+ // UpperLimit = info.UpperControlLimit,
+ // ParameterResult = info.EquipmentAvailabilityFlag,
+ // ParameterCode = info.ParameterCode,
+ // ParameterDesc = info.Description,
+ // TargetValue = info.TargetValue,
+ // Value = info.TargetValue,
+ // DefectCode = info.UOMCode
+ // }
+ // }
+ // }).ToList()
+ // };
+ // content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
+ // var result = JsonConvert.DeserializeObject<BasicResult>(content.ToString());
+ // if (!result.Success)
+ // {
+ // throw new Exception(result.MOMMessage);
+ // }
+ // }
+ // // 鏇存柊搴撳瓨鐘舵��
+ // var loation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
+ // var detail = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);
+
+ // // 璁剧疆搴撲綅鐘舵�佷负绌洪棽
+ // loation.LocationStatus = LocationEnum.Free.ObjToInt();
+
+ // // 鏇存柊浠诲姟鐘舵��
+ // task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
+ // task.CurrentAddress = task.NextAddress;
+ // task.NextAddress = task.TargetAddress;
+
+ // LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", "鏇存柊搴撳瓨鐘舵�佷笌浠诲姟鐘舵��");
+
+ // // 浜嬪姟澶勭悊
+ // // 寮�濮嬩簨鍔�
+ // _unitOfWorkManage.BeginTran();
+ // // 鍒犻櫎搴撳瓨淇℃伅
+ // var isStockUpdated = _stockInfoRepository.DeleteDataById(stock.Id);
+ // // 鍒犻櫎搴撳瓨淇℃伅
+ // var isStockDetailUpdated = _stockInfoDetailRepository.DeleteDataByIds(detail.Select(x => (object)x.Id).ToArray());
+ // // 鍒犻櫎浠诲姟淇℃伅
+ // var isTaskUpdated = BaseDal.DeleteDataById(task.TaskId);
+
+ // // 濡傛灉搴撳瓨淇℃伅鍜屼换鍔′俊鎭兘鏇存柊鎴愬姛
+ // if (isStockUpdated && isTaskUpdated && isStockDetailUpdated)
+ // {
+ // // 璁板綍鏃ュ織
+ // LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", $"浜嬪姟澶勭悊瀹屾垚锛屽簱瀛樼姸鎬佹洿鏂帮細{isStockUpdated}锛屼换鍔＄姸鎬佹洿鏂�:{isTaskUpdated}");
+ // // 鎻愪氦浜嬪姟
+ // _unitOfWorkManage.CommitTran();
+ // // 杩斿洖鎴愬姛缁撴灉
+ // return content.OK("浠诲姟瀹屾垚鎴愬姛");
+ // }
+ // else
+ // {
+ // // 璁板綍鏃ュ織
+ // LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", $"浜嬪姟澶勭悊澶辫触锛屽簱瀛樼姸鎬佹洿鏂帮細{isStockUpdated}锛屼换鍔＄姸鎬佹洿鏂�:{isTaskUpdated}");
+ // // 鍥炴粴浜嬪姟
+ // _unitOfWorkManage.RollbackTran();
+ // // 杩斿洖澶辫触缁撴灉
+ // return content.Error("浠诲姟鎴栧簱瀛樻洿鏂板け璐�");
+ // }
+ // }
+ // catch (Exception err)
+ // {
+ // LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}", "");
+ // Console.WriteLine(err.Message);
+ // return content.Error(err.Message);
+ // }
+ //}
+
public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task, DtStockInfo stock)
{
WebResponseContent content = new WebResponseContent();
@@ -91,89 +189,123 @@
if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
- .FirstAsync(x => x.EquipmentName == task.Roadway);
- EquipmentParameterInfo info = JsonConvert.DeserializeObject<EquipmentParameterInfo>(process.ProcessValue);
- AgingOutputDto agingOutputDto = new AgingOutputDto()
- {
- OpFlag = 1,
- EquipmentCode = stock.LocationInfo.RoadwayNo,
- TrayBarcode = stock.PalletCode,
- SerialNos = stock.StockInfoDetails.Select(x => new SerialNoOutDto()
- {
- SlotNo = x.OrderNo.ToInt32(),
- SerialNo = x.SerialNumber,
- SerialNoResult = true,
- ParameterInfo = new List<ParameterInfo>()
- {
- new ParameterInfo()
- {
- LowerLomit =info.LowerControlLimit,
- UpperLimit = info.UpperControlLimit,
- ParameterResult = info.EquipmentAvailabilityFlag,
- ParameterCode = info.ParameterCode,
- ParameterDesc = info.Description,
- TargetValue = info.TargetValue,
- Value = info.TargetValue,
- DefectCode = info.UOMCode
- }
- }
- }).ToList()
- };
+ .FirstAsync(x => x.EquipmentName == task.Roadway);
+ var info = JsonConvert.DeserializeObject<List<EquipmentParameterInfo>>(process.ProcessValue);
+
+ var agingOutputDto = MapToAgingOutputDto(stock, info);
+ content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
+ ValidateResponse(content);
}
- // 鏇存柊搴撳瓨鐘舵��
- var loation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
- var detail = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);
- // 璁剧疆搴撲綅鐘舵�佷负绌洪棽
- loation.LocationStatus = LocationEnum.Free.ObjToInt();
-
-
- // 鏇存柊浠诲姟鐘舵��
- task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
- task.CurrentAddress = task.NextAddress;
- task.NextAddress = task.TargetAddress;
-
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", "鏇存柊搴撳瓨鐘舵�佷笌浠诲姟鐘舵��");
+ // 鏇存柊搴撳瓨鐘舵�佸拰浠诲姟鐘舵��
+ (var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
// 浜嬪姟澶勭悊
- // 寮�濮嬩簨鍔�
- _unitOfWorkManage.BeginTran();
- // 鍒犻櫎搴撳瓨淇℃伅
- var isStockUpdated = _stockInfoRepository.DeleteDataById(stock.Id);
- // 鍒犻櫎搴撳瓨淇℃伅
- var isStockDetailUpdated = _stockInfoDetailRepository.DeleteDataByIds(detail.Select(x => (object)x.Id).ToArray());
- // 鍒犻櫎浠诲姟淇℃伅
- var isTaskUpdated = BaseDal.DeleteDataById(task.TaskId);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await UpdateLocationAsync(loc);
+ await DeleteStockInfoAsync(stock.Id);
+ await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
+ await DeleteTaskAsync(task.TaskId);
+ });
- // 濡傛灉搴撳瓨淇℃伅鍜屼换鍔′俊鎭兘鏇存柊鎴愬姛
- if (isStockUpdated && isTaskUpdated && isStockDetailUpdated)
- {
- // 璁板綍鏃ュ織
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", $"浜嬪姟澶勭悊瀹屾垚锛屽簱瀛樼姸鎬佹洿鏂帮細{isStockUpdated}锛屼换鍔＄姸鎬佹洿鏂�:{isTaskUpdated}");
- // 鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
- // 杩斿洖鎴愬姛缁撴灉
- return content.OK("浠诲姟瀹屾垚鎴愬姛");
- }
- else
- {
- // 璁板綍鏃ュ織
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", $"浜嬪姟澶勭悊澶辫触锛屽簱瀛樼姸鎬佹洿鏂帮細{isStockUpdated}锛屼换鍔＄姸鎬佹洿鏂�:{isTaskUpdated}");
- // 鍥炴粴浜嬪姟
- _unitOfWorkManage.RollbackTran();
- // 杩斿洖澶辫触缁撴灉
- return content.Error("浠诲姟鎴栧簱瀛樻洿鏂板け璐�");
- }
+ return content.OK("浠诲姟瀹屾垚鎴愬姛");
}
catch (Exception err)
{
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}", "");
- Console.WriteLine(err.Message);
+ LogFactory.GetLog("浠诲姟瀹屾垚").Error(true, $"绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}");
return content.Error(err.Message);
}
}
- #endregion 鍫嗗灈鏈哄嚭搴撲换鍔″畬鎴�
+ private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, List<EquipmentParameterInfo> info)
+ {
+ return new AgingOutputDto
+ {
+ OpFlag = 1,
+ EquipmentCode = stock.LocationInfo.RoadwayNo,
+ TrayBarcode = stock.PalletCode,
+ SerialNos = stock.StockInfoDetails.Select(x => new SerialNoOutDto
+ {
+ SlotNo = x.OrderNo.ToInt32(),
+ SerialNo = x.SerialNumber,
+ SerialNoResult = true,
+ ParameterInfo = info.Select(x => new ParameterInfo()
+ {
+ LowerLomit = x.LowerControlLimit,
+ UpperLimit = x.UpperControlLimit,
+ ParameterResult = x.EquipmentAvailabilityFlag,
+ ParameterCode = x.ParameterCode,
+ ParameterDesc = x.Description,
+ TargetValue = x.TargetValue,
+ Value = (DateTime.Now - stock.CreateDate).TotalMinutes.ToString(),
+ DefectCode = x.UOMCode
+ }).ToList()
+ }).ToList()
+ };
+ }
+
+ private void ValidateResponse(WebResponseContent content)
+ {
+ var result = JsonConvert.DeserializeObject<BasicResult>(content.ToString());
+ if (!result.Success)
+ {
+ throw new Exception(result.MOMMessage);
+ }
+ }
+
+ private (DtLocationInfo, Dt_Task) UpdateStockAndTaskStatus(DtStockInfo stock, Dt_Task task)
+ {
+ var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
+ var details = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);
+
+ location.LocationStatus = LocationEnum.Free.ObjToInt();
+ task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
+ task.CurrentAddress = task.NextAddress;
+ task.NextAddress = task.TargetAddress;
+
+ LogFactory.GetLog("浠诲姟瀹屾垚").Info(true, "鏇存柊搴撳瓨鐘舵�佷笌浠诲姟鐘舵��");
+ return (location, task);
+ }
+
+ private async Task DeleteStockInfoAsync(int stockId)
+ {
+ var isStockUpdated = await _stockInfoRepository.DeleteDataByIdAsync(stockId);
+ if (!isStockUpdated)
+ {
+ throw new Exception("搴撳瓨淇℃伅鏇存柊澶辫触");
+ }
+ }
+
+ private async Task UpdateLocationAsync(DtLocationInfo info)
+ {
+ var isStockUpdated = await _locationRepository.UpdateDataAsync(info);
+ if (!isStockUpdated)
+ {
+ throw new Exception("搴撳瓨淇℃伅鏇存柊澶辫触");
+ }
+ }
+
+ private async Task DeleteStockInfoDetailsAsync(IEnumerable<DtStockInfoDetail> details)
+ {
+ var ids = details.Select(x => (object)x.Id).ToArray();
+ var isStockDetailUpdated = await _stockInfoDetailRepository.DeleteDataByIdsAsync(ids);
+ if (!isStockDetailUpdated)
+ {
+ throw new Exception("搴撳瓨璇︽儏淇℃伅鏇存柊澶辫触");
+ }
+ }
+
+ private async Task DeleteTaskAsync(int taskId)
+ {
+ var isTaskUpdated = await BaseDal.DeleteDataByIdAsync(taskId);
+ if (!isTaskUpdated)
+ {
+ throw new Exception("浠诲姟淇℃伅鏇存柊澶辫触");
+ }
+ }
+
+ #endregion 鍑哄簱浠诲姟瀹屾垚
#region 绉诲簱浠诲姟瀹屾垚
@@ -211,89 +343,109 @@
#region 鍏ュ簱浠诲姟瀹屾垚
/// <summary>
- /// 鍏ュ簱浠诲姟瀹屾垚
+ /// 瀹屾垚鍏ュ簱浠诲姟
/// </summary>
/// <param name="task">浠诲姟鏁版嵁鍚堥泦</param>
/// <returns>杩斿洖缁撴灉闆�</returns>
public async Task<WebResponseContent> CompleteInboundTaskAsync(Dt_Task task)
{
+ // 鍒濆鍖栧搷搴斿唴瀹�
WebResponseContent content = new WebResponseContent();
try
{
+ // 鑾峰彇瑁呯淇℃伅鍜岀洰鏍囦綅缃俊鎭�
var boxing = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
+ // 鏇存柊鐩爣浣嶇疆鐘舵�佷负搴撳瓨涓�
locationInf.LocationStatus = (int)LocationEnum.InStock;
// 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
var taskHty = CreateHistoricalTask(task);
- // 鍒涘缓搴撳瓨瀹炰緥妯″瀷
- DtStockInfo stock;
- if (boxing == null)
- {
- // 绌烘墭鐩�
-
- stock = new DtStockInfo()
- {
- PalletCode = task.PalletCode,
- LocationCode = task.TargetAddress,
- CreateDate = DateTime.Now,
- Creater = "system",
- IsFull = boxing.IsFull,
- StockInfoDetails = new List<DtStockInfoDetail>()
- {
- new DtStockInfoDetail()
- {
- MaterielCode = "绌烘墭鐩�",
- Id = 0,
- }
- }
- };
- }
- else
- {
- // 瀹炵洏
- var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
- // 鍒涘缓搴撳瓨瀹炰緥妯″瀷
- stock = new DtStockInfo()
- {
- PalletCode = task.PalletCode,
- LocationCode = task.TargetAddress,
- CreateDate = DateTime.Now,
- Creater = "system",
- IsFull = boxing.IsFull,
- StockInfoDetails = boxDetail,
- };
-
- AgingInputDto agingInputDto = new AgingInputDto()
- {
- SerialNos = boxing.BoxingInfoDetails
- .Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
- .ToList(),
- TrayBarcode = task.PalletCode,
- OpFlag = 1
- };
- var result = await _agingInOrOutInputService.GetOCVInputAsync(agingInputDto);
- stock.Remark = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString()).LinedProcessFeedbackTime;
-
-
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
-
- }
+ // 鏍规嵁鏄惁鏈夌粍鐩樹俊鎭垱寤哄簱瀛樺疄渚嬫ā鍨�
+ DtStockInfo stock = boxing == null ? CreateEmptyPalletStock(task, locationInf) : CreateFullPalletStock(task, locationInf, boxing);
// 鎵ц鏁版嵁搴撲簨鍔�
bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId);
if (isResult)
+ {
content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
+ }
else
+ {
content.Error("鍏ュ簱浠诲姟瀹屾垚澶辫触");
+ }
}
catch (Exception err)
{
+ // 璁板綍寮傚父淇℃伅鍒版帶鍒跺彴鍜屾棩蹇�
Console.WriteLine(err.Message.ToString());
+ LogFactory.GetLog("浠诲姟瀹屾垚").Error(true, err);
}
return content;
+ }
+
+ /// <summary>
+ /// 鍒涘缓绌烘墭鐩樼殑搴撳瓨瀹炰緥妯″瀷
+ /// </summary>
+ private DtStockInfo CreateEmptyPalletStock(Dt_Task task, DtLocationInfo locationInf)
+ {
+ return new DtStockInfo()
+ {
+ PalletCode = task.PalletCode,
+ LocationCode = task.TargetAddress,
+ CreateDate = DateTime.Now,
+ Creater = "system",
+ IsFull = false,
+ AreaCode = task.Roadway,
+ StockInfoDetails = new List<DtStockInfoDetail>()
+ {
+ new DtStockInfoDetail()
+ {
+ MaterielCode = "绌烘墭鐩�",
+ Id = 0,
+ }
+ }
+ };
+ }
+
+ /// <summary>
+ /// 鍒涘缓瀹炵洏鐨勫簱瀛樺疄渚嬫ā鍨嬪苟璋冪敤MOM鍏ュ簱
+ /// </summary>
+ private DtStockInfo CreateFullPalletStock(Dt_Task task, DtLocationInfo locationInf, DtBoxingInfo boxing)
+ {
+ var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
+ var stock = new DtStockInfo()
+ {
+ PalletCode = task.PalletCode,
+ LocationCode = task.TargetAddress,
+ CreateDate = DateTime.Now,
+ Creater = "system",
+ IsFull = boxing.IsFull,
+ AreaCode = task.Roadway,
+ StockInfoDetails = boxDetail,
+ };
+
+ // 澶勭悊璇锋眰鍙傛暟
+ AgingInputDto agingInputDto = new AgingInputDto()
+ {
+ SerialNos = boxing.BoxingInfoDetails
+ .Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
+ .ToList(),
+ TrayBarcode = task.PalletCode,
+ OpFlag = 1,
+ EquipmentCode = "ECH001-B",
+ Software = "WMS"
+ };
+ var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;
+ var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());
+ stock.Remark = respone.LinedProcessFeedbackTime;
+
+ // 璁板綍鏃ュ織
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
+
+ return stock;
}
#endregion 鍏ュ簱浠诲姟瀹屾垚
@@ -301,13 +453,15 @@
#region 浠诲姟瀹屾垚
/// <summary>
- /// 浠诲姟瀹屾垚
+ /// 瀹屾垚浠诲姟
/// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <returns></returns>
+ /// <param name="taskNum">浠诲姟缂栧彿</param>
+ /// <returns>杩斿洖缁撴灉闆�</returns>
public async Task<WebResponseContent> CompleteAsync(int taskNum)
{
+ // 鍒濆鍖栧搷搴斿唴瀹�
WebResponseContent content = new WebResponseContent();
+
// 鎻愬彇浠诲姟鏁版嵁
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎻愬彇浠诲姟鏁版嵁", $"浠诲姟鍙凤細{taskNum}");
@@ -321,61 +475,28 @@
// 楠岃瘉搴撳瓨鏄惁瀛樺湪
var stock = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == task.PalletCode);
- if (stock == null)
+
+ // 鏍规嵁浠诲姟绫诲瀷璋冪敤鐩稿簲鐨勫畬鎴愪换鍔℃柟娉�
+ switch (task.TaskType)
{
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "搴撳瓨涓嶅瓨鍦ㄥ瓨鍦紝鍒ゆ柇鏄惁鏄叆搴撲换鍔�", $"{task.TaskType}");
- if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
- {
+ case (int)TaskInboundTypeEnum.Inbound:
+ case (int)TaskInboundTypeEnum.InTray:
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟", "");
return await CompleteInboundTaskAsync(task);
- }
- else if (task.TaskType == (int)TaskInboundTypeEnum.InTray)
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绌烘墭鐩樺叆搴�", "");
- return await CompleteInboundTaskAsync(task);
- }
- else
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟鐘舵�佸紓甯�", "");
- return content.Error("浠诲姟鐘舵�佸紓甯�");
- }
- }
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "楠岃瘉搴撳瓨鏄惁瀛樺湪", JsonConvert.SerializeObject(stock));
- if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", "");
- if (task.TaskState == TaskOutStatusEnum.Line_OutFinish.ObjToInt())
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", "");
+ case (int)TaskOutboundTypeEnum.OutTray:
+ case (int)TaskOutboundTypeEnum.Outbound:
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", "");
return await CompleteStackTaskAsync(task, stock);
- }
- else if (task.TaskState == TaskOutStatusEnum.SC_OutExecuting.ObjToInt())
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "搴撳瓨涓嶅瓨鍦ㄤ篃涓嶆槸鍏ュ簱浠诲姟", "");
- return content.Error("搴撳瓨涓嶅瓨鍦�");
- }
- else
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟鐘舵�佸紓甯�", "");
- return content.Error("浠诲姟鐘舵�佸紓甯�");
- }
- }
- else if (task.TaskType == (int)TaskTypeEnum.RelocationIn)
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", "");
- return await CompleteTransferTaskAsync(task, stock);
- }
- else
- {
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"浠诲姟鐘舵�佸紓甯�", "鏃犲弬鏁�");
- return content.Error("浠诲姟鐘舵�佸紓甯�");
+
+ default:
+ return content.Error("浠诲姟绫诲瀷涓嶅瓨鍦�");
}
}
#endregion 浠诲姟瀹屾垚
- #region 璇锋眰浠诲姟
+ #region 璇锋眰浠诲姟鍏ュ簱
/// <summary>
/// 璇锋眰浠诲姟
@@ -389,10 +510,36 @@
try
{
+ // 璋冪敤BaseDal.QueryFirstAsync鏂规硶锛屾煡璇换鍔�
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
+ if (task != null)
+ {
+ if (task.TaskState == (int)TaskInStatusEnum.InNew)
+ {
+ // 鍒涘缓WMS浠诲姟
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskNum = task.TaskNum.Value,
+ Grade = 1,
+ PalletCode = task.PalletCode,
+ RoadWay = task.Roadway,
+ SourceAddress = task.SourceAddress,
+ TargetAddress = task.Roadway,
+ TaskState = task.TaskState.Value,
+ Id = 0,
+ TaskType = task.TaskType,
+ };
+ return content.OK(data: taskDTO);
+ }
+ content = await UpdateExistingTask(input, task);
+ return content;
+ }
// 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
{
- TrayBarcode = input.PalletCode
+ Software = "WMS",
+ TrayBarcode = input.PalletCode,
+ EquipmentCode = "ECH001-B"
};
// 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
@@ -402,7 +549,9 @@
// 娣诲姞缁勭洏淇℃伅
// 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
- var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.ToString());
+ var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+ if (result.SerialNos.Count <= 0)
+ return content.Error(result.MOMMessage);
var boxing = await CreateBoxingInfo(result, input.PalletCode);
// 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
@@ -414,10 +563,8 @@
// 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
var processResponse = await GetProcessResponseAsync(process, input.Position);
- // 璋冪敤BaseDal.QueryFirstAsync鏂规硶锛屾煡璇换鍔�
- var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
// 濡傛灉task涓嶄负null锛屽垯璋冪敤UpdateExistingTask鏂规硶锛屾洿鏂颁换鍔★紱鍚﹀垯璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
- content = task != null ? await UpdateExistingTask(input, task) : await CreateNewTask(processResponse, input);
+ content = task != null ? await UpdateExistingTask(input, task) : await CreateNewTask(input, processResponse);
if (content.Status)
{
var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -432,6 +579,41 @@
// 杩斿洖content
return content;
+ }
+
+ public async Task<WebResponseContent> RequestTrayInTaskAsync(RequestTaskDto input)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+
+ // 璋冪敤BaseDal.QueryFirstAsync鏂规硶锛屾煡璇换鍔�
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
+ if (task != null && task.TaskState == (int)TaskInStatusEnum.InNew)
+ {
+ // 鍒涘缓WMS浠诲姟
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskNum = task.TaskNum.Value,
+ Grade = 1,
+ PalletCode = task.PalletCode,
+ RoadWay = task.Roadway,
+ SourceAddress = task.SourceAddress,
+ TargetAddress = task.Roadway,
+ TaskState = task.TaskState.Value,
+ Id = 0,
+ TaskType = task.TaskType,
+ };
+ return content.OK(data: task);
+ }
+
+ return await CreateNewTask(input, null, 1);
+ }
+ catch (Exception)
+ {
+
+ throw;
+ }
}
// 鑾峰彇鎵樼洏鍗曞厓鏍肩姸鎬�
@@ -453,7 +635,7 @@
SerialNumber = serialNoObj.SerialNo,
OrderNo = serialNoObj.PositionNo.ToString(),
Status = serialNoObj.SerialNoStatus,
- MaterielCode = result.BindCode,
+ MaterielCode = serialNoObj.BindCode,
Remark = result.TrayBarcodePropertys.ToJsonString(),
}).ToList()
};
@@ -465,6 +647,8 @@
// 鍒涘缓涓�涓狿rocessApplyDto瀵硅薄锛屽苟璧嬪��
return new ProcessApplyDto()
{
+ EquipmentCode = "ECH001-B",
+ Software = "WMS",
//WipOrderNo = result.BindCode,
SerialNos = content.SerialNos.Select(item => new SerialNos
{
@@ -491,13 +675,13 @@
{
case "1088":
return SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
- .Where(x => x.EquipmentType == "闄堝寲" && x.WipOrderNo == apply.WipOrderNo && x.ProductDesc == apply.ProductNo)
+ .Where(x => x.EquipmentType == "闄堝寲" && x.WipOrderNo == apply.WipOrderNo || x.ProductDesc == apply.ProductNo)
.ToList();
case "1339":
case "1406":
return SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
- .Where(x => x.EquipmentType == "闈欑疆" && x.WipOrderNo == apply.WipOrderNo && x.ProductDesc == apply.ProductNo)
+ .Where(x => x.EquipmentType == "闈欑疆" && x.WipOrderNo == apply.WipOrderNo || x.ProductDesc == apply.ProductNo)
.ToList();
default:
@@ -505,123 +689,156 @@
}
}
- #endregion 璇锋眰浠诲姟
+ #endregion 璇锋眰浠诲姟鍏ュ簱
- #region 璇锋眰绌烘墭鐩�
+ #region 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
- public async Task<WebResponseContent> RequestTrayTaskAsync(string position)
+ /// <summary>
+ /// 璇锋眰鎵樼洏浠诲姟
+ /// </summary>
+ /// <param name="position">鐩爣浣嶇疆</param>
+ /// <param name="tag">鎵樼洏绫诲瀷锛�1锛氬疄鐩橈紝2锛氱┖鐩橈級</param>
+ /// <param name="areaCode">鍖哄煙缂栫爜</param>
+ /// <param name="roadways">宸烽亾缂栫爜闆嗗悎</param>
+ /// <returns>杩斿洖缁撴灉闆�</returns>
+ public async Task<WebResponseContent> RequestTrayOutTaskAsync(string position, int tag, string areaCode, List<string> roadways)
{
WebResponseContent content = new WebResponseContent();
try
{
- var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == "CH");
+ // 鏍规嵁鎵樼洏绫诲瀷鏌ヨ搴撳瓨淇℃伅
+ DtStockInfo stockInfo = tag == (int)TaskOutboundTypeEnum.Outbound
+ ? QueryStockInfoForRealTray(areaCode, roadways)
+ : QueryStockInfoForEmptyTray(areaCode, roadways);
- var stockInfo = _stockInfoRepository.QueryData(x => x.LocationInfo.AreaId == area.AreaID && x.StockInfoDetails.Any(z => z.MaterielCode == "绌烘墭鐩�")).OrderBy(x => x.CreateDate).FirstOrDefault();
- // 鍒涘缓鏂颁换鍔″疄渚�
- var task = new Dt_Task
+ if (stockInfo == null)
{
- CurrentAddress = stockInfo.LocationCode,
- Grade = 1,
- Roadway = stockInfo.LocationInfo.RoadwayNo,
- TargetAddress = position,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = position,
- OrderNo = null,
- PalletCode = stockInfo.PalletCode,
- SourceAddress = stockInfo.LocationCode,
- TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = (int)TaskOutboundTypeEnum.OutTray,
- TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam"
- };
-
- var taskId = await BaseDal.AddDataAsync(task);
- bool isResult = taskId > 0;
- if (isResult)
- {
- WMSTaskDTO taskDTO = new WMSTaskDTO()
- {
- TaskNum = task.TaskNum.Value,
- Grade = 1,
- PalletCode = DateTime.Now.ToString("MMddHHmmss"),
- RoadWay = task.Roadway,
- SourceAddress = stockInfo.LocationCode,
- TargetAddress = task.Roadway,
- TaskState = (int)TaskOutStatusEnum.OutNew,
- Id = 0,
- TaskType = (int)TaskOutboundTypeEnum.OutTray
- };
- content.OK(data: taskDTO);
+ return content.Error("搴撳瓨淇℃伅涓嶅瓨鍦�");
}
- }
- catch (Exception ex)
- {
- throw;
- }
- return content;
- }
- #endregion 璇锋眰绌烘墭鐩�
-
- #region 闄堝寲璇锋眰鍑哄簱
-
- // 闄堝寲璇锋眰鍑哄簱
- public async Task<WebResponseContent> OutTrayByCh(string position)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var area = _areaInfoRepository.QueryFirst(x => x.AreaName == "闄堝寲鍖�");
- // 鏌ヨ搴撳瓨淇℃伅
-
- var stockInfo = _stockInfoRepository.QueryData(x => x.AreaCode == area.AreaCode && Convert.ToDateTime(x.Remark) < DateTime.Now && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock).OrderBy(x => x.CreateDate).FirstOrDefault();
// 鍒涘缓鏂颁换鍔″疄渚�
- var task = new Dt_Task()
- {
- Grade = 1,
- Roadway = stockInfo.LocationInfo.RoadwayNo,
- TargetAddress = position,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = position,
- OrderNo = null,
- PalletCode = stockInfo.PalletCode,
- SourceAddress = stockInfo.LocationCode,
- TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = (int)TaskOutboundTypeEnum.OutTray,
- TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam"
- };
+ var task = CreateTask(stockInfo, position, tag);
var taskId = await BaseDal.AddDataAsync(task);
bool isResult = taskId > 0;
- if (isResult)
+ if (!isResult)
{
- WMSTaskDTO taskDTO = new WMSTaskDTO()
- {
- TaskNum = task.TaskNum.Value,
- Grade = 1,
- PalletCode = DateTime.Now.ToString("MMddHHmmss"),
- RoadWay = task.Roadway,
- SourceAddress = stockInfo.LocationCode,
- TargetAddress = task.Roadway,
- TaskState = (int)TaskOutStatusEnum.OutNew,
- Id = 0,
- TaskType = (int)TaskOutboundTypeEnum.OutTray
- };
+ return content.Error("浠诲姟鍒涘缓澶辫触");
+ }
+
+ // 鍒涘缓浠诲姟DTO
+ WMSTaskDTO taskDTO = CreateTaskDTO(task);
+ //if (tag == 1)
+ {
+ // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
- _locationRepository.UpdateData(stockInfo.LocationInfo);
- content.OK(data: taskDTO);
+ await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
}
+
+ // 杩斿洖鎴愬姛鍝嶅簲
+ return content.OK(data: taskDTO);
}
catch (Exception ex)
{
- throw;
+ // 璁板綍寮傚父淇℃伅骞舵姏鍑�
+ LogFactory.GetLog("璇锋眰鎵樼洏浠诲姟").Error(true, ex);
+ return content.Error(ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鏌ヨ瀹炵洏搴撳瓨淇℃伅
+ /// </summary>
+ private DtStockInfo QueryStockInfoForRealTray(string areaCode, List<string> roadways)
+ {
+ return _stockInfoRepository.Db.Queryable<DtStockInfo>().Where(x => x.AreaCode == areaCode && Convert.ToDateTime(x.Remark) < DateTime.Now && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && roadways.Contains(x.LocationInfo.RoadwayNo))
+ .Includes(x => x.LocationInfo)
+ .Includes(x => x.StockInfoDetails)
+ .OrderBy(x => x.CreateDate)
+ .First();
+ }
+
+ /// <summary>
+ /// 鏌ヨ绌虹洏搴撳瓨淇℃伅
+ /// </summary>
+ private DtStockInfo QueryStockInfoForEmptyTray(string areaCode, List<string> roadways)
+ {
+ return _stockInfoRepository.Db.Queryable<DtStockInfo>().Where(x => x.AreaCode == areaCode && x.StockInfoDetails.Any(z => z.MaterielCode == "绌烘墭鐩�") && roadways.Contains(x.LocationInfo.RoadwayNo))
+ .Includes(x => x.LocationInfo)
+ .Includes(x => x.StockInfoDetails)
+ .OrderBy(x => x.CreateDate)
+ .First();
+ }
+
+ /// <summary>
+ /// 鍒涘缓浠诲姟瀹炰緥
+ /// </summary>
+ private Dt_Task CreateTask(DtStockInfo stockInfo, string position, int tag)
+ {
+ return new Dt_Task
+ {
+ Grade = 1,
+ Roadway = stockInfo.LocationInfo.RoadwayNo,
+ TargetAddress = position,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = position,
+ OrderNo = null,
+ PalletCode = stockInfo.PalletCode,
+ SourceAddress = stockInfo.LocationCode,
+ CurrentAddress = stockInfo.LocationCode,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ TaskType = tag == (int)TaskOutboundTypeEnum.Outbound ? (int)TaskOutboundTypeEnum.Outbound : (int)TaskOutboundTypeEnum.OutTray,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ Creater = "System" // 淇鎷煎啓閿欒
+ };
+ }
+
+ /// <summary>
+ /// 鍒涘缓浠诲姟DTO
+ /// </summary>
+ private WMSTaskDTO CreateTaskDTO(Dt_Task task)
+ {
+ return new WMSTaskDTO
+ {
+ TaskNum = task.TaskNum.Value,
+ Grade = 1,
+ PalletCode = task.PalletCode,
+ RoadWay = task.Roadway,
+ SourceAddress = task.SourceAddress,
+ TargetAddress = task.TargetAddress,
+ TaskState = task.TaskState.Value,
+ Id = 0,
+ TaskType = task.TaskType,
+ };
+ }
+
+ #endregion 璇锋眰鍑哄簱
+
+ #region 浠诲姟鐘舵�佹洿鏀�
+
+ public async Task<WebResponseContent> UpdateTaskStatus(int taskNum, int taskState)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);
+ if (task == null)
+ return content.Error("鏈壘鍒颁换鍔�");
+ task.TaskState = taskState;
+ var asb = await BaseDal.UpdateDataAsync(task);
+ if (asb)
+ content.OK();
+ else
+ content.Error();
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
}
return content;
}
- #endregion 闄堝寲璇锋眰鍑哄簱
+ #endregion
#endregion 澶栭儴鎺ュ彛鏂规硶
@@ -871,6 +1088,8 @@
isUpdateStock = await _stockInfoRepository.AddDataNavAsync(stock);
}
+
+
// 娣诲姞鍘嗗彶浠诲姟
var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
@@ -985,10 +1204,18 @@
/// <param name="areaId">鍖哄煙ID</param>
/// <param name="content">鍝嶅簲鍐呭</param>
/// <returns></returns>
- private async Task<WebResponseContent> CreateNewTask(List<Dt_EquipmentProcess> process, RequestTaskDto input)
+ private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, List<Dt_EquipmentProcess> process = null, int flag = 0)
{
WebResponseContent content = new WebResponseContent();
- List<string> strings = process.Select(x => x.EquipmentName).ToList();
+ List<string> strings = new List<string>();
+ if (process != null)
+ {
+ strings = process.Select(x => x.EquipmentName).ToList();
+ }
+ else
+ {
+ strings = input.Position.Split(',').ToList();
+ }
// 鑾峰彇鐩爣鍦板潃
string ToAddress = await GetRoadWayAsync(strings);
@@ -1006,7 +1233,7 @@
PalletCode = input.PalletCode,
SourceAddress = input.Position,
TaskState = (int)TaskInStatusEnum.InNew,
- TaskType = (int)TaskTypeEnum.Inbound,
+ TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : (int)TaskInboundTypeEnum.InTray,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam"
};
@@ -1023,15 +1250,15 @@
// 鍒涘缓WMS浠诲姟
WMSTaskDTO taskDTO = new WMSTaskDTO()
{
- TaskNum = 0,
+ TaskNum = task.TaskNum.Value,
Grade = 1,
- PalletCode = DateTime.Now.ToString("MMddHHmmss"),
+ PalletCode = task.PalletCode,
RoadWay = task.Roadway,
- SourceAddress = input.Position,
+ SourceAddress = task.SourceAddress,
TargetAddress = task.Roadway,
- TaskState = (int)TaskInStatusEnum.InNew,
+ TaskState = task.TaskState.Value,
Id = 0,
- TaskType = (int)TaskInboundTypeEnum.Inbound,
+ TaskType = task.TaskType,
};
content.OK(data: taskDTO);
}
@@ -1084,6 +1311,22 @@
{
var minGroup = _locationRepository.QueryData(x => process.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)
.GroupBy(x => x.RoadwayNo)
+ .OrderByDescending(g => g.Count()) // 鏍规嵁姣忎釜缁勭殑鍏冪礌鏁伴噺鎺掑簭
+ .First(); // 鍙栧嚭鏁伴噺鏈�澶氱殑缁�
+
+ string minRoadwayNo = minGroup.Key; // 鏁伴噺鏈�澶氱殑缁勭殑Key
+
+ return minRoadwayNo;
+ }
+
+ /// <summary>
+ /// 鑾峰彇宸烽亾鎴栫珯鍙�
+ /// </summary>
+ /// <returns></returns>
+ public async Task<string> GetRoadWayAsync(int areaCode)
+ {
+ var minGroup = _locationRepository.QueryData(x => x.AreaId == areaCode && x.LocationStatus == (int)LocationEnum.Free)
+ .GroupBy(x => x.RoadwayNo)
.OrderBy(g => g.Count()) // 鏍规嵁姣忎釜缁勭殑鍏冪礌鏁伴噺鎺掑簭
.First(); // 鍙栧嚭鏁伴噺鏈�灏戠殑缁�
--
Gitblit v1.9.3