From 79f9c5df2fa012b1586d5cf18481a11baa6e91be Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期六, 23 十一月 2024 14:31:38 +0800
Subject: [PATCH] 一大堆更改
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 2
/dev/null | 1187 ---------------------------------------------
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/CellState/TrayCellsStatusDto.cs | 5
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 259 ++++-----
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs | 12
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs | 6
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/ResponeAgingInputDto.cs | 50 +
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/AgingOutputDto.cs | 4
8 files changed, 188 insertions(+), 1,337 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
index cf0c290..53b63ee 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -156,7 +156,7 @@
var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
HandleTaskOut(conveyorLine, command, childDeviceCode, ProtocalDetailValue, task);
- if (task == null && command.Barcode != "NoRead")
+ if (task == null && command.Barcode != "NoRead" && !command.Barcode.IsNotEmptyOrNull())
{
HandleNewTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
}
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs
index 778ab8f..fa5f791 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs
@@ -125,6 +125,12 @@
/// </summary>
[Description("绌烘墭鐩樺叆搴�")]
InTray = 204,
+
+ /// <summary>
+ /// NG鍏ュ簱
+ /// </summary>
+ [Description("NG鍏ュ簱")]
+ InNG = 105,
}
public enum TaskOutboundTypeEnum
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/AgingOutputDto.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/AgingOutputDto.cs
index 5693968..8794860 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/AgingOutputDto.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/AgingOutputDto.cs
@@ -38,10 +38,10 @@
/// <summary>
/// 鍙傛暟
/// </summary>
- public List<ParameterInfo> ParameterInfo { get; set; }
+ public List<ParameterInfoOutput> ParameterInfo { get; set; }
}
-public class ParameterInfo
+public class ParameterInfoOutput
{
/// <summary>
/// 鍙傛暟缂栫爜
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/CellState/TrayCellsStatusDto.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/CellState/TrayCellsStatusDto.cs
index 45b9c33..b4970c0 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/CellState/TrayCellsStatusDto.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/CellState/TrayCellsStatusDto.cs
@@ -9,4 +9,9 @@
/// 鎵樼洏缂栧彿
/// </summary>
public string TrayBarcode { get; set; }
+
+ /// <summary>
+ /// 涓婁紶绫诲瀷
+ /// </summary>
+ public string SceneType { get; set; } = "4";
}
\ No newline at end of file
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/ResponeAgingInputDto.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/ResponeAgingInputDto.cs
index 5881e68..f2f7358 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/ResponeAgingInputDto.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/ResponeAgingInputDto.cs
@@ -40,5 +40,55 @@
/// 鍗曚綅
/// </summary>
public string UomCode { get; set; }
+
+ public List<ParameterInfo> ParameterInfos { get; set; }
+ }
+
+ public class ParameterInfo
+ {
+ /// <summary>
+ /// 鍙傛暟绫诲瀷灞炴�э紝瀵瑰簲 "ParameterType"
+ /// </summary>
+ public string ParameterType { get; set; }
+ /// <summary>
+ /// 鐩爣鍊煎睘鎬э紝瀵瑰簲 "TargetValue"
+ /// </summary>
+ public string TargetValue { get; set; }
+ /// <summary>
+ /// 鍗曚綅浠ｇ爜灞炴�э紝瀵瑰簲 "UOMCode"
+ /// </summary>
+ public string UOMCode { get; set; }
+ /// <summary>
+ /// 涓婃帶鍒堕檺灞炴�э紝瀵瑰簲 "UpperControlLimit"
+ /// </summary>
+ public string UpperControlLimit { get; set; }
+ /// <summary>
+ /// 涓嬫帶鍒堕檺灞炴�э紝瀵瑰簲 "LowerControlLimit"
+ /// </summary>
+ public string LowerControlLimit { get; set; }
+ /// <summary>
+ /// 涓婅鏍奸檺灞炴�э紝瀵瑰簲 "UpperSpecificationsLimit"
+ /// </summary>
+ public string UpperSpecificationsLimit { get; set; }
+ /// <summary>
+ /// 涓嬭鏍奸檺灞炴�э紝瀵瑰簲 "LowerSpecificationsLimit"
+ /// </summary>
+ public string LowerSpecificationsLimit { get; set; }
+ /// <summary>
+ /// 璁惧鍙敤鎬ф爣蹇楀睘鎬э紝瀵瑰簲 "EquipmentAvailabilityFlag"
+ /// </summary>
+ public bool EquipmentAvailabilityFlag { get; set; }
+ /// <summary>
+ /// 鎻忚堪灞炴�э紝瀵瑰簲 "Description"
+ /// </summary>
+ public string Description { get; set; }
+ /// <summary>
+ /// 鍙傛暟鐗堟湰灞炴�э紝瀵瑰簲 "ParamVersion"
+ /// </summary>
+ public string ParamVersion { get; set; }
+ /// <summary>
+ /// 鍙傛暟浠ｇ爜灞炴�э紝瀵瑰簲 "ParameterCode"
+ /// </summary>
+ public string ParameterCode { get; set; }
}
}
\ No newline at end of file
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs
index 306b54a..b46fda9 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs
@@ -75,6 +75,18 @@
public DateTime? OutboundTime { get; set; }
/// <summary>
+ /// 鍙傛暟淇℃伅
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍙傛暟淇℃伅")]
+ public string ParameterInfos { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鐘舵��
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "搴撳瓨鐘舵��")]
+ public int StockStatus { get; set; }
+
+ /// <summary>
/// 搴撳瓨鏄庣粏
/// </summary>
[SugarColumn(ColumnName = "StockInfoDetails")]
diff --git "a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService - \345\244\215\345\210\266.cs" "b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService - \345\244\215\345\210\266.cs"
deleted file mode 100644
index 4e6b26b..0000000
--- "a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService - \345\244\215\345\210\266.cs"
+++ /dev/null
@@ -1,1187 +0,0 @@
-锘縰sing log4net.Core;
-using Mapster;
-using Masuit.Tools;
-using Newtonsoft.Json;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-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
-{
- public class Dt_TaskService1 : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
- {
- private readonly LogFactory _logFactory = new LogFactory();
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_OutOrderRepository _outOrderRepository;
- private readonly IStockInfoRepository _stockInfoRepository;
- private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
- private readonly IDt_Task_HtyRepository _task_HtyRepository;
- private readonly IDt_OutOrderAndStockRepository _outOrderAndStockRepository;
- private readonly IDt_OutOrderAndStock_HtyRepository _outOrderAndStock_HtyRepository;
- private readonly IMapper _mapper;
- private readonly IDt_MaterielInfoRepository _materielInfoRepository;
- private readonly ILocationInfoRepository _locationRepository;
- private readonly IDt_WareAreaInfoRepository _wareAreaInfoRepository;
- private readonly IPointStackerRelationRepository _pointStackerRelationRepository;
- private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository;
- private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
- private readonly IBoxingInfoRepository _boxingInfoRepository; // 缁勭洏
- private readonly ICellStateService _cellStateService; // 鐢佃姱灞炴��
- private readonly IProcessApplyService _processApplyService; // 宸ヨ壓璺嚎
- private readonly IDt_AreaInfoRepository _areaInfoRepository; // 鍖哄煙
- private readonly IAgingInOrOutInputService _agingInOrOutInputService; // 闈欑疆/闄堝寲
- private readonly IProductionRepository _productionRepository; // 鐢熶骇
-
- public Dt_TaskService1(IDt_TaskRepository BaseDal,
- IUnitOfWorkManage unitOfWorkManage,
- IDt_OutOrderRepository outOrderRepository,
- IStockInfoRepository stockInfoRepository,
- IDt_OutOrderAndStockRepository dt_OutOrderAndStockRepository,
- IDt_OutOrderAndStock_HtyRepository dt_OutOrderAndStock_HtyRepository,
- IDt_Task_HtyRepository task_HtyRepository,
- IMapper mapper,
- IDt_MaterielInfoRepository materielInfoRepository,
- ILocationInfoRepository locationRepository,
- IDt_WareAreaInfoRepository wareAreaInfoRepository,
- IPointStackerRelationRepository pointStackerRelationRepository,
- ITaskExecuteDetailRepository taskExecuteDetailRepository,
- ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
- IBoxingInfoRepository boxingInfoRepository,
- ICellStateService cellStateService,
- IProcessApplyService processApplyService,
- IDt_AreaInfoRepository areaInfoRepository,
- IAgingInOrOutInputService agingInOrOutInputService,
- IStockInfoDetailRepository stockInfoDetailRepository,
- IProductionRepository productionRepository) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _outOrderRepository = outOrderRepository;
- _stockInfoRepository = stockInfoRepository;
- _outOrderAndStockRepository = dt_OutOrderAndStockRepository;
- _outOrderAndStock_HtyRepository = dt_OutOrderAndStock_HtyRepository;
- _task_HtyRepository = task_HtyRepository;
- _mapper = mapper;
- _materielInfoRepository = materielInfoRepository;
- _locationRepository = locationRepository;
- _wareAreaInfoRepository = wareAreaInfoRepository;
- _pointStackerRelationRepository = pointStackerRelationRepository;
- _taskExecuteDetailRepository = taskExecuteDetailRepository;
- _locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
- _boxingInfoRepository = boxingInfoRepository;
- _cellStateService = cellStateService;
- _processApplyService = processApplyService;
- _areaInfoRepository = areaInfoRepository;
- _agingInOrOutInputService = agingInOrOutInputService;
- _stockInfoDetailRepository = stockInfoDetailRepository;
- _productionRepository = productionRepository;
- }
-
- // 澶栭儴鎺ュ彛鏂规硶
-
- #region 鍑哄簱浠诲姟瀹屾垚
- // 鍑哄簱浠诲姟瀹屾垚
- 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);
- var info = JsonConvert.DeserializeObject<ResponseEqptRunDto>(process.ProcessValue);
-
- var agingOutputDto = MapToAgingOutputDto(stock, info);
- content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
- ValidateResponse(content);
- }
-
- // 鏇存柊搴撳瓨鐘舵�佸拰浠诲姟鐘舵��
- (var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
-
- // 浜嬪姟澶勭悊
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
- await UpdateLocationAsync(loc);
- await DeleteStockInfoAsync(stock.Id);
- await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
- //await DeleteTaskAsync(task.TaskId);
- });
-
- return content.OK("浠诲姟瀹屾垚鎴愬姛");
- }
- catch (Exception err)
- {
- _logFactory.GetLog("浠诲姟瀹屾垚").Error(true, $"绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}");
- return content.Error(err.Message);
- }
- }
-
- // 鏄犲皠鍒拌�佸寲杈撳嚭DTO
- private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, ResponseEqptRunDto info)
- {
- // TODO Value鍊兼牴鎹甅OM涓嬪彂鐨勯潤缃椂闂村埌褰撳墠鏃堕棿鐨勫垎閽熸暟
- return new AgingOutputDto
- {
- OpFlag = 1,
- Software = "WMS",
- EquipmentCode = "ECH001-B",
- TrayBarcode = stock.PalletCode,
- SerialNos = stock.StockInfoDetails.Select(x => new SerialNoOutDto
- {
- SlotNo = x.OrderNo.ToInt32(),
- SerialNo = x.SerialNumber,
- SerialNoResult = true,
- ParameterInfo = info.ParameterInfo.Select(y => new ParameterInfo
- {
- LowerLomit = y.LowerControlLimit,
- UpperLimit = y.UpperControlLimit,
- ParameterResult = y.EquipmentAvailabilityFlag,
- ParameterCode = y.ParameterCode,
- ParameterDesc = y.Description,
- TargetValue = y.TargetValue,
- Value = (DateTime.Parse(stock.LinedProcessFeedbackTime, null, System.Globalization.DateTimeStyles.RoundtripKind).ToLocalTime() - stock.CreateDate).TotalMinutes.ToString(),
- DefectCode = y.UOMCode
- }).ToList()
- }).ToList()
- };
- }
-
- // 楠岃瘉鍝嶅簲鍐呭
- private void ValidateResponse(WebResponseContent content)
- {
- var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.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 = (int)LocationEnum.Free;
- task.TaskState = (int)TaskOutStatusEnum.OutFinish;
- //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<bool> DeleteTaskAsync(int taskId)
- {
- var isTaskUpdated = await BaseDal.DeleteDataByIdAsync(taskId);
- if (!isTaskUpdated)
- {
- throw new Exception("浠诲姟淇℃伅鏇存柊澶辫触");
- }
- return isTaskUpdated;
- }
-
- #region 绉诲簱浠诲姟瀹屾垚
- // 绉诲簱浠诲姟瀹屾垚
- public async Task<WebResponseContent> CompleteTransferTaskAsync(Dt_Task task, DtStockInfo stock)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- // 鏇存柊璐т綅鍜屽簱瀛樹俊鎭�
- (DtStockInfo updateStock, DtLocationInfo locationInf) = UpdateStockLocation(stock, task.NextAddress);
- var taskHty = CreateHistoricalTask(task);
- _logFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庡簱瀛樻暟鎹細{JsonConvert.SerializeObject(updateStock)}锛屽師鍏堣揣浣嶆暟鎹細{locationInf}");
-
- // 鎵ц鏁版嵁搴撲簨鍔�
- bool isResult = await ExecuteTransaction(updateStock, taskHty, locationInf, task.TaskId);
- if (isResult)
- content.OK("绉诲簱浠诲姟瀹屾垚鎴愬姛");
- else
- content.Error("绉诲簱浠诲姟瀹屾垚澶辫触");
- }
- catch (Exception err)
- {
- Console.WriteLine(err.Message.ToString());
- }
- return content;
- }
- #endregion
-
- // 鏇存柊搴撳瓨浣嶇疆
- private (DtStockInfo, DtLocationInfo) UpdateStockLocation(DtStockInfo stock, string toLocation)
- {
- var locationInfo = _locationRepository.QueryFirst(x => x.LocationCode == stock.LocationCode);
- locationInfo.LocationStatus = LocationEnum.InStock.ObjToInt();
-
- stock.LocationCode = toLocation;
- stock.LocationInfo.LocationStatus = LocationEnum.InStock.ObjToInt();
-
- return (stock, locationInfo);
- }
-
- // 鍒涘缓鍘嗗彶浠诲姟璁板綍
- private Dt_Task_Hty CreateHistoricalTask(Dt_Task task)
- {
- task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
- task.CurrentAddress = task.NextAddress;
-
- var taskHty = _mapper.Map<Dt_Task_Hty>(task);
- taskHty.FinishTime = DateTime.Now;
- taskHty.TaskId = 0;
- taskHty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
- taskHty.SourceId = task.TaskId;
- taskHty.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
- return taskHty;
- }
-
- // 鎵ц鏁版嵁搴撲簨鍔�
- private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId)
- {
- _unitOfWorkManage.BeginTran();
- try
- {
- var isUpdateStock = true;
- if (taskHty.TaskType == (int)TaskTypeEnum.Outbound)
- {
- // 鏇存柊搴撳瓨
- isUpdateStock = await _stockInfoRepository.UpdateDataAsync(stock);
- }
- else
- {
- // 娣诲姞搴撳瓨
- isUpdateStock = await _stockInfoRepository.AddDataNavAsync(stock);
- }
-
- // 娣诲姞鍘嗗彶浠诲姟
- var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
-
- // 淇敼绉诲簱鍓嶈揣浣嶇姸鎬�
- var isUpdateLoc = _locationRepository.UpdateData(locationInfo);
-
- // 鍒犻櫎浠诲姟鏁版嵁
- var isTaskDelete = await DeleteTaskAsync(taskId);
-
- // 鎻愪氦鎴栧洖婊氫簨鍔�
- if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc)
- {
- _logFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"浜嬪姟澶勭悊瀹屾垚,鎻愪氦浜嬪姟銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊鎴栨坊鍔犲簱瀛橈細{isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLoc}");
- _unitOfWorkManage.CommitTran();
- return true;
- }
- else
- {
- _logFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"鏁版嵁澶勭悊澶辫触,璇锋鏌ユ暟鎹槸鍚︽纭�,鏁版嵁鍥炴粴銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊搴撳瓨锛歿isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLoc}");
- _unitOfWorkManage.RollbackTran();
- return false;
- }
- }
- catch (Exception err)
- {
- _logFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"绉诲簱浠诲姟瀹屾垚,绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}", "鏃犲弬鏁�");
- _unitOfWorkManage.RollbackTran();
- throw; // 鎶涘嚭寮傚父浠ヤ究澶栭儴鎹曡幏
- }
- }
-
- #endregion
-
- #region 鍏ュ簱浠诲姟瀹屾垚
- // 鍏ュ簱浠诲姟瀹屾垚
- 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 = 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;
- }
-
- // 鍒涘缓绌烘墭鐩樼殑搴撳瓨瀹炰緥妯″瀷
- 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,
- Status = (int)StockStateEmun.宸插叆搴�
- }
- }
- };
- }
-
- // 鍒涘缓瀹炵洏鐨勫簱瀛樺疄渚嬫ā鍨嬪苟璋冪敤MOM鍏ュ簱
- private DtStockInfo CreateFullPalletStock(Dt_Task task, DtLocationInfo locationInf, DtBoxingInfo boxing)
- {
- var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
- boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.宸插叆搴�; });
- 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.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
- stock.SpecialParameterDuration = respone.SpecialParameterDuration;
- //2024骞�11鏈�16鏃ワ細鏂板瀛楁璁＄畻搴斿嚭搴撴椂闂�
- stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
-
- // 璁板綍鏃ュ織
- _logFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
-
- return stock;
- }
- #endregion
-
- #region 瀹屾垚浠诲姟
- // 瀹屾垚浠诲姟
- public async Task<WebResponseContent> CompleteAsync(int taskNum)
- {
- // 鍒濆鍖栧搷搴斿唴瀹�
- WebResponseContent content = new WebResponseContent();
-
- // 鎻愬彇浠诲姟鏁版嵁
- _logFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鎻愬彇浠诲姟鏁版嵁", $"浠诲姟鍙凤細{taskNum}");
-
- // 楠岃瘉浠诲姟鏄惁瀛樺湪
- var task = await GetByTaskNum(taskNum);
- if (task == null)
- {
- return content.Error("浠诲姟涓嶅瓨鍦�");
- }
- _logFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "楠岃瘉浠诲姟鏄惁瀛樺湪", JsonConvert.SerializeObject(task));
-
- // 楠岃瘉搴撳瓨鏄惁瀛樺湪
- var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
-
- // 鏍规嵁浠诲姟绫诲瀷璋冪敤鐩稿簲鐨勫畬鎴愪换鍔℃柟娉�
- switch (task.TaskType)
- {
- case (int)TaskInboundTypeEnum.Inbound:
- case (int)TaskInboundTypeEnum.InTray:
- _logFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟", "");
- return await CompleteInboundTaskAsync(task);
-
- case (int)TaskOutboundTypeEnum.OutTray:
- case (int)TaskOutboundTypeEnum.Outbound:
- _logFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", "");
- return await CompleteStackTaskAsync(task, stock);
-
- default:
- return content.Error("浠诲姟绫诲瀷涓嶅瓨鍦�");
- }
- }
- #endregion
-
- #region 鍏ュ簱浠诲姟璇锋眰
- // 璇锋眰浠诲姟宸烽亾
- public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
- {
- // 鍒涘缓涓�涓猈ebResponseContent瀵硅薄
- WebResponseContent content = new WebResponseContent();
-
- 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);
- }
- }
-
- // 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
- TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
- {
- Software = "WMS",
- TrayBarcode = input.PalletCode,
- //EquipmentCode = "EQ_CWJZ01"
- EquipmentCode = "ECH001-B"
- };
-
- // 璋冪敤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);
-
- // 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 = await CreateBoxingInfo(result, input.PalletCode);
- if (boxing == null) return content.Error("缁勭洏澶辫触");
-
- // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
- ProcessApplyDto process = await GetProcessApplyAsync(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);
-
- List<string> strings = input.Position == "1088" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };
- // 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
- content = await CreateNewTask(input, strings);
- if (content.Status)
- {
- var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
- }
- }
- catch (Exception err)
- {
- // 濡傛灉鍙戠敓寮傚父锛屽垯璋冪敤content.Error鏂规硶锛岃褰曢敊璇俊鎭紝骞惰緭鍑洪敊璇俊鎭�
- content.Error(err.Message);
- Console.WriteLine(err.Message);
- }
-
- // 杩斿洖content
- return content;
- }
-
- // 璇锋眰浠诲姟璐т綅
- public async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
- if (task == null)
- return content.Error($"鏆傛湭鎵惧埌銆恵input.PalletCode}銆戠殑浠诲姟");
-
- return content = await UpdateExistingTask(input, task);
-
- }
- catch (Exception err)
- {
-
- throw;
- }
- }
-
- // 鏇存柊浠诲姟璐т綅
- private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, Dt_Task task)
- {
- if (task == null)
- {
- return new WebResponseContent().Error("浠诲姟瀵硅薄涓虹┖");
- }
-
- try
- {
- // 鍒涘缓WebResponseContent瀵硅薄
- var content = new WebResponseContent();
-
- // 鑾峰彇鐩爣鍦板潃鍜屾洿鏂颁换鍔＄姸鎬�
- var location = await GetLocationDistributeAsync(task.Roadway);
- if (location == null)
- {
- return content.Error("鏃犳硶鑾峰彇璐т綅淇℃伅");
- }
-
- string toAddress = location.LocationCode;
- int taskState = (int)TaskInStatusEnum.Line_InFinish;
- int beforeStatus = location.LocationStatus;
-
- // 鏇存柊璐т綅淇℃伅
- location.LocationStatus = (int)LocationEnum.Lock;
-
- // 鏇存柊浠诲姟淇℃伅
- MapTaskProperties(task, input, toAddress, taskState);
-
- // 寮�濮嬩簨鍔�
- var isResult = await UpdateTaskAsync(task, location, beforeStatus);
- if (!isResult)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error("鏇存柊浠诲姟澶辫触");
- }
-
- // 鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
- return content.OK(data: task);
- }
- catch (Exception ex)
- {
- // 鍥炴粴浜嬪姟
- _unitOfWorkManage.RollbackTran();
- // 杩欓噷鍙互娣诲姞鏃ュ織璁板綍
- return new WebResponseContent().Error($"鏇存柊浠诲姟鏃跺彂鐢熼敊璇�: {ex.Message}");
- }
- }
-
- private void MapTaskProperties(Dt_Task task, RequestTaskDto input, string toAddress, int taskState)
- {
- task.CurrentAddress = input.Position;
- task.TargetAddress = toAddress;
- task.NextAddress = toAddress;
- task.TaskState = taskState;
- }
-
- // 淇敼浠诲姟
- private async Task<bool> UpdateTaskAsync(Dt_Task task, DtLocationInfo location, int beforeStatus)
- {
- bool isResult = await BaseDal.UpdateDataAsync(task);
- bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, task.CurrentAddress, task.TargetAddress, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
-
- LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()
- {
- AfterStatus = location.LocationStatus,
- BeforeStatus = beforeStatus,
- TaskNum = task.TaskNum.Value,
- LocationId = location.Id,
- LocationCode = location.LocationCode,
- ChangeType = (int)StatusChangeTypeEnum.AutomaticStorage,
- };
-
- bool isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
- bool isUpdateLo = await _locationRepository.UpdateDataAsync(location);
-
- return isResult && isUpdateLo && isTaskDetail;
- }
-
- // 鑾峰彇璐т綅
- public async Task<DtLocationInfo> GetLocationDistributeAsync(string roadWay, bool IsFull = true)
- {
- #region 鑾峰彇璐т綅
-
- try
- {
- List<DtLocationInfo> locations;
- if (IsFull)
- {
- locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
- }
- else
- {
- locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
- }
-
- if (locations == null)
- {
- return null;
- }
-
- return locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
- }
- catch (Exception err)
- {
- Console.WriteLine(err.Message.ToString());
- return null;
- }
-
- #endregion 鑾峰彇璐т綅
- }
- #endregion
-
- #region 绌烘墭鐩樺叆搴�
- // 绌烘墭鐩樺叆搴撶敵璇�
- 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);
- }
-
- // 鑾峰彇鐩爣鍦板潃
- List<string> strings = input.Position == "1016" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };
-
- return await CreateNewTask(input, strings, 1);
- //return await CreateNewTask(input, null, 1);
- }
- catch (Exception)
- {
-
- throw;
- }
- }
-
- // 鍒涘缓鏂颁换鍔�
- private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, List<string> process = null, int flag = 0)
- {
- var content = new WebResponseContent();
-
- if (input == null)
- {
- return content.Error("杈撳叆鍙傛暟鏃犳晥");
- }
-
- try
- {
- // 鑾峰彇鐩爣鍦板潃
- string toAddress = await GetRoadWayAsync(input, process);
-
- // 鍒涘缓鏂颁换鍔″疄渚�
- var task = new Dt_Task
- {
- CurrentAddress = input.Position,
- Grade = 1,
- Roadway = toAddress,
- TargetAddress = toAddress,
- Dispatchertime = DateTime.Now,
- MaterialNo = string.Empty,
- NextAddress = toAddress,
- OrderNo = null,
- PalletCode = input.PalletCode,
- SourceAddress = input.Position,
- TaskState = (int)TaskInStatusEnum.InNew,
- TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : (int)TaskInboundTypeEnum.InTray,
- TaskNum = await BaseDal.GetTaskNo(),
- Creater = "System" // 淇鎷煎啓閿欒
- };
-
- // 灏濊瘯娣诲姞鏂颁换鍔�
- var taskId = await BaseDal.AddDataAsync(task);
- if (taskId <= 0)
- {
- return content.Error("娣诲姞浠诲姟澶辫触");
- }
-
- task.TaskId = taskId;
-
- // 娣诲姞浠诲姟鎵ц璇︽儏
- bool detailAdded = await _taskExecuteDetailRepository.AddDetailAsync(
- task,
- false,
- TaskDescription.GetTaskUpdateDescription(input.PalletCode, input.Position, toAddress, TaskInStatusEnum.InNew.GetIntegralRuleTypeEnumDesc())
- );
-
- if (!detailAdded)
- {
- return content.Error("娣诲姞浠诲姟鎵ц璇︽儏澶辫触");
- }
-
- // 鍒涘缓WMS浠诲姟
- var taskDTO = new WMSTaskDTO
- {
- TaskNum = task.TaskNum.Value,
- Grade = task.Grade.Value,
- 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);
- }
- catch (Exception ex)
- {
- // 杩欓噷鍙互娣诲姞鏃ュ織璁板綍
- return content.Error($"鍒涘缓浠诲姟鏃跺彂鐢熼敊璇�: {ex.Message}");
- }
- }
-
- // 鑾峰彇宸烽亾鎴栫珯鍙�
- public async Task<string> GetRoadWayAsync(RequestTaskDto input, List<string> process)
- {
- 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;
- }
-
- // 鑾峰彇鎵樼洏鍗曞厓鏍肩姸鎬�
- private async Task<WebResponseContent> GetTrayCellStatusAsync(TrayCellsStatusDto trayCells)
- {
- // 璋冪敤_cellStateService.GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨墭鐩樺崟鍏冩牸鐘舵��
- return await _cellStateService.GetTrayCellStatusAsync(trayCells);
- }
-
- // 鑾峰彇缁勭洏淇℃伅
- private async Task<DtBoxingInfo> CreateBoxingInfo(ResultTrayCellsStatus result, string palletCode)
- {
- return new DtBoxingInfo
- {
- PalletCode = palletCode,
- IsFull = true,
- BoxingInfoDetails = result.SerialNos.Select(serialNoObj => new DtBoxingInfoDetail
- {
- SerialNumber = serialNoObj.SerialNo,
- OrderNo = serialNoObj.PositionNo.ToString(),
- Status = serialNoObj.SerialNoStatus,
- MaterielCode = result.BindCode,
- Remark = result.TrayBarcodePropertys.ToJsonString(),
- }).ToList()
- };
- }
-
- // 鑾峰彇宸ヨ壓鐢宠
- private async Task<ProcessApplyDto> GetProcessApplyAsync(ResultTrayCellsStatus content)
- {
- // 鍒涘缓涓�涓狿rocessApplyDto瀵硅薄锛屽苟璧嬪��
- return new ProcessApplyDto()
- {
- EquipmentCode = "ECH001-B",
- Software = "WMS",
- //WipOrderNo = result.BindCode,
- SerialNos = content.SerialNos.Select(item => new SerialNos
- {
- SerialNo = item.SerialNo
- }).ToList()
- };
- }
-
- // 鑾峰彇宸ヨ壓鍝嶅簲
- private async Task<List<Dt_EquipmentProcess>> GetProcessResponseAsync(ProcessApplyDto process, string position)
- {
- // 濡傛灉process涓簄ull锛屽垯杩斿洖null
- if (process == null) return null;
-
- // 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
- WebResponseContent content = await _processApplyService.GetProcessApplyAsync(process);
- // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
- if (!content.Status) return null;
-
- // 灏哻ontent.Data杞崲涓篟esultProcessApply瀵硅薄
- var apply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
- // 鏍规嵁position鐨勫�硷紝杩斿洖涓嶅悓鐨凞t_EquipmentProcess鍒楄〃
- switch (position)
- {
- case "1088":
- return SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
- .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)
- .ToList();
-
- default:
- return new List<Dt_EquipmentProcess>();
- }
- }
- #endregion
-
- #region 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
- // 璇锋眰鎵樼洏浠诲姟
- public async Task<WebResponseContent> RequestTrayOutTaskAsync(string position, int tag, string areaCode, List<string> roadways)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- // 鏍规嵁鎵樼洏绫诲瀷鏌ヨ搴撳瓨淇℃伅
- DtStockInfo stockInfo = tag == (int)TaskOutboundTypeEnum.Outbound
- ? QueryStockInfoForRealTrayAsync(areaCode, roadways).Result
- : QueryStockInfoForEmptyTrayAsync(areaCode, roadways).Result;
-
- if (stockInfo == null)
- {
- return content.Error("搴撳瓨淇℃伅涓嶅瓨鍦�");
- }
-
- // 鏂板閲嶅浠诲姟鏍￠獙
- var hasTask = BaseDal.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
- if (hasTask != null)
- {
- WMSTaskDTO taskDTO1 = CreateTaskDTO(hasTask);
- return content.OK("宸插瓨鍦ㄧ┖鐩樺嚭搴撲换鍔�", data: taskDTO1);
- }
-
- // 鍒涘缓鏂颁换鍔″疄渚�
- var task = CreateTask(stockInfo, position, tag);
- var taskId = await BaseDal.AddDataAsync(task);
- bool isResult = taskId > 0;
- if (!isResult)
- {
- return content.Error("浠诲姟鍒涘缓澶辫触");
- }
-
- // 鍒涘缓浠诲姟DTO
- WMSTaskDTO taskDTO = CreateTaskDTO(task);
- //if (tag == 1)
- {
- // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
- stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
- await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
- }
-
- // 杩斿洖鎴愬姛鍝嶅簲
- return content.OK(data: taskDTO);
- }
- catch (Exception ex)
- {
- // 璁板綍寮傚父淇℃伅骞舵姏鍑�
- _logFactory.GetLog("璇锋眰鎵樼洏浠诲姟").Error(true, ex);
- return content.Error(ex.Message);
- }
- }
-
- // 鏌ヨ瀹炵洏搴撳瓨淇℃伅
- private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> roadways)
- {
- // TODO鏃堕棿鏍规嵁MOM绯荤粺閰嶇疆鐨勫嚭搴撴椂闂存潵鑾峰彇,鏆傛椂涓嶇煡閬揗OM杩斿洖鐨勬椂闂存槸浠�涔堟墍浠ヨ繖閲屾祴璇曟椂鍊欏湪鏀�
- var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>().Where(x =>
- x.AreaCode == areaCode &&
- Convert.ToDateTime(x.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(x.SpecialParameterDuration)) < DateTime.Now)
- .Includes(x => x.LocationInfo)
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && roadways.Contains(x.LocationInfo.RoadwayNo))
- .Includes(x => x.StockInfoDetails)
- .Where(x => x.StockInfoDetails.Any(detail => detail.Status == (int)StockStateEmun.宸插叆搴�))
- .OrderBy(x => x.CreateDate)
- .FirstAsync();
- return result;
- }
-
- // 鏌ヨ绌虹洏搴撳瓨淇℃伅
- private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode, List<string> roadways)
- {
- var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Includes(x => x.LocationInfo)
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && roadways.Contains(x.LocationInfo.RoadwayNo))
- .Includes(x => x.StockInfoDetails)
- .Where(x => x.StockInfoDetails.Any(detail => detail.Status == (int)StockStateEmun.宸插叆搴� && detail.MaterielCode == "绌烘墭鐩�"))
- .OrderBy(x => x.CreateDate)
- .FirstAsync();
- return result;
- }
-
- // 鍒涘缓浠诲姟瀹炰緥
- 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" // 淇鎷煎啓閿欒
- };
- }
-
- // 鍒涘缓浠诲姟DTO
- 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("鏈壘鍒颁换鍔�");
-
- if (taskState == (int)TaskOutStatusEnum.Line_OutFinish || taskState == (int)TaskOutStatusEnum.SC_OutFinish)
- {
- var taskHty = CreateHistoricalTask(task);
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
- var asb = await BaseDal.DeleteDataByIdAsync(task.TaskId);
- var asbHty = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
- if (asb && asbHty)
- content.OK();
- else
- throw new Exception();
- });
- content.OK();
- }
- else
- {
- 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
-
- #region 鍑哄簱瑙ｇ洏
- // 鍑哄簱瑙ｇ洏鎺ュ彛
- public async Task<WebResponseContent> OutUnblockInterface(int taskNum)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var task = await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);
- if (task == null)
- return content.Error("鏈壘鍒颁换鍔�");
- task.TaskState = (int)TaskOutStatusEnum.Line_OutFinish;
- var taskHty = CreateHistoricalTask(task);
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- #endregion
-
- #region 鍐呴儴璋冪敤鏂规硶
-
- // 鍒涘缓涓�涓柊鐨勪换鍔�
- public async Task<Dt_Task> Create(Dt_Task model)
- {
- return await BaseDal.Create(model);
- }
-
- // 鎵归噺鍒涘缓浠诲姟
- public async Task<bool> Create(List<Dt_Task> models)
- {
- return await BaseDal.Create(models);
- }
-
- // 鍒犻櫎涓�涓换鍔�
- public async Task<bool> Delete(int id)
- {
- return await BaseDal.Delete(id);
- }
-
- // 鎵归噺鍒犻櫎浠诲姟
- public async Task<bool> Delete(List<int> ids)
- {
- return await BaseDal.Delete(ids);
- }
-
- // 閫氳繃ID鑾峰彇浠诲姟
- public async Task<Dt_Task> GetById(int id)
- {
- return await BaseDal.GetById(id);
- }
-
- // 鑾峰彇鎵�鏈変换鍔″垪琛�
- public async Task<List<Dt_Task>> GetList()
- {
- return await BaseDal.GetList();
- }
-
- // 鏍规嵁鍑哄簱璁㈠崟ID鑾峰彇浠诲姟鍒楄〃
- public async Task<List<Dt_Task>> GetListByOutOrder(int outOrderId)
- {
- return await BaseDal.GetListByOutOrder(outOrderId);
- }
-
- // 鏍规嵁鍑哄簱璁㈠崟ID鍜岀姸鎬佽幏鍙栦换鍔″垪琛�
- public async Task<List<Dt_Task>> GetListByOutOrderAndStatus(int outOrderId, int status)
- {
- return await BaseDal.GetListByOutOrderAndStatus(outOrderId, status);
- }
-
- // 鏍规嵁鐘舵�佽幏鍙栦换鍔″垪琛�
- public async Task<List<Dt_Task>> GetListByStatus(int status)
- {
- return await BaseDal.GetListByStatus(status);
- }
-
- // 鏇存柊涓�涓换鍔�
- public async Task<bool> Update(Dt_Task model)
- {
- return await BaseDal.UpdateDataAsync(model);
- }
-
- // 鎵归噺鏇存柊浠诲姟
- public async Task<bool> Update(List<Dt_Task> models)
- {
- return await BaseDal.UpdateDataAsync(models);
- }
-
- // 妫�鏌ヤ换鍔℃槸鍚﹀瓨鍦�
- public bool IsExist(string palletCode)
- {
- return Db.Queryable<Dt_Task>().Any(x => x.PalletCode == palletCode);
- }
-
- // 鏍规嵁璐т綅ID鑾峰彇浠诲姟
- public async Task<Dt_Task> GetByLocation(string locationID)
- {
- return await Db.Queryable<Dt_Task>().Where(x => x.SourceAddress == locationID).FirstAsync();
- }
-
- // 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔�
- public async Task<Dt_Task> GetByTaskNum(int taskNum)
- {
- return await Db.Queryable<Dt_Task>().Where(x => x.TaskNum == taskNum).FirstAsync();
- }
- #endregion
- }
-}
\ No newline at end of file
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 0fb68e6..fa3ef06 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
@@ -2,6 +2,8 @@
using Mapster;
using Masuit.Tools;
using Masuit.Tools.Models;
+using System.Linq;
+using System.Threading.Tasks;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
using WIDESEA_IStorageBasicRepository;
@@ -131,6 +133,13 @@
{
throw new Exception("鏈壘鍒板搴旂殑搴撳尯淇℃伅");
}
+
+ var parameterInfo = JsonConvert.DeserializeObject<List<ParameterInfo>>(stock.ParameterInfos).FirstOrDefault(y => y.Description.Contains("鏃堕棿"));
+ if (parameterInfo == null) throw new Exception("");
+
+ var outHours = (DateTime.Now - stock.OutboundTime.Value).TotalHours;
+ var isNG = outHours > parameterInfo.LowerSpecificationsLimit.ToDouble() && outHours < parameterInfo.UpperSpecificationsLimit.ToDouble();
+
return new AgingOutputDto
{
OpFlag = 1,
@@ -142,18 +151,17 @@
SlotNo = x.OrderNo.ToInt32(),
SerialNo = x.SerialNumber,
SerialNoResult = true,
- ParameterInfo = new List<ParameterInfo> { new ParameterInfo() { Value = (DateTime.Now - stock.CreateDate).TotalMinutes.ToString() } }
- //ParameterInfo = info.ParameterInfo.Select(y => new ParameterInfo()
- //{
- // LowerLomit = y.LowerControlLimit,
- // UpperLimit = y.UpperControlLimit,
- // ParameterResult = y.EquipmentAvailabilityFlag,
- // ParameterCode = y.ParameterCode,
- // ParameterDesc = y.Description,
- // TargetValue = y.TargetValue,
- // Value = (DateTime.Parse(stock.LinedProcessFeedbackTime, null, System.Globalization.DateTimeStyles.RoundtripKind).ToLocalTime() - stock.CreateDate).TotalMinutes.ToString(),
- // DefectCode = y.UOMCode
- //}).ToList()
+ ParameterInfo = new List<ParameterInfoOutput> {
+ new ParameterInfoOutput() {
+ Value = outHours.ToString(),
+ ParameterCode =parameterInfo.ParameterCode,
+ ParameterDesc = parameterInfo.Description,
+ ParameterResult = isNG.ToString(),
+ TargetValue = parameterInfo.TargetValue,
+ LowerLomit = parameterInfo.LowerSpecificationsLimit,
+ UpperLimit = parameterInfo.UpperSpecificationsLimit,
+ }
+ }
}).ToList()
};
}
@@ -266,6 +274,27 @@
WebResponseContent content = new WebResponseContent();
try
{
+ if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
+ {
+ task.TaskState = (int)TaskInStatusEnum.SC_InFinish;
+ // 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
+ var taskHtyNG = CreateHistoricalTask(task);
+
+ // 鎵ц鏁版嵁搴撲簨鍔�
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+
+ // 娣诲姞鍘嗗彶浠诲姟
+ var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHtyNG) > 0;
+
+ // 鍒犻櫎浠诲姟鏁版嵁
+ var isTaskDelete = await Delete(task.TaskId);
+ if (!isTaskHtyAdd || !isTaskDelete)
+ throw new Exception("娣诲姞澶辫触");
+ });
+ return content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
+ }
+
// 鑾峰彇瑁呯淇℃伅鍜岀洰鏍囦綅缃俊鎭�
var boxing = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
@@ -371,6 +400,8 @@
//2024骞�11鏈�16鏃ワ細鏂板瀛楁璁＄畻搴斿嚭搴撴椂闂�
stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
stock.ProductionLine = respone.ProductionLine;
+ stock.ParameterInfos = respone.ParameterInfos.ToJsonString();
+ stock.StockStatus = 1;
// 璁板綍鏃ュ織
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
@@ -463,6 +494,13 @@
}
}
+
+ var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode && x.IsFull);
+ if (stock != null)
+ {
+ // TODO璐ㄦ鍥炲簱
+ }
+
var area = await _areaInfoRepository.QueryFirstAsync(x => x.Spare1.Contains(input.Position));
if (area == null)
return content.Error("鏀圭偣浣嶄笉鍦ㄥ尯鍩熷垪琛ㄤ腑瀛樺湪");
@@ -484,8 +522,25 @@
// 娣诲姞缁勭洏淇℃伅
// 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
- if (result.SerialNos.Count <= 0)
+ if (!result.Success)
return content.Error(result.MOMMessage);
+
+ // 鑾峰彇寮傚父鐢佃姱
+ var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
+ if (serialNosError.Count > 0)
+ {
+ // TODO 鍒涘缓浠诲姟閫佽嚦NG鎺掑嚭鍙�
+ List<string> NGStation = input.Position == "1088" ? new List<string>() { "1020" } : new List<string>() { "JZSC01" };
+ content = await CreateNewTask(input, NGStation, 2);
+ return content.Error("瀛樺湪寮傚父鐢佃姱");
+ }
+
+ if (result.SerialNos.Count <= 0)
+ {
+ // Todo 绌烘墭鐩樺叆搴撻�昏緫
+ content = await RequestTrayInTaskAsync(input);
+ return content;
+ }
// TODO 鑾峰彇鏈湴鏂欐灞炴�т笌鏁寸洏鐢佃姱灞炴�ц幏鍙栫殑鍊艰繘琛屽姣旓紝濡傛灉涓�鑷村垯缁х画锛屽惁鍒欒繑鍥為敊璇俊鎭�
//var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));
@@ -596,7 +651,6 @@
List<string> strings = input.Position == "1016" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };
return await CreateNewTask(input, strings, 1);
- //return await CreateNewTask(input, null, 1);
}
catch (Exception)
{
@@ -642,38 +696,6 @@
SerialNo = item.SerialNo
}).ToList()
};
- }
-
- // 鑾峰彇宸ヨ壓鍝嶅簲
- private async Task<List<Dt_EquipmentProcess>> GetProcessResponseAsync(ProcessApplyDto process, string position)
- {
- // 濡傛灉process涓簄ull锛屽垯杩斿洖null
- if (process == null) return null;
-
- // 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
- WebResponseContent content = await _processApplyService.GetProcessApplyAsync(process);
- // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
- if (!content.Status) return null;
-
- // 灏哻ontent.Data杞崲涓篟esultProcessApply瀵硅薄
- var apply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
- // 鏍规嵁position鐨勫�硷紝杩斿洖涓嶅悓鐨凞t_EquipmentProcess鍒楄〃
- switch (position)
- {
- case "1088":
- return SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
- .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)
- .ToList();
-
- default:
- return new List<Dt_EquipmentProcess>();
- }
}
#endregion 璇锋眰浠诲姟鍏ュ簱
@@ -1191,80 +1213,6 @@
#region 浠诲姟璇锋眰鏂规硶
- /// <summary>
- /// 鏇存柊鐜版湁浠诲姟
- /// </summary>
- /// <param name="input">璇锋眰妯″瀷</param>
- /// <param name="areaId">鍖哄煙ID</param>
- /// <param name="task">浠诲姟瀹炰緥</param>
- /// <param name="content">鍝嶅簲鍐呭</param>
- /// <returns></returns>
- //private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, Dt_Task task)
- //{
- // // 鍒涘缓WebResponseContent瀵硅薄
- // WebResponseContent content = new WebResponseContent();
- // // 瀹氫箟鍙橀噺
- // string toAddress;
- // int taskState;
- // string original = task.CurrentAddress;
- // DtLocationInfo location = new DtLocationInfo();
- // int beforeStatus = 0;
-
- // // 澶勭悊鍏ュ簱浠诲姟
- // location = await GetLocationDistributeAsync(task.Roadway);
- // toAddress = location.LocationCode;
- // taskState = (int)TaskInStatusEnum.Line_InFinish;
- // beforeStatus = location.LocationStatus;
-
- // // 鏇存柊璐т綅淇℃伅
- // location.LocationStatus = (int)LocationEnum.Lock;
-
- // // 鏇存柊浠诲姟淇℃伅
- // task.CurrentAddress = input.Position;
- // task.TargetAddress = toAddress;
- // task.NextAddress = toAddress;
- // task.TaskState = taskState;
-
- // // 寮�濮嬩簨鍔�
- // _unitOfWorkManage.BeginTran();
- // // 瀹氫箟鍙橀噺
- // bool isUpdateLo = true;
- // bool isUpdateChange = true;
-
- // // 灏濊瘯鏇存柊浠诲姟
- // bool isResult = await BaseDal.UpdateDataAsync(task);
- // bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, original, input.Position, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
-
- // // 鍒涘缓LocationChangeRecordDto瀵硅薄
- // LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()
- // {
- // // 璁剧疆鍙橀噺
- // AfterStatus = location.LocationStatus,
- // BeforeStatus = beforeStatus,
- // TaskNum = task.TaskNum.Value,
- // LocationId = location.Id,
- // LocationCode = location.LocationCode,
- // ChangeType = (int)StatusChangeTypeEnum.AutomaticStorage,
- // };
- // // 鏇存柊浣嶇疆鐘舵��
- // isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
- // isUpdateLo = await _locationRepository.UpdateDataAsync(location);
-
- // if (isResult && isUpdateLo && isTaskDetail)
- // {
- // // 鎻愪氦浜嬪姟
- // _unitOfWorkManage.CommitTran();
- // content.OK(data: task);
- // }
- // else
- // {
- // // 鍥炴粴浜嬪姟
- // _unitOfWorkManage.RollbackTran();
- // content.Error("鏇存柊浠诲姟澶辫触");
- // }
- // return content;
- //}
-
// 鏇存柊浠诲姟璐т綅
private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, Dt_Task task)
@@ -1280,33 +1228,46 @@
var content = new WebResponseContent();
// 鑾峰彇鐩爣鍦板潃鍜屾洿鏂颁换鍔＄姸鎬�
- var location = await GetLocationDistributeAsync(task.Roadway);
- if (location == null)
+ if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
{
- return content.Error("鏃犳硶鑾峰彇璐т綅淇℃伅");
+ // TODO 鏍规嵁宸烽亾鏌ユ壘瀵瑰簲NG鍙ｏ紝鐜板湪榛樿鍘婚潤缃爢鍨涙満鐨勫紓甯稿彛璐т綅鍙�
+ task.CurrentAddress = input.Position;
+ task.TargetAddress = "002-021-000";
+ task.NextAddress = "002-021-000";
+ task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+ bool isResult = await BaseDal.UpdateDataAsync(task);
+ return content.OK(data: task);
+ }
+ else
+ {
+ var location = await GetLocationDistributeAsync(task.Roadway);
+ if (location == null)
+ {
+ return content.Error("鏃犳硶鑾峰彇璐т綅淇℃伅");
+ }
+
+ string toAddress = location.LocationCode;
+ int taskState = (int)TaskInStatusEnum.Line_InFinish;
+ int beforeStatus = location.LocationStatus;
+ // 鏇存柊璐т綅淇℃伅
+ location.LocationStatus = (int)LocationEnum.Lock;
+
+ // 鏇存柊浠诲姟淇℃伅
+ MapTaskProperties(task, input, toAddress, taskState);
+
+ // 寮�濮嬩簨鍔�
+ var isResult = await UpdateTaskAsync(task, location, beforeStatus);
+ if (!isResult)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content.Error("鏇存柊浠诲姟澶辫触");
+ }
+
+ // 鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
+ return content.OK(data: task);
}
- string toAddress = location.LocationCode;
- int taskState = (int)TaskInStatusEnum.Line_InFinish;
- int beforeStatus = location.LocationStatus;
-
- // 鏇存柊璐т綅淇℃伅
- location.LocationStatus = (int)LocationEnum.Lock;
-
- // 鏇存柊浠诲姟淇℃伅
- MapTaskProperties(task, input, toAddress, taskState);
-
- // 寮�濮嬩簨鍔�
- var isResult = await UpdateTaskAsync(task, location, beforeStatus);
- if (!isResult)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error("鏇存柊浠诲姟澶辫触");
- }
-
- // 鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
- return content.OK(data: task);
}
catch (Exception ex)
{
@@ -1360,7 +1321,11 @@
// 鑾峰彇鐩爣鍦板潃
//string ToAddress = await GetRoadWayAsync(process);
- string ToAddress = await GetRoadWayAsync(input, process);
+ string ToAddress = string.Empty;
+ if (flag != 2)
+ ToAddress = await GetRoadWayAsync(input, process);
+ else
+ ToAddress = process[0];
// 鍒涘缓鏂颁换鍔″疄渚�
var task = new Dt_Task
@@ -1376,7 +1341,7 @@
PalletCode = input.PalletCode,
SourceAddress = input.Position,
TaskState = (int)TaskInStatusEnum.InNew,
- TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : (int)TaskInboundTypeEnum.InTray,
+ TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : flag == 1 ? (int)TaskInboundTypeEnum.InTray : (int)TaskInboundTypeEnum.InNG,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam"
};
@@ -1398,7 +1363,7 @@
PalletCode = task.PalletCode,
RoadWay = task.Roadway,
SourceAddress = task.SourceAddress,
- TargetAddress = task.Roadway,
+ TargetAddress = task.TargetAddress,
TaskState = task.TaskState.Value,
Id = 0,
TaskType = task.TaskType,
--
Gitblit v1.9.3