From a07e4702be045efa9b04b49a561463875dd28e0a Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期六, 04 一月 2025 16:18:33 +0800
Subject: [PATCH] 更新配置文件和事件总线逻辑，修复任务处理逻辑

---
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 1597 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 1,246 insertions(+), 351 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 0fb68e6..3b6a326 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,33 +1,31 @@
-锘縰sing log4net.Core;
+锘縰sing AngleSharp.Dom;
+using log4net.Core;
 using Mapster;
 using Masuit.Tools;
-using Masuit.Tools.Models;
+using SixLabors.Fonts.Tables.AdvancedTypographic;
+using System.Diagnostics;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using WIDESEA_Core.Const;
 using WIDESEA_DTO.MOM;
 using WIDESEA_DTO.WMS;
-using WIDESEA_IStorageBasicRepository;
+using WIDESEA_IServices;
 using WIDESEA_IStoragIntegrationServices;
-using WIDESEA_Model.Models;
 using WIDESEA_StorageBasicRepository;
-using WIDESEA_StorageTaskRepository;
 using WIDESEA_StoragIntegrationServices;
+using WIDESEAWCS_BasicInfoRepository;
 
-namespace WIDESEA_StorageOutTaskServices;
+namespace WIDESEA_StorageTaskServices;
 
 public partial class Dt_TaskService : 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; //缁勭洏
@@ -35,20 +33,16 @@
     private readonly IProcessApplyService _processApplyService; //宸ヨ壓璺嚎
     private readonly IDt_AreaInfoRepository _areaInfoRepository; //鍖哄煙
     private readonly IAgingInOrOutInputService _agingInOrOutInputService; //闈欑疆\闄堝寲
-    private readonly IProductionRepository _productionRepository; //鐢熶骇
+    private readonly IDt_StationManagerRepository _stationManagerRepository;
+    private readonly ISys_ConfigService _configService;
 
     public Dt_TaskService(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,
@@ -57,19 +51,14 @@
                                 IDt_AreaInfoRepository areaInfoRepository,
                                 IAgingInOrOutInputService agingInOrOutInputService,
                                 IStockInfoDetailRepository stockInfoDetailRepository,
-                                IProductionRepository productionRepository) : base(BaseDal)
+                                IDt_StationManagerRepository stationManagerRepository,
+                                ISys_ConfigService configService) : 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;
@@ -78,13 +67,13 @@
         _areaInfoRepository = areaInfoRepository;
         _agingInOrOutInputService = agingInOrOutInputService;
         _stockInfoDetailRepository = stockInfoDetailRepository;
-        _productionRepository = productionRepository;
+        _stationManagerRepository = stationManagerRepository;
+        _configService = configService;
     }
 
     #region 澶栭儴鎺ュ彛鏂规硶
 
     #region 鍑哄簱浠诲姟瀹屾垚
-
 
     public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task, DtStockInfo stock)
     {
@@ -93,28 +82,134 @@
         {
             if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
             {
+                #region 鑰佺増鏈�
                 //var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
                 //    .FirstAsync(x => x.EquipmentName == task.Roadway);
                 //var info = JsonConvert.DeserializeObject<ResponseEqptRunDto>(process.ProcessValue);
+                //if (!task.Roadway.Contains("FR") && stock.ProcessCode != "OCVB")  //闈炲垎瀹瑰簱鍖轰笌褰撳墠宸ュ簭鏄疧CVB鍧囦笂鎶OM鍑哄叆绔�
+                //{
+                //    var agingOutputDto = MapToAgingOutputDto(stock);
+                //    content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
+                //    //ValidateResponse(content);
+                //    var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
+                //    if (!result.Success || !agingOutputDto.SerialNos[0].SerialNoResult)
+                //    {
+                //        if (result.MessageCode == "E10001")
+                //        {
+                //            var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == stock.AreaCode);
+                //            if (area == null)
+                //            {
+                //                throw new Exception("鏈壘鍒板搴旂殑搴撳尯淇℃伅");
+                //            }
+                //            var trayCells = new TrayCellsStatusDto()
+                //            {
+                //                Software = area.Spare3,
+                //                TrayBarcode = task.PalletCode,
+                //                EquipmentCode = area.Spare2,
+                //                SceneType = area.Spare4
+                //            };
+                //            content = await _cellStateService.GetTrayCellStatusAsync(trayCells);
+                //            if (!content.Status) return content;
 
-                var agingOutputDto = MapToAgingOutputDto(stock);
-                content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
-                ValidateResponse(content);
+                //            var ResultTray = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+                //            if (ResultTray.SerialNos.Count > 0)
+                //            {
+                //                var parameterInfo = JsonConvert.DeserializeObject<List<ParameterInfo>>(stock.ParameterInfos).FirstOrDefault(y => y.Description.Contains("鏃堕棿"));
+                //                if (parameterInfo == null) throw new Exception("");
+
+                //                var outHours = (DateTime.Now - (stock.LinedProcessFeedbackTime == null ? stock.CreateDate : stock.LinedProcessFeedbackTime.ToDateTime())).TotalHours;
+
+                //                var isNG = outHours > parameterInfo.LowerSpecificationsLimit.ToDouble() && outHours < parameterInfo.UpperSpecificationsLimit.ToDouble();
+
+                //                var defectCode = string.Empty;
+                //                if (!isNG) defectCode = "TQCK";
+                //                var outputDto = new AgingOutputDto
+                //                {
+                //                    OpFlag = 1,
+                //                    Software = area.Spare3,
+                //                    EquipmentCode = area.Spare2,
+                //                    TrayBarcode = stock.PalletCode,
+                //                    SerialNos = ResultTray.SerialNos.Select(x => new SerialNoOutDto
+                //                    {
+                //                        SlotNo = x.PositionNo,
+                //                        SerialNo = x.SerialNo,
+                //                        SerialNoResult = true, //isNG,
+                //                        ParameterInfo = new List<ParameterInfoOutput> {
+                //                            new ParameterInfoOutput() {
+                //                                Value = outHours.ToString(),
+                //                                ParameterCode =parameterInfo.ParameterCode,
+                //                                ParameterDesc = parameterInfo.Description,
+                //                                ParameterResult  = "OK", //isNG.ToString(),
+                //                                TargetValue = parameterInfo.TargetValue,
+                //                                LowerLomit = parameterInfo.LowerSpecificationsLimit,
+                //                                UpperLimit = parameterInfo.UpperSpecificationsLimit,
+                //                                DefectCode = defectCode,
+                //                                UOMCode = parameterInfo.UOMCode,
+                //                            }
+                //                        }
+                //                    }).ToList()
+                //                };
+
+                //                content = await _agingInOrOutInputService.GetOCVOutputAsync(outputDto);
+                //                result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
+                //                if (!result.Success)
+                //                    task.Remark = "NG";
+                //            }
+                //        }
+                //        else
+                //            task.Remark = "NG";
+                //    }
+                //}
+                #endregion 鑰佺増鏈�
+
+                if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+                {
+                    if (!task.Roadway.Contains("FR") && stock.ProcessCode != "OCVB")
+                    {
+                        var agingOutputDto = MapToAgingOutputDto(stock);
+                        content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
+
+                        if (content.Status)
+                        {
+                            var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
+                            task.Remark = result.Success ? null : "NG";
+
+                            if (!result.Success && result.MessageCode == "E10001")
+                            {
+                                await HandleOutBoundError(stock, task);
+                            }
+                        }
+                        else
+                        {
+                            task.Remark = "NG";
+                        }
+                    }
+                }
             }
 
             // 鏇存柊搴撳瓨鐘舵�佸拰浠诲姟鐘舵��
             (var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
+            var taskHty = task.Adapt<Dt_Task_Hty>();
+            taskHty.FinishTime = DateTime.Now;
+
+            DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
+            stockInfo_Hty.ModifyDate = DateTime.Now;
 
             // 浜嬪姟澶勭悊
             await _unitOfWorkManage.UseTranAsync(async () =>
             {
+                if (task.TaskType != (int)TaskOutboundTypeEnum.OutQuality)
+                {
+                    await DeleteStockInfoAsync(stock.Id);
+                    await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
+                    await AddStockInfoHtyAsync(stockInfo_Hty);
+                }
                 await UpdateLocationAsync(loc);
-                await DeleteStockInfoAsync(stock.Id);
-                await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
-                //await DeleteTaskAsync(task.TaskId);
+                await DeleteTaskAsync(task.TaskId);
+                await AddTaskHtyAsync(taskHty);
             });
 
-            return content.OK("浠诲姟瀹屾垚鎴愬姛");
+            return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
         }
         catch (Exception err)
         {
@@ -131,6 +226,25 @@
         {
             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.LinedProcessFeedbackTime == null ? stock.CreateDate : stock.LinedProcessFeedbackTime.ToDateTime())).TotalHours;
+
+        //if (stock.LinedProcessFeedbackTime == null)
+        //{
+        //    outHours = (DateTime.Now - stock.CreateDate).TotalHours;
+        //}
+        //else
+        //{
+        //    outHours = (DateTime.Now - stock.LinedProcessFeedbackTime.ToDateTime()).TotalHours;
+        //}
+
+        var isNG = outHours > parameterInfo.LowerSpecificationsLimit.ToDouble() && outHours < parameterInfo.UpperSpecificationsLimit.ToDouble();
+
+        var defectCode = string.Empty;
+        if (!isNG) defectCode = "TQCK";
         return new AgingOutputDto
         {
             OpFlag = 1,
@@ -141,41 +255,35 @@
             {
                 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()
+                SerialNoResult = true, //isNG,
+                ParameterInfo = new List<ParameterInfoOutput> {
+                    new ParameterInfoOutput() {
+                        Value = outHours.ToString(),
+                        ParameterCode =parameterInfo.ParameterCode,
+                        ParameterDesc = parameterInfo.Description,
+                        ParameterResult  = "OK", //isNG.ToString(),
+                        TargetValue = parameterInfo.TargetValue,
+                        LowerLomit = parameterInfo.LowerSpecificationsLimit,
+                        UpperLimit = parameterInfo.UpperSpecificationsLimit,
+                        DefectCode = defectCode,
+                        UOMCode = parameterInfo.UOMCode,
+                    }
+                }
             }).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 location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
         //var details = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);
-
+        int lastStatus = location.LocationStatus;
         location.LocationStatus = (int)LocationEnum.Free;
         task.TaskState = (int)TaskOutStatusEnum.OutFinish;
         //task.CurrentAddress = task.NextAddress;
         //task.NextAddress = task.TargetAddress;
+
+        _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
 
         LogFactory.GetLog("浠诲姟瀹屾垚").Info(true, "鏇存柊搴撳瓨鐘舵�佷笌浠诲姟鐘舵��");
         return (location, task);
@@ -187,6 +295,15 @@
         if (!isStockUpdated)
         {
             throw new Exception("搴撳瓨淇℃伅鏇存柊澶辫触");
+        }
+    }
+
+    private async Task AddStockInfoHtyAsync(DtStockInfo_Hty dtStock)
+    {
+        var isStockAdd = await SqlSugarHelper.Db.InsertNav(dtStock).IncludesAllFirstLayer().ExecuteCommandAsync();
+        if (!isStockAdd)
+        {
+            throw new Exception("搴撳瓨鍘嗗彶淇℃伅娣诲姞澶辫触");
         }
     }
 
@@ -218,6 +335,15 @@
         }
     }
 
+    private async Task AddTaskHtyAsync(Dt_Task_Hty taskHty)
+    {
+        var isTaskAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
+        if (!isTaskAdd)
+        {
+            throw new Exception("鍘嗗彶浠诲姟淇℃伅娣诲姞澶辫触");
+        }
+    }
+
     #endregion 鍑哄簱浠诲姟瀹屾垚
 
     #region 绉诲簱浠诲姟瀹屾垚
@@ -233,12 +359,12 @@
         try
         {
             // 鏇存柊璐т綅鍜屽簱瀛樹俊鎭�
-            (DtStockInfo updateStock, DtLocationInfo locationInf) = UpdateStockLocation(stock, task.NextAddress);
+            (DtStockInfo updateStock, DtLocationInfo locationInForm, DtLocationInfo locationInfoTo) = UpdateStockLocation(stock, task);
             var taskHty = CreateHistoricalTask(task);
-            LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庡簱瀛樻暟鎹細{JsonConvert.SerializeObject(updateStock)}锛屽師鍏堣揣浣嶆暟鎹細{locationInf}");
+            LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庡簱瀛樻暟鎹細{JsonConvert.SerializeObject(updateStock)}锛屽師鍏堣揣浣嶆暟鎹細{locationInForm}");
 
             // 鎵ц鏁版嵁搴撲簨鍔�
-            bool isResult = await ExecuteTransaction(updateStock, taskHty, locationInf, task.TaskId);
+            bool isResult = await ExecuteTransaction(updateStock, taskHty, locationInForm, locationInfoTo, task.TaskId);
             if (isResult)
                 content.OK("绉诲簱浠诲姟瀹屾垚鎴愬姛");
             else
@@ -266,23 +392,56 @@
         WebResponseContent content = new WebResponseContent();
         try
         {
+            if (task.TaskType == (int)TaskInboundTypeEnum.InNG || task.TaskType == (int)TaskInboundTypeEnum.InQuality)
+            {
+                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);
+            var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress && x.RoadwayNo == task.Roadway);
 
+            int lastStatus = locationInf.LocationStatus;
             // 鏇存柊鐩爣浣嶇疆鐘舵�佷负搴撳瓨涓�
             locationInf.LocationStatus = (int)LocationEnum.InStock;
 
             // 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
             var taskHty = CreateHistoricalTask(task);
 
+            if (task.TaskType == (int)TaskInboundTypeEnum.InQuality)
+            {
+                await _locationRepository.UpdateDataAsync(locationInf);
+                await _task_HtyRepository.AddDataAsync(taskHty);
+                await BaseDal.DeleteDataAsync(task);
+
+                //璁板綍璐т綅鍙樺姩淇℃伅
+                _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInf, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
+
+                return content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
+            }
             // 鏍规嵁鏄惁鏈夌粍鐩樹俊鎭垱寤哄簱瀛樺疄渚嬫ā鍨�
             DtStockInfo stock = boxing == null ? CreateEmptyPalletStock(task, locationInf) : CreateFullPalletStock(task, locationInf, boxing);
 
             // 鎵ц鏁版嵁搴撲簨鍔�
-            bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId);
+            bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId, boxing);
             if (isResult)
             {
+                _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInf, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
                 content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
             }
             else
@@ -314,13 +473,41 @@
             CreateDate = DateTime.Now,
             Creater = "system",
             IsFull = false,
-            AreaCode = area.AreaCode,
+            AreaCode = area.AreaCode ?? "",
             LocationId = loation.Id,
             StockInfoDetails = new List<DtStockInfoDetail>()
             {
                 new DtStockInfoDetail()
                 {
                     MaterielCode = "绌烘墭鐩�",
+                    Id = 0,
+                    Status = (int)StockStateEmun.宸插叆搴�
+                }
+            }
+        };
+    }
+
+    /// <summary>
+    /// 鍒涘缓鍒嗗鐨勫疄鎵樼洏鐨勫簱瀛樺疄渚嬫ā鍨�
+    /// </summary>
+    private DtStockInfo CreateFullPalletStockByFR(Dt_Task task, DtLocationInfo locationInf)
+    {
+        var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
+        var area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
+        return new DtStockInfo()
+        {
+            PalletCode = task.PalletCode,
+            LocationCode = task.TargetAddress,
+            CreateDate = DateTime.Now,
+            Creater = "system",
+            IsFull = false,
+            AreaCode = area.AreaCode ?? "",
+            LocationId = loation.Id,
+            StockInfoDetails = new List<DtStockInfoDetail>()
+            {
+                new DtStockInfoDetail()
+                {
+                    MaterielCode = "瀹炴墭鐩�",
                     Id = 0,
                     Status = (int)StockStateEmun.宸插叆搴�
                 }
@@ -336,9 +523,33 @@
         var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
         if (loation == null)
             throw new Exception("鏈壘鍒板搴斾綅缃俊鎭�");
-        var area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
-        if (area == null)
-            throw new Exception("鏈壘鍒板搴斿尯鍩熶俊鎭�");
+
+        var area = new Dt_AreaInfo();
+        if (task.Roadway.Contains("FR"))
+        {
+            area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
+        }
+        else
+        {
+            //var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
+            //if (station.stationPLC == "1017")
+            //    area = _areaInfoRepository.QueryFirst(x => x.AreaID == Convert.ToInt32(station.stationNGLocation));
+            //else
+            //    area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
+            //if (area == null)
+            //    throw new Exception("鏈壘鍒板搴斿尯鍩熶俊鎭�");
+
+            if (boxing.ProcessCode == "OCV1")
+                area = _areaInfoRepository.QueryFirst(x => x.AreaID == 6);
+            else if (boxing.ProcessCode == "OCVB")
+                area = _areaInfoRepository.QueryFirst(x => x.AreaID == 7);
+            else
+                area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
+
+            if (area == null)
+                throw new Exception("鏈壘鍒板搴斿尯鍩熶俊鎭�");
+        }
+
         var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
         boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.宸插叆搴�; });
         var stock = new DtStockInfo()
@@ -351,26 +562,51 @@
             AreaCode = area.AreaCode,
             LocationId = loation.Id,
             StockInfoDetails = boxDetail,
+            ProcessCode = boxing.ProcessCode,
+            NextProcessCode = boxing.NextProcessCode,
+            Remark = boxing.BoxingInfoDetails.Count().ToString(),
         };
 
-        // 澶勭悊璇锋眰鍙傛暟
-        AgingInputDto agingInputDto = new AgingInputDto()
+        if (boxing.ProcessCode != "OCVB" && !task.Roadway.Contains("FR"))
         {
-            SerialNos = boxing.BoxingInfoDetails
-                .Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
-                .ToList(),
-            TrayBarcode = task.PalletCode,
-            OpFlag = 1,
-            EquipmentCode = area.Spare2,
-            Software = area.Spare3
-        };
-        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));
-        stock.ProductionLine = respone.ProductionLine;
+            // 澶勭悊璇锋眰鍙傛暟
+            AgingInputDto agingInputDto = new AgingInputDto()
+            {
+                SerialNos = boxing.BoxingInfoDetails
+                    .Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
+                    .ToList(),
+                TrayBarcode = task.PalletCode,
+                OpFlag = 1,
+                EquipmentCode = area.Spare2,
+                Software = area.Spare3
+            };
+
+            var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;
+            var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());
+
+            bool isFull = false;
+            if (!task.Roadway.Contains("FR"))
+            {
+                isFull = respone.SpecialParameterDuration.IsNullOrEmpty();
+            }
+            if (respone.ProductionLine == null || respone.ParameterInfos == null)
+            {
+                throw new Exception("MOM鏁版嵁杩斿洖閿欒");
+            }
+            stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
+            stock.SpecialParameterDuration = respone.SpecialParameterDuration;
+            //2024骞�11鏈�16鏃ワ細鏂板瀛楁璁＄畻搴斿嚭搴撴椂闂�
+            stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime == null ? DateTime.Now : respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
+            stock.ProductionLine = respone.ProductionLine;
+            stock.ParameterInfos = respone.ParameterInfos.ToJsonString();
+            stock.StockStatus = 1;
+        }
+        else
+        {
+            stock.OutboundTime = DateTime.Now;
+            stock.StockStatus = 1;
+            stock.ProductionLine = boxing.ProductionLine;
+        }
 
         // 璁板綍鏃ュ織
         LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
@@ -403,6 +639,10 @@
         }
         LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "楠岃瘉浠诲姟鏄惁瀛樺湪", JsonConvert.SerializeObject(task));
 
+        if (task.TaskType == (int)TaskOutboundTypeEnum.InToOut)
+        {
+            return await CompleteInToOutTaskAsync(task);
+        }
         // 楠岃瘉搴撳瓨鏄惁瀛樺湪
         var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
 
@@ -411,13 +651,19 @@
         {
             case (int)TaskInboundTypeEnum.Inbound:
             case (int)TaskInboundTypeEnum.InTray:
+            case (int)TaskInboundTypeEnum.InNG:
+            case (int)TaskInboundTypeEnum.InQuality:
                 LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟", "");
                 return await CompleteInboundTaskAsync(task);
 
             case (int)TaskOutboundTypeEnum.OutTray:
             case (int)TaskOutboundTypeEnum.Outbound:
+            case (int)TaskOutboundTypeEnum.OutNG:
                 LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", "");
                 return await CompleteStackTaskAsync(task, stock);
+
+            case (int)TaskRelocationTypeEnum.Relocation:
+                return await CompleteTransferTaskAsync(task, stock);
 
             default:
                 return content.Error("浠诲姟绫诲瀷涓嶅瓨鍦�");
@@ -428,12 +674,14 @@
 
     #region 璇锋眰浠诲姟鍏ュ簱
 
+    #region
+
     /// <summary>
     /// 璇锋眰浠诲姟宸烽亾
     /// </summary>
     /// <param name="input">璇锋眰妯″瀷</param>
     /// <returns>鍖呭惈浠诲姟淇℃伅鐨勫搷搴斿唴瀹�</returns>
-    public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
+    public async Task<WebResponseContent> RequestTaskAsync2(RequestTaskDto input)
     {
         // 鍒涘缓涓�涓猈ebResponseContent瀵硅薄
         WebResponseContent content = new WebResponseContent();
@@ -463,6 +711,12 @@
                 }
             }
 
+            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("鏀圭偣浣嶄笉鍦ㄥ尯鍩熷垪琛ㄤ腑瀛樺湪");
@@ -472,8 +726,8 @@
             {
                 Software = area.Spare3,
                 TrayBarcode = input.PalletCode,
-                //EquipmentCode = "EQ_CWJZ01"
-                EquipmentCode = area.Spare2
+                EquipmentCode = area.Spare2,
+                SceneType = area.Spare4,
             };
 
             // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
@@ -484,46 +738,165 @@
             // 娣诲姞缁勭洏淇℃伅
             // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
             var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
-            if (result.SerialNos.Count <= 0)
+            if (!result.Success)
                 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("鏂欐灞炴�т笉瀛樺湪");
+            // 鑾峰彇寮傚父鐢佃姱
+            List<SerialNoDto>? serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
+            if (serialNosError.Count > 0)
+            {
+                // TODO 鍒涘缓浠诲姟閫佽嚦NG鎺掑嚭鍙�
+                var efg = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position && x.stationArea == area.AreaCode).ToList();
+                //List<string> NGStation = input.Position == "1088" ? new List<string>() { "1020" } : new List<string>() { "JZSC01" };
+                if (efg.Count <= 0)
+                {
+                    throw new Exception("鏈壘鍒癗G鍏ュ簱绔欏彴閰嶇疆");
+                }
+                List<string> NGStation = efg.Select(x => x.stationNGLocation).ToList();
+                if (NGStation.Count <= 0)
+                {
+                    NGStation = efg.Select(x => x.stationNGChildCode).ToList();
+                }
+                content = await CreateNewTask(input, NGStation, 2);
+                return content.Error("瀛樺湪寮傚父鐢佃姱");
+            }
 
-            // 璋冪敤CreateBoxingInfo鏂规硶锛屽垱寤虹粍鐩樹俊鎭�
+            if (result.SerialNos.Count <= 0)
+            {
+                // Todo 绌烘墭鐩樺叆搴撻�昏緫
+                content = await RequestTrayInTaskAsync(input);
+                return content;
+            }
 
-            var boxing = await CreateBoxingInfo(result, input.PalletCode);
+            var boxing = CreateBoxingInfo(result, input.PalletCode);
+            //Console.WriteLine(boxing.ToJsonString());
             if (boxing == null) return content.Error("缁勭洏澶辫触");
 
-            // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
-            ProcessApplyDto process = await GetProcessApplyAsync(result);
-
-            // 濡傛灉process涓簄ull锛屽垯杩斿洖content
-            if (process == null) return content;
-
-            // 骞惰祴鍊间笂浣嶈蒋浠跺悕绉板拰璁惧缂栫爜
-            process.Software = area.Spare3;
-            process.EquipmentCode = area.Spare2;
-
-            // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
-
-            // 璋冪敤_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)
+            if (result.ProcessCode == "OCVB")
             {
-                var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+                //TODO 鍒ゆ柇闇�涓嶉渶瑕佸幓鍖呰锛屼笉闇�瑕佸氨鍘诲父娓╀笁
+                var stationManagers = _stationManagerRepository.QueryData(x => x.stationPLC == "1018" && x.stationArea == "Cache");
+                var station = stationManagers.Select(x => x.stationChildCode).ToList();
+
+                // 鑾峰彇WCSip鍦板潃
+                var configz = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+                var wcsBasez = configz.Where(x => x.ConfigKey == SysConfigConst.WCSIPAddress).FirstOrDefault()?.ConfigValue;
+                var address = configz.Where(x => x.ConfigKey == SysConfigConst.GetStation).FirstOrDefault()?.ConfigValue;
+                if (wcsBasez == null || address == null)
+                {
+                    throw new InvalidOperationException("WCS IP 鏈厤缃�");
+                }
+                var wcsIpAddrss = wcsBasez + address;
+
+                var abc = HttpHelper.PostAsync(wcsIpAddrss, station.ToJsonString()).Result;
+                content = JsonConvert.DeserializeObject<WebResponseContent>(abc);
+                if (content.Data.ObjToInt() > 0)
+                {
+                    // TODO 閫佽嚦鍖呰
+                    List<string> strings = stationManagers.Where(x => x.stationType == 0).Select(x => x.Roadway).ToList();
+                    content = await CreateNewTask(input, strings, 3);
+                    return content;
+                }
+                else
+                {
+                    var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
+                    var strings = config.ConfigValue.Split(',').ToList();
+                    // TODO 鍏ュ簱
+                    content = await CreateNewTask(input, strings);
+                    if (content.Status)
+                        await _boxingInfoRepository.AddDataNavAsync(boxing);
+                }
+            }
+            else
+            {
+                // 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);
+                ////Console.WriteLine(boxing.ToJsonString());
+                //if (boxing == null) return content.Error("缁勭洏澶辫触");
+
+                // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
+                ProcessApplyDto process = await GetProcessApplyAsync(result);
+
+                // 濡傛灉process涓簄ull锛屽垯杩斿洖content
+                if (process == null) return content;
+
+                // 骞惰祴鍊间笂浣嶈蒋浠跺悕绉板拰璁惧缂栫爜
+                process.Software = area.Spare3;
+                process.EquipmentCode = area.Spare2;
+
+                // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
+
+                // 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
+                content = await _processApplyService.GetProcessApplyAsync(process);
+
+                // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
+                if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
+
+                var resultProcessApply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
+                if (!resultProcessApply.Success) return content.Error("宸ヨ壓鐢宠澶辫触");
+
+                var number = resultProcessApply.ProcessInfo.Where(x => x.ProcessCode == boxing.ProcessCode).FirstOrDefault().Number.ToInt32();
+                foreach (var item in resultProcessApply.ProcessInfo)
+                {
+                    if (item.Number.ToInt32() == number + 1)
+                    {
+                        boxing.NextProcessCode = item.ProcessCode;
+                    }
+                }
+                Console.WriteLine();
+                Console.WriteLine($"褰撳墠宸ュ簭锛歿boxing.ProcessCode}");
+                Console.WriteLine($"涓嬩竴宸ュ簭锛歿boxing.NextProcessCode}");
+
+                Console.WriteLine(area.AreaCode + "-----------------------");
+                Console.WriteLine(input.Position + "-----------------------");
+
+                var areaIn = string.Empty;
+                switch (boxing.NextProcessCode)
+                {
+                    case "CH01":
+                        areaIn = "CH001";
+                        break;
+
+                    case "JZ01":
+                        areaIn = "JZ001";
+                        break;
+
+                    case "GW01":
+                        areaIn = "GWSC1";
+                        break;
+
+                    case "CW01":
+                        areaIn = "CWSC1";
+                        break;
+
+                    case "CW02":
+                        areaIn = "CWSC2";
+                        break;
+
+                    default:
+                        break;
+                }
+
+                var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position && x.stationArea.Contains(areaIn)).FirstOrDefault();
+                if (stationManagers == null)
+                {
+                    throw new Exception("鏈壘鍒板叆搴撶珯鍙伴厤缃�");
+                }
+                List<string> strings = stationManagers.Roadway.Split(',').ToList();
+                Console.WriteLine(strings.ToJsonString() + "b-----------------------");
+                //// 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
+                content = await CreateNewTask(input, strings);
+                if (content.Status)
+                {
+                    var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+                }
+                //}
             }
         }
         catch (Exception err)
@@ -534,6 +907,122 @@
         }
 
         // 杩斿洖content
+        return content;
+    }
+
+    #endregion 璇锋眰浠诲姟鍏ュ簱
+
+    public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
+    {
+        WebResponseContent content = new WebResponseContent();
+
+        try
+        {
+            // 鏌ヨ浠诲姟
+            var task = await QueryTaskByPalletCode(input.PalletCode);
+            if (task != null)
+            {
+                return CreateAndReturnWMSTaskDTO(task);
+            }
+
+            // 鏌ヨ搴撳瓨淇℃伅锛堣繖閲屽悗缁瀹屽杽璐ㄦ鍥炲簱閫昏緫锛�
+            var stock = await QueryStockInfo(input.PalletCode);
+            if (stock != null)
+            {
+                Dt_Task taskNew = new Dt_Task
+                {
+                    Grade = 1,
+                    Roadway = stock.LocationInfo.RoadwayNo,
+                    TargetAddress = stock.LocationInfo.RoadwayNo,
+                    Dispatchertime = DateTime.Now,
+                    MaterialNo = "",
+                    NextAddress = stock.LocationInfo.RoadwayNo,
+                    OrderNo = null,
+                    PalletCode = stock.PalletCode,
+                    SourceAddress = input.Position,
+                    CurrentAddress = input.Position,
+                    TaskState = stock.LocationInfo.RoadwayNo.Contains("CH") ? (int)TaskInStatusEnum.InNew : (int)TaskInStatusEnum.Line_InFinish,
+                    TaskType = (int)TaskInboundTypeEnum.InQuality,
+                    TaskNum = BaseDal.GetTaskNo().Result,
+                    Creater = "System", // 淇鎷煎啓閿欒
+                    CreateDate = DateTime.Now,
+                    TaskId = 0,
+                };
+
+                var taskDTO = CreateTaskDTO(taskNew);
+                BaseDal.AddData(taskNew);
+                return content.OK(data: taskDTO);
+                // TODO璐ㄦ鍥炲簱
+            }
+
+            // 鏍规嵁浣嶇疆鏌ヨ鍖哄煙淇℃伅
+            var areaCode = Regex.Replace(input.Position, @"-(\d+)", "");
+            var area = await QueryAreaInfoByPosition(areaCode);
+            if (area == null)
+            {
+                return content.Error("璇ョ偣浣嶄笉鍦ㄥ尯鍩熷垪琛ㄤ腑瀛樺湪");
+            }
+
+            // 鍒涘缓骞惰幏鍙栨暣鐩樼數鑺姸鎬�
+            TrayCellsStatusDto trayCells = CreateTrayCellsStatusDto(area, input.PalletCode);
+            content = await GetTrayCellStatusAsync(trayCells);
+            if (!content.Status)
+            {
+                ConsoleHelper.WriteErrorLine($"鑾峰彇鐢佃姱鐘舵�佸け璐�:{content.Message}");
+                return content;
+            }
+
+            var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+
+            if (!result.Success)
+            {
+                ConsoleHelper.WriteErrorLine($"鑾峰彇鐢佃姱鐘舵�佸け璐�:{result.MOMMessage}");
+                if (result.SerialNos.Count <= 0)
+                {
+                    // 绌烘墭鐩樺叆搴撻�昏緫
+                    var staion = _stationManagerRepository.QueryFirst(x => x.stationChildCode == input.Position && x.stationType == 1 && x.remark == "IN");
+                    if (staion != null)
+                    {
+                        return await HandleErrorCells(input, area);
+                    }
+                    else
+                    {
+                        return await RequestTrayInTaskAsync(input);
+                    }
+                }
+                else
+                    return content.Error(result.MOMMessage);
+            }
+
+
+            if (result.SerialNos.Count <= 0)
+            {
+                return await RequestTrayInTaskAsync(input);
+            }
+            else
+            {
+
+
+                // 澶勭悊寮傚父鐢佃姱鎯呭喌
+                var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
+                if (serialNosError.Count > 0)
+                {
+                    return await HandleErrorCells(input, area, serialNosError);
+                }
+
+                var boxing = CreateBoxingInfo(result, input.PalletCode);
+                if (boxing == null) return content.Error("缁勭洏澶辫触");
+
+                return await ProcessBasedOnProcessCode(boxing, area, input, result);
+            }
+        }
+        catch (Exception err)
+        {
+            // 鏇磋缁嗙殑寮傚父澶勭悊锛屽彲浠ユ牴鎹紓甯哥被鍨嬭褰曚笉鍚岀殑閿欒鏃ュ織绛�
+            content.Error(err.Message);
+            Console.WriteLine(err.Message);
+        }
+
         return content;
     }
 
@@ -552,12 +1041,10 @@
                 return content.Error($"鏆傛湭鎵惧埌銆恵input.PalletCode}銆戠殑浠诲姟");
 
             return content = await UpdateExistingTask(input, task);
-
         }
         catch (Exception err)
         {
-
-            throw;
+            return content.Error(err.Message);
         }
     }
 
@@ -571,7 +1058,6 @@
         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)
@@ -592,15 +1078,20 @@
                 return content.OK(data: task);
             }
 
-            // 鑾峰彇鐩爣鍦板潃
-            List<string> strings = input.Position == "1016" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };
+            var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 6 && x.stationChildCode == input.Position).FirstOrDefault();
+            if (stationManagers == null)
+            {
+                stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position).FirstOrDefault();
+                if (stationManagers == null)
+                    throw new Exception("鏈壘鍒扮┖鎵樼洏鍏ュ簱绔欏彴鍜屽叆搴撶珯鍙伴厤缃�");
+            }
+            List<string> strings = stationManagers.Roadway.Split(',').ToList();
+            Console.WriteLine(strings.ToJsonString() + "b-----------------------");
 
             return await CreateNewTask(input, strings, 1);
-            //return await CreateNewTask(input, null, 1);
         }
         catch (Exception)
         {
-
             throw;
         }
     }
@@ -613,12 +1104,14 @@
     }
 
     // 鑾峰彇缁勭洏淇℃伅
-    private async Task<DtBoxingInfo> CreateBoxingInfo(ResultTrayCellsStatus result, string palletCode)
+    private DtBoxingInfo CreateBoxingInfo(ResultTrayCellsStatus result, string palletCode)
     {
         return new DtBoxingInfo
         {
             PalletCode = palletCode,
             IsFull = true,
+            ProcessCode = result.ProcessCode,
+            ProductionLine = result.ProductionLine,
             BoxingInfoDetails = result.SerialNos.Select(serialNoObj => new DtBoxingInfoDetail
             {
                 SerialNumber = serialNoObj.SerialNo,
@@ -644,39 +1137,7 @@
         };
     }
 
-    // 鑾峰彇宸ヨ壓鍝嶅簲
-    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 璇锋眰浠诲姟鍏ュ簱
+    #endregion 澶栭儴鎺ュ彛鏂规硶
 
     #region 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
 
@@ -688,15 +1149,15 @@
     /// <param name="areaCode">鍖哄煙缂栫爜</param>
     /// <param name="roadways">宸烽亾缂栫爜闆嗗悎</param>
     /// <returns>杩斿洖缁撴灉闆�</returns>
-    public async Task<WebResponseContent> RequestTrayOutTaskAsync(string position, int tag, string areaCode, List<string> roadways)
+    public async Task<WebResponseContent> RequestTrayOutTaskAsync(string position, int tag, string areaCode, List<string> areaCodes, string productionLine)
     {
         WebResponseContent content = new WebResponseContent();
         try
         {
             // 鏍规嵁鎵樼洏绫诲瀷鏌ヨ搴撳瓨淇℃伅
             DtStockInfo stockInfo = tag == (int)TaskOutboundTypeEnum.Outbound
-                ? QueryStockInfoForRealTrayAsync(areaCode, roadways).Result
-                : QueryStockInfoForEmptyTrayAsync(areaCode, roadways).Result;
+                ? areaCode != "CWSC1" ? await QueryStockInfoForRealTrayAsync(areaCode, areaCodes, productionLine) : await QueryStockInfoForRealTrayCWAsync(areaCodes, productionLine)
+                : await QueryStockInfoForEmptyTrayAsync(areaCode);
 
             if (stockInfo == null)
             {
@@ -708,7 +1169,7 @@
             if (hasTask != null)
             {
                 WMSTaskDTO taskDTO1 = CreateTaskDTO(hasTask);
-                return content.OK("宸插瓨鍦ㄧ┖鐩樺嚭搴撲换鍔�", data: taskDTO1);
+                return content.OK("宸插瓨鍦ㄥ嚭搴撲换鍔�", data: taskDTO1);
             }
 
             // 鍒涘缓鏂颁换鍔″疄渚�
@@ -743,7 +1204,7 @@
     /// <summary>
     /// 鏌ヨ瀹炵洏搴撳瓨淇℃伅
     /// </summary>
-    private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> roadways)
+    private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> devices, string productionLine)
     {
         var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
 
@@ -751,7 +1212,31 @@
             .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
             .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
             .Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
-            .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢
+            .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
+            .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
+            .WhereIF(!devices.IsNullOrEmpty(), x => devices.Contains(x.LocationInfo.RoadwayNo))
+            .OrderBy(x => x.OutboundTime) // 鎺掑簭
+            .FirstAsync(); // 鑾峰彇绗竴涓厓绱�
+
+        //var firstOrDefault = result.FirstOrDefault(x => roadways.Contains(x.LocationInfo.RoadwayNo)); // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
+        //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
+        //return firstOrDefault;
+        return result;
+    }
+
+    /// <summary>
+    /// 鏌ヨ甯告俯瀹炵洏搴撳瓨淇℃伅
+    /// </summary>
+    private async Task<DtStockInfo> QueryStockInfoForRealTrayCWAsync(List<string> areaCodes, string productionLine)
+    {
+        var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == "CWSC1");
+
+        var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+            .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
+            .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
+            .Where(x => areaCodes.Contains(x.AreaCode) && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
+            .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
+            .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
             .OrderBy(x => x.OutboundTime) // 鎺掑簭
             .FirstAsync(); // 鑾峰彇绗竴涓厓绱�
 
@@ -764,7 +1249,7 @@
     /// <summary>
     /// 鏌ヨ绌虹洏搴撳瓨淇℃伅
     /// </summary>
-    private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode, List<string> roadways)
+    private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode)
     {
         var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
 
@@ -773,7 +1258,7 @@
             .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
             .Where(x => x.AreaCode == areaCode && x.IsFull == false)
             .Where(x => x.StockInfoDetails.Any(y => y.MaterielCode == "绌烘墭鐩�"))
-            .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢
+            .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
             .OrderBy(x => x.CreateDate) // 鎺掑簭
             .FirstAsync(); // 杞崲涓哄垪琛�
 
@@ -789,7 +1274,7 @@
     {
         return new Dt_Task
         {
-            Grade = 1,
+            Grade = tag == 104 ? 2 : 1,
             Roadway = stockInfo.LocationInfo.RoadwayNo,
             TargetAddress = position,
             Dispatchertime = DateTime.Now,
@@ -800,9 +1285,11 @@
             SourceAddress = stockInfo.LocationCode,
             CurrentAddress = stockInfo.LocationCode,
             TaskState = (int)TaskOutStatusEnum.OutNew,
-            TaskType = tag == (int)TaskOutboundTypeEnum.Outbound ? (int)TaskOutboundTypeEnum.Outbound : (int)TaskOutboundTypeEnum.OutTray,
+            TaskType = tag,
             TaskNum = BaseDal.GetTaskNo().Result,
-            Creater = "System" // 淇鎷煎啓閿欒
+            Creater = "System", // 淇鎷煎啓閿欒
+            CreateDate = DateTime.Now,
+            TaskId = 0,
         };
     }
 
@@ -814,7 +1301,7 @@
         return new WMSTaskDTO
         {
             TaskNum = task.TaskNum.Value,
-            Grade = 1,
+            Grade = task.Grade.Value,
             PalletCode = task.PalletCode,
             RoadWay = task.Roadway,
             SourceAddress = task.SourceAddress,
@@ -825,7 +1312,7 @@
         };
     }
 
-    #endregion 璇锋眰鍑哄簱
+    #endregion 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
 
     #region 浠诲姟鐘舵�佹洿鏀�
 
@@ -875,34 +1362,370 @@
         return content;
     }
 
-    #endregion
+    #endregion 浠诲姟鐘舵�佹洿鏀�
 
-    #region 鍑哄簱瑙ｇ洏
+    #region 鎸囧畾浠诲姟鍑哄簱
 
-    /// <summary>
-    /// 鍑哄簱瑙ｇ洏鎺ュ彛
-    /// </summary>
-    /// <param name="taskNum"></param>
-    /// <returns></returns>
-    public async Task<WebResponseContent> OutUnblockInterface(int taskNum)
+    public async Task<WebResponseContent> CreateAndSendOutboundTask(string locationCode, string palletCode)
     {
         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);
+            // 鏌ヨ搴撳瓨淇℃伅
+            var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.LocationCode == locationCode && x.PalletCode == palletCode);
+            if (stockInfo == null)
+            {
+                return content.Error("鏈煡璇㈠埌瀵瑰簲鐨勫簱瀛樹俊鎭�");
+            }
+
+            var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
+            if (task != null)
+            {
+                return content.Error($"銆恵palletCode}銆戝凡瀛樺湪浠诲姟");
+            }
+
+            int taskType = 0;
+            if (stockInfo.IsFull)
+                taskType = (int)TaskOutboundTypeEnum.OutQuality;
+            else
+                taskType = (int)TaskOutboundTypeEnum.OutTray;
+
+            if (stockInfo.AreaCode.Contains("CH"))
+            {
+                // 鍒涘缓骞舵坊鍔犱换鍔″埌鏁版嵁搴�
+                task = CreateTask(stockInfo, "1020-1", taskType);
+            }
+            else
+            {
+                if (stockInfo.LocationInfo.RoadwayNo == "JZSC1")
+                {
+                    task = CreateTask(stockInfo, "002-021-001", taskType);
+                }
+            }
+            //var taskId = await BaseDal.AddDataAsync(task);
+            //if (taskId <= 0)
+            //{
+            //    return content.Error("浠诲姟鍒涘缓澶辫触");
+            //}
+
+            // 鍒涘缓浠诲姟浼犺緭鐢ㄧ殑DTO瀵硅薄
+            var taskDTO = CreateTaskDTO(task);
+
+            // 鑾峰彇WMS IP鍦板潃鐢ㄤ簬鍙戦�佷换鍔¤姹�
+            var wmsIpAddress = GetWCSIpReceiveTask();
+            if (wmsIpAddress == null)
+            {
+                throw new InvalidOperationException("WMS IP 鏈厤缃�");
+            }
+
+            var tasks = new List<WMSTaskDTO>() { taskDTO };
+            // 鍙戦�佷换鍔¤姹傚埌WMS
+            var result = await HttpHelper.PostAsync(wmsIpAddress, tasks.ToJsonString());
+            content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+            if (content.Status)
+            {
+                // 娣诲姞浠诲姟鍒版暟鎹簱
+                await BaseDal.AddDataAsync(task);
+                // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+                stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
+                await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
+            }
         }
         catch (Exception ex)
         {
+            Console.WriteLine($"鍙戠敓寮傚父: {ex.Message}");
+            content.Error(ex.Message);
+        }
+
+        return content;
+    }
+
+    private string GetWCSIpReceiveTask()
+    {
+        var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+        var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
+        var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveTask)?.ConfigValue;
+        if (wmsBase == null || ipAddress == null)
+        {
+            return null;
+        }
+        return wmsBase + ipAddress;
+    }
+
+    #endregion 鎸囧畾浠诲姟鍑哄簱
+
+    #region 闈欑疆寮傚父鍙ｅ叆搴�
+
+    public async Task<WebResponseContent> CreateAndSendInboundTask(string palletCode, string position)
+    {
+        #region
+        //WebResponseContent content = new WebResponseContent();
+        //try
+        //{
+        //    // 鏌ヨ搴撳瓨淇℃伅
+        //    var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
+        //    if (stockInfo == null)
+        //    {
+        //        var taskOld = BaseDal.QueryFirst(x => x.PalletCode == palletCode);
+        //        if (!taskOld.IsNullOrEmpty())
+        //        {// 鍒涘缓WMS浠诲姟
+        //            WMSTaskDTO taskDTO = new WMSTaskDTO()
+        //            {
+        //                TaskNum = taskOld.TaskNum.Value,
+        //                Grade = 1,
+        //                PalletCode = taskOld.PalletCode,
+        //                RoadWay = taskOld.Roadway,
+        //                SourceAddress = taskOld.CurrentAddress,
+        //                TargetAddress = taskOld.TargetAddress,
+        //                TaskState = taskOld.TaskState.Value,
+        //                Id = 0,
+        //                TaskType = taskOld.TaskType,
+        //            };
+        //            return content.OK(data: taskDTO);
+        //        }
+        //        var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
+        //        var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == position);
+        //        TrayCellsStatusDto trayCells = CreateTrayCellsStatusDto(area, palletCode);
+        //        content = await GetTrayCellStatusAsync(trayCells);
+        //        if (!content.Status) return content;
+
+        //        ConsoleHelper.WriteErrorLine(content.ToJsonString());
+        //        var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+        //        if (!result.Success) return content.Error(result.MOMMessage);
+
+        //        if (result.SerialNos.Count > 0)
+        //        {
+        //            var boxing = CreateBoxingInfo(result, palletCode);
+        //            if (boxing == null) return content.Error("缁勭洏澶辫触");
+
+        //            // 鑾峰彇宸ヨ壓璺嚎
+        //            ProcessApplyDto process = await GetProcessApplyAsync(result);
+        //            // 璧嬪�间笂浣嶈蒋浠跺悕绉板拰璁惧缂栫爜
+        //            process.Software = area.Spare3;
+        //            process.EquipmentCode = area.Spare2;
+        //            content = await _processApplyService.GetProcessApplyAsync(process);
+        //            if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
+
+        //            var resultProcessApply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
+        //            if (!resultProcessApply.Success) return content.Error("宸ヨ壓鐢宠澶辫触");
+
+        //            var number = resultProcessApply.ProcessInfo.Where(x => x.ProcessCode.Contains(boxing.ProcessCode)).FirstOrDefault().Number.ToInt32();
+        //            foreach (var item in resultProcessApply.ProcessInfo)
+        //            {
+        //                if (item.Number.ToInt32() == number + 1)
+        //                {
+        //                    boxing.NextProcessCode = item.ProcessCode;
+        //                }
+        //            }
+        //            var location = await GetLocationDistributeAsync(station.Roadway);
+
+        //            ConsoleHelper.WriteErrorLine(location.ToJsonString());
+
+        //            // 鍒涘缓鏂颁换鍔″疄渚�
+        //            var task = new Dt_Task
+        //            {
+        //                CurrentAddress = station.stationLocation,
+        //                Grade = 1,
+        //                Roadway = station.Roadway,
+        //                TargetAddress = location.LocationCode,
+        //                Dispatchertime = DateTime.Now,
+        //                MaterialNo = "",
+        //                NextAddress = location.LocationCode,
+        //                OrderNo = null,
+        //                PalletCode = palletCode,
+        //                SourceAddress = position,
+        //                TaskState = (int)TaskInStatusEnum.Line_InFinish,
+        //                TaskType = (int)TaskInboundTypeEnum.Inbound,
+        //                TaskNum = await BaseDal.GetTaskNo(),
+        //                Creater = "Systeam"
+        //            };
+
+        //            // 鍒涘缓WMS浠诲姟
+        //            WMSTaskDTO taskDTO = 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,
+        //            };
+
+        //            await _unitOfWorkManage.UseTranAsync(async () =>
+        //            {
+        //                // 娣诲姞浠诲姟鍒版暟鎹簱
+        //                await BaseDal.AddDataAsync(task);
+        //                // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+        //                location.LocationStatus = (int)LocationEnum.InStockDisable;
+        //                await _locationRepository.UpdateDataAsync(location);
+        //                await _boxingInfoRepository.AddDataNavAsync(boxing);
+        //            });
+
+        //            content.OK(data: taskDTO);
+        //        }
+        //        else
+        //            content.Error(result.MOMMessage);
+        //    }
+        //    else
+        //    {
+        //        // TODO璐ㄦ鍥炲簱
+        //        var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
+        //    }
+        //}
+        //catch (Exception ex)
+        //{
+        //    content.Error(ex.Message);
+        //}
+        //return content;
+        #endregion
+        WebResponseContent content = new WebResponseContent();
+        try
+        {
+            // 鏌ヨ搴撳瓨淇℃伅
+            var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
+            if (stockInfo == null)
+            {
+                var taskOld = BaseDal.QueryFirst(x => x.PalletCode == palletCode);
+                if (taskOld != null)
+                {
+                    // 鍒涘缓WMS浠诲姟
+                    WMSTaskDTO taskDTO = CreateWMSTaskDTO(taskOld);
+                    return content.OK(data: taskDTO);
+                }
+                var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
+                var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == position);
+                TrayCellsStatusDto trayCells = CreateTrayCellsStatusDto(area, palletCode);
+                content = await GetTrayCellStatusAsync(trayCells);
+                if (!content.Status) return content;
+
+                ConsoleHelper.WriteErrorLine(content.ToJsonString());
+                var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+                if (result == null || !result.Success) return content.Error(result?.MOMMessage ?? "Deserialization error");
+
+                if (result.SerialNos.Count > 0)
+                {
+                    var boxing = CreateBoxingInfo(result, palletCode);
+                    if (boxing == null) return content.Error("缁勭洏澶辫触");
+
+                    // 鑾峰彇宸ヨ壓璺嚎
+                    ProcessApplyDto process = await GetProcessApplyAsync(result);
+                    // 璧嬪�间笂浣嶈蒋浠跺悕绉板拰璁惧缂栫爜
+                    process.Software = area.Spare3;
+                    process.EquipmentCode = area.Spare2;
+
+                    content = await _processApplyService.GetProcessApplyAsync(process);
+                    if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
+
+                    var resultProcessApply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString()) as ResultProcessApply;
+                    if (resultProcessApply == null || !resultProcessApply.Success) return content.Error("宸ヨ壓鐢宠澶辫触");
+
+                    var number = resultProcessApply.ProcessInfo.Where(x => x.ProcessCode.Contains(boxing.ProcessCode)).FirstOrDefault()?.Number.ToInt32() ?? 0;
+                    foreach (var item in resultProcessApply.ProcessInfo)
+                    {
+                        if (item.Number.ToInt32() == number + 1)
+                        {
+                            boxing.NextProcessCode = item.ProcessCode;
+                        }
+                    }
+                    var location = await GetLocationDistributeAsync(station.Roadway);
+
+                    ConsoleHelper.WriteErrorLine(location.ToJsonString());
+
+                    // 鍒涘缓鏂颁换鍔″疄渚�
+                    var task = new Dt_Task
+                    {
+                        CurrentAddress = station.stationLocation,
+                        Grade = 1,
+                        Roadway = station.Roadway,
+                        TargetAddress = location.LocationCode,
+                        Dispatchertime = DateTime.Now,
+                        MaterialNo = "",
+                        NextAddress = location.LocationCode,
+                        OrderNo = null,
+                        PalletCode = palletCode,
+                        SourceAddress = position,
+                        TaskState = (int)TaskInStatusEnum.Line_InFinish,
+                        TaskType = (int)TaskInboundTypeEnum.Inbound,
+                        TaskNum = await BaseDal.GetTaskNo(),
+                        Creater = "Systeam"
+                    };
+
+                    // 鍒涘缓WMS浠诲姟
+                    WMSTaskDTO taskDTO = CreateWMSTaskDTO(task);
+
+                    await _unitOfWorkManage.UseTranAsync(async () =>
+                    {
+                        // 娣诲姞浠诲姟鍒版暟鎹簱
+                        await BaseDal.AddDataAsync(task);
+                        // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+                        location.LocationStatus = (int)LocationEnum.Lock;
+                        await _locationRepository.UpdateDataAsync(location);
+                        await _boxingInfoRepository.AddDataNavAsync(boxing);
+                    });
+
+                    content.OK(data: taskDTO);
+                }
+                else
+                    content.Error(result.MOMMessage);
+            }
+            else
+            {
+                // TODO璐ㄦ鍥炲簱
+                var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
+            }
+        }
+        catch (Exception ex)
+        {
+            // 鏇磋缁嗙殑鏃ュ織璁板綍锛屽彲浣跨敤鏃ュ織妗嗘灦鏇挎崲 Console.WriteLine
+            Console.WriteLine($"Error in CreateAndSendInboundTask: {ex.Message}");
             content.Error(ex.Message);
         }
         return content;
     }
 
-    #endregion
+
+    private WMSTaskDTO CreateWMSTaskDTO(object source)
+    {
+        if (source is Dt_Task taskOld)
+        {
+            return new WMSTaskDTO()
+            {
+                TaskNum = taskOld.TaskNum.Value,
+                Grade = 1,
+                PalletCode = taskOld.PalletCode,
+                RoadWay = taskOld.Roadway,
+                SourceAddress = taskOld.CurrentAddress,
+                TargetAddress = taskOld.TargetAddress,
+                TaskState = taskOld.TaskState.Value,
+                Id = 0,
+                TaskType = taskOld.TaskType,
+            };
+        }
+        else if (source is 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,
+            };
+        }
+        else
+        {
+            throw new ArgumentException("Invalid source object type for WMSTaskDTO creation.");
+        }
+    }
+
+    #endregion 闈欑疆寮傚父鍙ｅ叆搴�
 
     #endregion 澶栭儴鎺ュ彛鏂规硶
 
@@ -946,6 +1769,35 @@
     public async Task<bool> Delete(List<int> ids)
     {
         return await BaseDal.Delete(ids);
+    }
+
+    public override WebResponseContent DeleteData(object[] key)
+    {
+        WebResponseContent content = new WebResponseContent();
+        // 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
+        try
+        {
+            Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == Convert.ToInt32(key[0]));
+            if (task == null)
+            {
+                return content.Error("鏈壘鍒颁换鍔′俊鎭�!");
+            }
+            var taskHtyNG = CreateHistoricalTask(task, true);
+
+            // 鎵ц鏁版嵁搴撲簨鍔�
+
+            // 娣诲姞鍘嗗彶浠诲姟
+            var isTaskHtyAdd = _task_HtyRepository.AddData(taskHtyNG) > 0;
+
+            // 鍒犻櫎浠诲姟鏁版嵁
+            var isTaskDelete = BaseDal.Delete(task.TaskId);
+
+            return content.OK("鍒犻櫎鎴愬姛!");
+        }
+        catch (Exception ex)
+        {
+            return content.Error("鍒犻櫎浠诲姟寮傚父锛�" + ex.Message);
+        }
     }
 
     /// <summary>
@@ -1053,44 +1905,11 @@
     #region private 鍐呴儴鏂规硶
 
     /// <summary>
-    /// 鏇存柊鍑哄簱璁㈠崟鍜屽簱瀛樹俊鎭�
-    /// </summary>
-    /// <param name="stock">搴撳瓨瀹炰緥</param>
-    /// <param name="barCode">鏉＄爜</param>
-    /// <returns>鏇存柊鍚庣殑璁㈠崟鍜屽簱瀛樹俊鎭�</returns>
-    private async Task<Dt_OutOrderAndStock> UpdateOrderAndStockAsync(DtStockInfo stock, string barCode)
-    {
-        //鏍规嵁PalletCode鑾峰彇璁㈠崟鍜屽簱瀛樹俊鎭�
-        var orderStock = await _outOrderAndStockRepository.GetOrderAndStock(palletCode: barCode);
-
-        //瀹屾垚鏁伴噺澧炲姞
-        orderStock.CompletedQuantity += stock.StockInfoDetails.Sum(x => x.StockQuantity);
-
-        //璁㈠崟璇︽儏瀹屾垚鏁伴噺澧炲姞
-        orderStock.OrderList.OrderDetailList.CompletedQuantity += stock.StockInfoDetails.Sum(x => x.StockQuantity);
-
-        //杩斿洖鏇存柊鍚庣殑璁㈠崟鍜屽簱瀛樹俊鎭�
-        return orderStock;
-    }
-
-    /// <summary>
-    /// 鍒ゆ柇璁㈠崟鏄惁瀹屾垚
-    /// </summary>
-    /// <param name="orderStock">璁㈠崟鍜屽簱瀛樹俊鎭�</param>
-    /// <returns>鏄惁瀹屾垚</returns>
-    // 鍒ゆ柇璁㈠崟鏄惁瀹屾垚
-    private bool IsOrderComplete(Dt_OutOrderAndStock orderStock)
-    {
-        // 濡傛灉鍑哄簱鏁伴噺绛変簬瀹屾垚鍑哄簱鏁伴噺锛屽垯璁㈠崟瀹屾垚
-        return orderStock.CompletedQuantity == orderStock.OutboundQuantity;
-    }
-
-    /// <summary>
     /// 鍒涘缓鍘嗗彶浠诲姟璁板綍
     /// </summary>
     /// <param name="task"></param>
     /// <returns></returns>
-    private Dt_Task_Hty CreateHistoricalTask(Dt_Task task)
+    private Dt_Task_Hty CreateHistoricalTask(Dt_Task task, bool isHand = false)
     {
         // 鏇存柊浠诲姟鐘舵��
         task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
@@ -1100,7 +1919,7 @@
         var taskHty = _mapper.Map<Dt_Task_Hty>(task);
         taskHty.FinishTime = DateTime.Now;
         taskHty.TaskId = 0;
-        taskHty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
+        taskHty.OperateType = isHand ? (int)OperateTypeEnum.浜哄伐鍒犻櫎 : (int)OperateTypeEnum.鑷姩瀹屾垚;
         taskHty.SourceId = task.TaskId;
         taskHty.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
         return taskHty;
@@ -1112,20 +1931,19 @@
     /// <param name="stock">搴撳瓨瀵硅薄</param>
     /// <param name="toLocation">鐩爣浣嶇疆</param>
     // 鏇存柊搴撳瓨鍜屼綅缃俊鎭�
-    private (DtStockInfo, DtLocationInfo) UpdateStockLocation(DtStockInfo stock, string toLocation)
+    private (DtStockInfo, DtLocationInfo, DtLocationInfo) UpdateStockLocation(DtStockInfo stock, Dt_Task task)
     {
-        // 鑾峰彇搴撳瓨淇℃伅
-        var locationInfo = _locationRepository.QueryFirst(x => x.LocationCode == stock.LocationCode);
-        // 灏嗗簱瀛樼姸鎬佽缃负鍦ㄥ簱
-        locationInfo.LocationStatus = LocationEnum.InStock.ObjToInt();
+        //淇敼鏉ユ簮搴撲綅鍜� 鐩爣搴撲綅鐘舵��
+        var fromLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
+        fromLocation.LocationStatus = LocationEnum.Free.ObjToInt();
+        var toLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
+        toLocation.LocationStatus = LocationEnum.InStock.ObjToInt();
 
         // 灏嗗簱瀛樹綅缃缃负鐩爣浣嶇疆
-        stock.LocationCode = toLocation;
-        // 灏嗗簱瀛樼姸鎬佽缃负鍦ㄥ簱
-        stock.LocationInfo.LocationStatus = LocationEnum.InStock.ObjToInt();
+        stock.LocationCode = task.TargetAddress;
 
         // 杩斿洖鏇存柊鍚庣殑搴撳瓨鍜屼綅缃俊鎭�
-        return (stock, locationInfo);
+        return (stock, fromLocation, toLocation);
     }
 
     /// <summary>
@@ -1151,12 +1969,25 @@
             {
                 // 娣诲姞搴撳瓨
                 isUpdateStock = await _stockInfoRepository.AddDataNavAsync(stock);
-                isDeleteBoxing = await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxingInfo.Id)
-                   .Include(x => x.BoxingInfoDetails)
-                   .ExecuteCommandAsync();
+                if (boxingInfo != null)
+                {
+                    isDeleteBoxing = await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxingInfo.Id)
+                                            .Include(x => x.BoxingInfoDetails)
+                                            .ExecuteCommandAsync();
+                }
             }
 
-
+            var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
+            if (stocks != null && stocks.Count > 0)
+            {
+                foreach (var item in stocks)
+                {
+                    item.SpecialParameterDuration = stock.SpecialParameterDuration;
+                    item.ParameterInfos = stock.ParameterInfos;
+                    item.OutboundTime = Convert.ToDateTime(item.LinedProcessFeedbackTime == null ? item.CreateDate : item.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(stock.SpecialParameterDuration));
+                }
+                var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocks);
+            }
 
             // 娣诲姞鍘嗗彶浠诲姟
             var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
@@ -1191,80 +2022,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 +2037,62 @@
             var content = new WebResponseContent();
 
             // 鑾峰彇鐩爣鍦板潃鍜屾洿鏂颁换鍔＄姸鎬�
-            var location = await GetLocationDistributeAsync(task.Roadway);
-            if (location == null)
+
+            input.Position = Regex.Replace(input.Position, @"-(\d+)", "");
+            if (Convert.ToInt32(input.Position) > 1999)
             {
-                return content.Error("鏃犳硶鑾峰彇璐т綅淇℃伅");
+                input.Position = (Convert.ToInt32(input.Position) - 1000).ToString();
             }
 
-            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)
+            if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
             {
-                _unitOfWorkManage.RollbackTran();
-                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 if (task.TaskType == (int)TaskInboundTypeEnum.InQuality)
+            {
+                var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode);
+                task.CurrentAddress = input.Position;
+                task.TargetAddress = stockInfo.LocationInfo.LocationCode;
+                task.NextAddress = stockInfo.LocationInfo.LocationCode;
+                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("鏃犳硶鑾峰彇璐т綅淇℃伅");
+                }
 
-            // 鎻愪氦浜嬪姟
-            _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)
         {
@@ -1351,8 +2137,8 @@
     /// 鍒涘缓鏂颁换鍔�
     /// </summary>
     /// <param name="input">璇锋眰妯″瀷</param>
-    /// <param name="areaId">鍖哄煙ID</param>
-    /// <param name="content">鍝嶅簲鍐呭</param>
+    /// <param name="process">宸烽亾</param>
+    /// <param name="flag">鏍囪瘑锛�0-鍏ュ簱锛�1-绌烘墭鐩樺叆搴擄紝2-NG鍏ュ簱锛�3-鍑哄簱锛�</param>
     /// <returns></returns>
     private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, List<string> process = null, int flag = 0)
     {
@@ -1360,7 +2146,11 @@
 
         // 鑾峰彇鐩爣鍦板潃
         //string ToAddress = await GetRoadWayAsync(process);
-        string ToAddress = await GetRoadWayAsync(input, process);
+        string ToAddress = string.Empty;
+        if (flag < 2)
+            ToAddress = await GetRoadWayAsync(process);
+        else
+            ToAddress = process[0];
 
         // 鍒涘缓鏂颁换鍔″疄渚�
         var task = new Dt_Task
@@ -1375,8 +2165,8 @@
             OrderNo = null,
             PalletCode = input.PalletCode,
             SourceAddress = input.Position,
-            TaskState = (int)TaskInStatusEnum.InNew,
-            TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : (int)TaskInboundTypeEnum.InTray,
+            TaskState = flag == 3 ? (int)TaskOutStatusEnum.OutNew : (int)TaskInStatusEnum.InNew,
+            TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : flag == 1 ? (int)TaskInboundTypeEnum.InTray : flag == 2 ? (int)TaskInboundTypeEnum.InNG : (int)TaskOutboundTypeEnum.Outbound,
             TaskNum = await BaseDal.GetTaskNo(),
             Creater = "Systeam"
         };
@@ -1388,6 +2178,11 @@
         {
             task.TaskId = taskId;
             isResult = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(input.PalletCode, input.Position, ToAddress, TaskInStatusEnum.InNew.GetIntegralRuleTypeEnumDesc()));
+
+            //var location = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
+            //location.LocationStatus = (int)LocationEnum.Lock;
+            //var isLocation = _locationRepository.UpdateData(location);
+
             if (isResult)
             {
                 // 鍒涘缓WMS浠诲姟
@@ -1398,7 +2193,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,
@@ -1413,6 +2208,8 @@
         return content;
     }
 
+
+    private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
     /// <summary>
     /// 鏌ユ壘璐т綅
     /// </summary>
@@ -1423,16 +2220,17 @@
     {
         #region 鑾峰彇璐т綅
 
+        await _semaphore.WaitAsync();
         try
         {
             List<DtLocationInfo> locations;
             if (IsFull)
             {
-                locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
+                locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay && x.EnalbeStatus == (int)EnableEnum.Enable);
             }
             else
             {
-                locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay /*&& x.LocationType ==*/);
+                locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay && x.EnalbeStatus == (int)EnableEnum.Enable);
             }
 
             if (locations == null)
@@ -1447,32 +2245,39 @@
             Console.WriteLine(err.Message.ToString());
             return null;
         }
+        finally
+        {
+            _semaphore.Release();
+        }
 
         #endregion 鑾峰彇璐т綅
     }
 
     /// <summary>
-    /// 鑾峰彇宸烽亾鎴栫珯鍙�
+    /// 鏍规嵁宸烽亾鑾峰彇宸烽亾鎴栫珯鍙�
     /// </summary>
-    /// <param name="areaId">璐т綅鍖哄煙ID</param>
-    /// <param name="position">绔欏彴</param>
-    /// <param name="Direction">鏂瑰悜</param>
-    /// <param name="area">鍏崇郴鍖哄煙</param>
     /// <returns></returns>
-    public async Task<string> GetRoadWayAsync(RequestTaskDto input, List<string> process)
+    public async Task<string> GetRoadWayAsync(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(); // 鍙栧嚭鏁伴噺鏈�澶氱殑缁�
+             .ToList(); // 鍙栧嚭鏁伴噺鏈�澶氱殑缁�
 
-        string minRoadwayNo = minGroup.Key; // 鏁伴噺鏈�澶氱殑缁勭殑Key
+        Dictionary<string, int> result = new Dictionary<string, int>();
+        foreach (var item in minGroup)
+        {
+            var number = BaseDal.QueryData(x => x.TargetAddress == item.Key).Count();
+            result.Add(item.Key, item.Count() - number);
+        }
+
+        string minRoadwayNo = result.OrderByDescending(x => x.Value).FirstOrDefault().Key; // 鏁伴噺鏈�澶氱殑缁勭殑Key
 
         return minRoadwayNo;
     }
 
     /// <summary>
-    /// 鑾峰彇宸烽亾鎴栫珯鍙�
+    /// 鏍规嵁鍖哄煙鑾峰彇宸烽亾鎴栫珯鍙�
     /// </summary>
     /// <returns></returns>
     public async Task<string> GetRoadWayAsync(int areaCode)
@@ -1480,13 +2285,103 @@
         var minGroup = _locationRepository.QueryData(x => x.AreaId == areaCode && x.LocationStatus == (int)LocationEnum.Free)
             .GroupBy(x => x.RoadwayNo)
              .OrderBy(g => g.Count()) // 鏍规嵁姣忎釜缁勭殑鍏冪礌鏁伴噺鎺掑簭
-             .First(); // 鍙栧嚭鏁伴噺鏈�灏戠殑缁�
+             .ToList(); // 鍙栧嚭鏁伴噺鏈�灏戠殑缁�
 
-        string minRoadwayNo = minGroup.Key; // 鏁伴噺鏈�灏戠殑缁勭殑Key
+        Dictionary<string, int> result = new Dictionary<string, int>();
+        foreach (var item in minGroup)
+        {
+            var number = BaseDal.QueryData(x => x.TargetAddress == item.Key).Count();
+            result.Add(item.Key, item.Count() - number);
+        }
+
+        string minRoadwayNo = result.OrderByDescending(x => x.Value).FirstOrDefault().Key; // 鏁伴噺鏈�澶氱殑缁勭殑Key
 
         return minRoadwayNo;
     }
 
+    // 鏂扮殑鍑哄簱閿欒澶勭悊閫昏緫
+    private async Task HandleOutBoundError(DtStockInfo stock, Dt_Task task)
+    {
+        WebResponseContent content = new WebResponseContent();
+        var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == stock.AreaCode);
+        if (area == null)
+        {
+            throw new Exception("鏈壘鍒板搴旂殑搴撳尯淇℃伅");
+        }
+
+        var trayCells = new TrayCellsStatusDto
+        {
+            Software = area.Spare3,
+            TrayBarcode = task.PalletCode,
+            EquipmentCode = area.Spare2,
+            SceneType = area.Spare4
+        };
+
+        content = await _cellStateService.GetTrayCellStatusAsync(trayCells);
+        if (!content.Status) return;
+
+        var ResultTray = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+        if (ResultTray.SerialNos.Count > 0)
+        {
+            var parameterInfo = GetParameterInfo(stock);
+
+            var outHours = CalculateOutHours(stock);
+            var isNG = outHours > parameterInfo.LowerSpecificationsLimit.ToDouble()
+                        && outHours < parameterInfo.UpperSpecificationsLimit.ToDouble();
+
+            var defectCode = !isNG ? "TQCK" : string.Empty;
+
+            var outputDto = CreateAgingOutputDto(area, stock, ResultTray, parameterInfo, outHours, defectCode);
+            content = await _agingInOrOutInputService.GetOCVOutputAsync(outputDto);
+
+            var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
+            if (!result.Success)
+                task.Remark = "NG";
+        }
+    }
+
+    // 璁＄畻鍑哄簱灏忔椂鐨勬柟娉�
+    private double CalculateOutHours(DtStockInfo stock) =>
+        (DateTime.Now - Convert.ToDateTime(stock.LinedProcessFeedbackTime ?? stock.CreateDate.ToString())).TotalHours;
+
+    // 鐢熸垚 AgingOutputDto 鐨勫皝瑁呮柟娉�
+    private AgingOutputDto CreateAgingOutputDto(Dt_AreaInfo area, DtStockInfo stock, ResultTrayCellsStatus resultTray,
+        ParameterInfo parameterInfo, double outHours, string defectCode)
+    {
+        return new AgingOutputDto
+        {
+            OpFlag = 1,
+            Software = area.Spare3,
+            EquipmentCode = area.Spare2,
+            TrayBarcode = stock.PalletCode,
+            SerialNos = resultTray.SerialNos.Select(x => new SerialNoOutDto
+            {
+                SlotNo = x.PositionNo,
+                SerialNo = x.SerialNo,
+                SerialNoResult = true,
+                ParameterInfo = new List<ParameterInfoOutput>
+                {
+                    new ParameterInfoOutput
+                    {
+                        Value = outHours.ToString(),
+                        ParameterCode = parameterInfo.ParameterCode,
+                        ParameterDesc = parameterInfo.Description,
+                        ParameterResult  = "OK",
+                        TargetValue = parameterInfo.TargetValue,
+                        LowerLomit = parameterInfo.LowerSpecificationsLimit,
+                        UpperLimit = parameterInfo.UpperSpecificationsLimit,
+                        DefectCode = defectCode,
+                    }
+                }
+            }).ToList()
+        };
+    }
+
+    // 鑾峰彇鍙傛暟淇℃伅鐨勮緟鍔╂柟娉�
+    private ParameterInfo GetParameterInfo(DtStockInfo stock) =>
+        JsonConvert.DeserializeObject<List<ParameterInfo>>(stock.ParameterInfos)
+            .FirstOrDefault(y => y.Description.Contains("鏃堕棿"));
+
     #endregion 浠诲姟璇锋眰鏂规硶
 
     #endregion private 鍐呴儴鏂规硶

--
Gitblit v1.9.3