From 8be57756adb4de864917c85f864e23445baa66b7 Mon Sep 17 00:00:00 2001
From: 陈勇 <chenyong@hnkhzn.com>
Date: 星期一, 04 十一月 2024 10:44:38 +0800
Subject: [PATCH] 忽略项

---
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs |  312 ++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 217 insertions(+), 95 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 dd1a96c..bd89329 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,5 +1,10 @@
 锘縰sing Mapster;
-namespace WIDESEA_StorageOutTaskServices; 
+using WIDESEA_DTO.MOM;
+using WIDESEA_DTO.WMS;
+using WIDESEA_IStoragIntegrationServices;
+using WIDESEA_StorageBasicRepository;
+
+namespace WIDESEA_StorageOutTaskServices;
 
 public class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
 {
@@ -18,6 +23,9 @@
     private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository;
     private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
     private readonly IBoxingInfoRepository _boxingInfoRepository;
+    private readonly ICellStateService _cellStateService;
+    private readonly IProcessApplyService _processApplyService;
+    private readonly IDt_AreaInfoRepository _areaInfoRepository;
 
     public Dt_TaskService(IDt_TaskRepository BaseDal,
                                 IUnitOfWorkManage unitOfWorkManage,
@@ -33,7 +41,10 @@
                                 IPointStackerRelationRepository pointStackerRelationRepository,
                                 ITaskExecuteDetailRepository taskExecuteDetailRepository,
                                 ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
-                                IBoxingInfoRepository boxingInfoRepository) : base(BaseDal)
+                                IBoxingInfoRepository boxingInfoRepository,
+                                ICellStateService cellStateService,
+                                IProcessApplyService processApplyService,
+                                IDt_AreaInfoRepository areaInfoRepository) : base(BaseDal)
     {
         _unitOfWorkManage = unitOfWorkManage;
         _outOrderRepository = outOrderRepository;
@@ -49,6 +60,9 @@
         _taskExecuteDetailRepository = taskExecuteDetailRepository;
         _locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
         _boxingInfoRepository = boxingInfoRepository;
+        _cellStateService = cellStateService;
+        _processApplyService = processApplyService;
+        _areaInfoRepository = areaInfoRepository;
     }
 
     #region 澶栭儴鎺ュ彛鏂规硶
@@ -75,7 +89,7 @@
             });
 
             // 鏇存柊浠诲姟鐘舵��
-            task.TaskState = OutTaskStatusEnum.SC_OutFinish.ObjToInt();
+            task.TaskState = TaskOutStatusEnum.SC_OutFinish.ObjToInt();
             task.CurrentAddress = task.NextAddress;
             task.NextAddress = task.TargetAddress;
 
@@ -184,7 +198,7 @@
 
             // 淇敼璐т綅淇℃伅涓烘湁璐�
             var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
-            locationInf.LocationStatus = (int)LocationEnum.Lock;
+            locationInf.LocationStatus = (int)LocationEnum.InStock;
 
             LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
 
@@ -230,7 +244,7 @@
         if (stock == null)
         {
             LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "搴撳瓨涓嶅瓨鍦ㄥ瓨鍦紝鍒ゆ柇鏄惁鏄叆搴撲换鍔�", $"{task.TaskType}");
-            if (task.TaskType == (int)TaskTypeEnum.Inbound)
+            if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
             {
                 LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟", "");
                 return await CompleteInboundTaskAsync(task);
@@ -243,10 +257,10 @@
         }
         LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "楠岃瘉搴撳瓨鏄惁瀛樺湪", JsonConvert.SerializeObject(stock));
 
-        if (task.TaskType == (int)TaskTypeEnum.Outbound)
+        if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
         {
             LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", "");
-            if (task.TaskState == OutTaskStatusEnum.SC_OutExecuting.ObjToInt())
+            if (task.TaskState == TaskOutStatusEnum.SC_OutExecuting.ObjToInt())
             {
                 LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍫嗗灈鏈哄嚭搴撳畬鎴�", "");
                 return await CompleteStackTaskAsync(task, stock);
@@ -280,41 +294,156 @@
     /// <returns>鍖呭惈浠诲姟淇℃伅鐨勫搷搴斿唴瀹�</returns>
     public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
     {
+        // 鍒涘缓涓�涓猈ebResponseContent瀵硅薄
         WebResponseContent content = new WebResponseContent();
 
         try
         {
-            // 鏍规嵁鎵樼洏鑾峰彇搴撳瓨淇℃伅
-            var stockInfo = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
+            // 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
+            TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
+            {
+                TrayBarcode = input.PalletCode
+            };
 
-            // 鑾峰彇浠撳簱鍖哄煙淇℃伅
-            var areaInfo = await _wareAreaInfoRepository.QueryFirstAsync(x => x.WareAreaCode == input.AreaCode);
+            // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
+            content = await GetTrayCellStatusAsync(trayCells);
+            // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
+            if (!content.Status) return content;
 
-            // 鏌ヨ鏄惁宸叉湁浠诲姟
+            // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
+            ProcessApplyDto process = await GetProcessApplyAsync(content);
+            // 濡傛灉process涓簄ull锛屽垯杩斿洖content
+            if (process == null) return content;
+
+            // 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
+            var processResponse = await GetProcessResponseAsync(process, input.Position);
+
+            // 璋冪敤BaseDal.QueryFirstAsync鏂规硶锛屾煡璇换鍔�
             var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
-
-            if (task != null)
-            {
-                // 鏇存柊鐜版湁浠诲姟
-                content = await UpdateExistingTask(input, areaInfo.AreaID, task);
-            }
-            else
-            {
-                // 鍒涘缓鏂颁换鍔�
-                content = await CreateNewTask(input, areaInfo.AreaID);
-            }
+            // 濡傛灉task涓嶄负null锛屽垯璋冪敤UpdateExistingTask鏂规硶锛屾洿鏂颁换鍔★紱鍚﹀垯璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
+            content = task != null ? await UpdateExistingTask(input, task) : await CreateNewTask(processResponse, input);
         }
         catch (Exception err)
         {
-            // 閿欒澶勭悊
+            // 濡傛灉鍙戠敓寮傚父锛屽垯璋冪敤content.Error鏂规硶锛岃褰曢敊璇俊鎭紝骞惰緭鍑洪敊璇俊鎭�
             content.Error(err.Message);
             Console.WriteLine(err.Message);
         }
 
+        // 杩斿洖content
         return content;
     }
 
+    // 鑾峰彇鎵樼洏鍗曞厓鏍肩姸鎬�
+    private async Task<WebResponseContent> GetTrayCellStatusAsync(TrayCellsStatusDto trayCells)
+    {
+        // 璋冪敤_cellStateService.GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨墭鐩樺崟鍏冩牸鐘舵��
+        return await _cellStateService.GetTrayCellStatusAsync(trayCells);
+    }
+
+    // 鑾峰彇宸ヨ壓鐢宠
+    private async Task<ProcessApplyDto> GetProcessApplyAsync(WebResponseContent content)
+    {
+        // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
+        if (!content.Status) return null;
+
+        // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
+        var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+        // 鍒涘缓涓�涓狿rocessApplyDto瀵硅薄锛屽苟璧嬪��
+        return new ProcessApplyDto()
+        {
+            WipOrderNo = result.BindCode,
+            SerialNos = result.SerialNos.Select(item => new SerialNos
+            {
+                SerialNo = item.SerialNo
+            }).ToList()
+        };
+    }
+
+    // 鑾峰彇宸ヨ壓鍝嶅簲
+    private async Task<List<Dt_EquipmentProcess>> GetProcessResponseAsync(ProcessApplyDto process, string position)
+    {
+        // 濡傛灉process涓簄ull锛屽垯杩斿洖null
+        if (process == null) return null;
+
+        // 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
+        WebResponseContent content = await _processApplyService.GetProcessApplyAsync(process);
+        // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
+        if (!content.Status) return null;
+
+        // 灏哻ontent.Data杞崲涓篟esultProcessApply瀵硅薄
+        var apply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
+        // 鏍规嵁position鐨勫�硷紝杩斿洖涓嶅悓鐨凞t_EquipmentProcess鍒楄〃
+        switch (position)
+        {
+            case "1088":
+                return SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
+                    .Where(x => x.EquipmentType == "闄堝寲" && x.WipOrderNo == apply.WipOrderNo && x.ProductDesc == apply.ProductNo)
+                    .ToList();
+
+            default:
+                return new List<Dt_EquipmentProcess>();
+        }
+    }
+
     #endregion 璇锋眰浠诲姟
+
+    #region 璇锋眰绌烘墭鐩�
+
+    public async Task<WebResponseContent> RequestTrayTaskAsync(string position)
+    {
+        WebResponseContent content = new WebResponseContent();
+        try
+        {
+            var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == "CH");
+
+            var stockInfo = _stockInfoRepository.QueryData(x => x.Remark == area.AreaCode && x.StockInfoDetails.Any(z => z.MaterielCode == "绌烘墭鐩�")).OrderBy(x => x.CreateDate).FirstOrDefault();
+            // 鍒涘缓鏂颁换鍔″疄渚�
+            var task = new Dt_Task
+            {
+                CurrentAddress = stockInfo.LocationCode,
+                Grade = 1,
+                Roadway = stockInfo.LocationInfo.RoadwayNo,
+                TargetAddress = position,
+                Dispatchertime = DateTime.Now,
+                MaterialNo = "",
+                NextAddress = position,
+                OrderNo = null,
+                PalletCode = stockInfo.PalletCode,
+                SourceAddress = stockInfo.LocationCode,
+                TaskState = (int)TaskOutStatusEnum.OutNew,
+                TaskType = (int)TaskOutboundTypeEnum.OutTray,
+                TaskNum = await BaseDal.GetTaskNo(),
+                Creater = "Systeam"
+            };
+
+            var taskId = await BaseDal.AddDataAsync(task);
+            bool isResult = taskId > 0;
+            if (isResult)
+            {
+                WMSTaskDTO taskDTO = new WMSTaskDTO()
+                {
+                    TaskNum = task.TaskNum.Value,
+                    Grade = 1,
+                    PalletCode = DateTime.Now.ToString("MMddHHmmss"),
+                    RoadWay = task.Roadway,
+                    SourceAddress = stockInfo.LocationCode,
+                    TargetAddress = task.Roadway,
+                    TaskState = (int)TaskOutStatusEnum.OutNew,
+                    Id = 0,
+                    TaskType = (int)TaskOutboundTypeEnum.OutTray
+                };
+                content.OK(data: taskDTO);
+            }
+        }
+        catch (Exception ex)
+        {
+            throw;
+        }
+        return content;
+    }
+
+    #endregion 璇锋眰绌烘墭鐩�
 
     #endregion 澶栭儴鎺ュ彛鏂规硶
 
@@ -505,7 +634,7 @@
     private Dt_Task_Hty CreateHistoricalTask(Dt_Task task)
     {
         // 鏇存柊浠诲姟鐘舵��
-        task.TaskState = OutTaskStatusEnum.OutFinish.ObjToInt();
+        task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
         task.CurrentAddress = task.NextAddress;
 
         // 鍒涘缓鍘嗗彶浠诲姟
@@ -514,7 +643,7 @@
         taskHty.TaskId = 0;
         taskHty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
         taskHty.SourceId = task.TaskId;
-        taskHty.TaskState = OutTaskStatusEnum.OutFinish.ObjToInt();
+        taskHty.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
         return taskHty;
     }
 
@@ -605,7 +734,7 @@
     /// <param name="task">浠诲姟瀹炰緥</param>
     /// <param name="content">鍝嶅簲鍐呭</param>
     /// <returns></returns>
-    private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, int areaId, Dt_Task task)
+    private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, Dt_Task task)
     {
         // 鍒涘缓WebResponseContent瀵硅薄
         WebResponseContent content = new WebResponseContent();
@@ -617,26 +746,26 @@
         int beforeStatus = 0;
 
         // 鏍规嵁浠诲姟绫诲瀷鍒ゆ柇鏄嚭搴撲换鍔¤繕鏄叆搴撲换鍔�
-        if (input.Type == (int)TaskTypeEnum.Outbound)
-        {
-            // 澶勭悊鍑哄簱浠诲姟
-            toAddress = await GetRoadWayAsync(areaId, task.Roadway, input.Direction, input.Area, input.Type);
-            taskState = (int)OutTaskStatusEnum.SC_OutFinish;
-        }
-        else
-        {
-            // 澶勭悊鍏ュ簱浠诲姟
-            location = await GetLocationDistributeAsync(areaId, task.Roadway);
-            toAddress = location.LocationCode;
-            taskState = (int)InTaskStatusEnum.Line_InFinish;
-            beforeStatus = location.LocationStatus;
+        //if (input.Type == (int)TaskTypeEnum.Outbound)
+        //{
+        //    // 澶勭悊鍑哄簱浠诲姟
+        //    toAddress = await GetRoadWayAsync(areaId, task.Roadway, input.Direction, input.Area, input.Type);
+        //    taskState = (int)TaskOutStatusEnum.SC_OutFinish;
+        //}
+        //else
+        //{
+        // 澶勭悊鍏ュ簱浠诲姟
+        location = await GetLocationDistributeAsync(task.Roadway);
+        toAddress = location.LocationCode;
+        taskState = (int)TaskInStatusEnum.Line_InFinish;
+        beforeStatus = location.LocationStatus;
 
-            // 鏇存柊璐т綅淇℃伅
-            location.LocationStatus = (int)LocationEnum.Lock;
-        }
+        // 鏇存柊璐т綅淇℃伅
+        location.LocationStatus = (int)LocationEnum.Lock;
+        //}
 
         // 鏇存柊浠诲姟淇℃伅
-        task.SourceAddress = input.Position;
+        //task.SourceAddress = input.Position;
         task.CurrentAddress = input.Position;
         task.TargetAddress = toAddress;
         task.NextAddress = toAddress;
@@ -650,24 +779,22 @@
 
         // 灏濊瘯鏇存柊浠诲姟
         bool isResult = await BaseDal.UpdateDataAsync(task);
-        bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, original, input.Position, InTaskStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
-        if (input.Type != (int)TaskTypeEnum.Outbound)
+        bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, original, input.Position, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
+
+        // 鍒涘缓LocationChangeRecordDto瀵硅薄
+        LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()
         {
-            // 鍒涘缓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);
-        }
+            // 璁剧疆鍙橀噺
+            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)
         {
@@ -691,11 +818,12 @@
     /// <param name="areaId">鍖哄煙ID</param>
     /// <param name="content">鍝嶅簲鍐呭</param>
     /// <returns></returns>
-    private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, int areaId)
+    private async Task<WebResponseContent> CreateNewTask(List<Dt_EquipmentProcess> process, RequestTaskDto input)
     {
         WebResponseContent content = new WebResponseContent();
+        List<string> strings = process.Select(x => x.EquipmentName).ToList();
         // 鑾峰彇鐩爣鍦板潃
-        string ToAddress = await GetRoadWayAsync(areaId, input.Position, input.Direction, input.Area, input.Type);
+        string ToAddress = await GetRoadWayAsync(strings);
 
         // 鍒涘缓鏂颁换鍔″疄渚�
         var task = new Dt_Task
@@ -710,7 +838,7 @@
             OrderNo = null,
             PalletCode = input.PalletCode,
             SourceAddress = input.Position,
-            TaskState = (int)InTaskStatusEnum.InNew,
+            TaskState = (int)TaskInStatusEnum.InNew,
             TaskType = (int)TaskTypeEnum.Inbound,
             TaskNum = await BaseDal.GetTaskNo(),
             Creater = "Systeam"
@@ -721,9 +849,23 @@
         if (isResult)
         {
             task.TaskId = taskId;
-            isResult = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(input.PalletCode, input.Position, ToAddress, InTaskStatusEnum.InNew.GetIntegralRuleTypeEnumDesc()));
+            isResult = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(input.PalletCode, input.Position, ToAddress, TaskInStatusEnum.InNew.GetIntegralRuleTypeEnumDesc()));
             if (isResult)
-                content.OK(data: task);
+            {
+                WMSTaskDTO taskDTO = new WMSTaskDTO()
+                {
+                    TaskNum = 0,
+                    Grade = 1,
+                    PalletCode = DateTime.Now.ToString("MMddHHmmss"),
+                    RoadWay = task.Roadway,
+                    SourceAddress = input.Position,
+                    TargetAddress = task.Roadway,
+                    TaskState = (int)TaskInStatusEnum.InNew,
+                    Id = 0,
+                    TaskType = (int)TaskInboundTypeEnum.Inbound,
+                };
+                content.OK(data: taskDTO);
+            }
             else
                 content.Error("娣诲姞浠诲姟澶辫触");
         }
@@ -738,13 +880,13 @@
     /// <param name="areaId">鍖哄煙涓婚敭</param>
     /// <param name="roadWay">宸烽亾</param>
     /// <returns></returns>
-    public async Task<DtLocationInfo> GetLocationDistributeAsync(int areaId, string roadWay)
+    public async Task<DtLocationInfo> GetLocationDistributeAsync(string roadWay)
     {
         #region 鑾峰彇璐т綅
 
         try
         {
-            var locations = await _locationRepository.QueryDataAsync(x => x.AreaId == areaId && x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
+            var locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
             if (locations == null)
             {
                 return null;
@@ -769,36 +911,16 @@
     /// <param name="Direction">鏂瑰悜</param>
     /// <param name="area">鍏崇郴鍖哄煙</param>
     /// <returns></returns>
-    public async Task<string> GetRoadWayAsync(int areaId, string position, string Direction, string area, int type)
+    public async Task<string> GetRoadWayAsync(List<string> process)
     {
-        var point = new PointStackerRelation();
-        if (type == (int)TaskTypeEnum.Inbound)
-        {
-            point = await _pointStackerRelationRepository.QueryFirstAsync(x => x.Direction == Direction && x.PointCode == position && x.Area == area);
-            if (point == null) { return null; }
-            var locationInfos = await _locationRepository.QueryDataAsync(x => x.AreaId == areaId && point.StackerCode.Contains(x.RoadwayNo));
-            var groupWithMinCount = locationInfos.GroupBy(x => x.RoadwayNo).OrderBy(x => x.Count()).FirstOrDefault();
+        var minGroup = _locationRepository.QueryData(x => process.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)
+            .GroupBy(x => x.RoadwayNo)
+             .OrderBy(g => g.Count()) // 鏍规嵁姣忎釜缁勭殑鍏冪礌鏁伴噺鎺掑簭
+             .First(); // 鍙栧嚭鏁伴噺鏈�灏戠殑缁�
 
-            if (groupWithMinCount != null)
-                return groupWithMinCount.Key;
-            else
-                return null;
-        }
-        else if (type == (int)TaskTypeEnum.Outbound)
-        {
-            point = await _pointStackerRelationRepository.QueryFirstAsync(x => x.Direction == Direction && position == x.StackerCode && x.Area == area);
-            if (point == null) { return null; }
+        string minRoadwayNo = minGroup.Key; // 鏁伴噺鏈�灏戠殑缁勭殑Key
 
-            string station = point.PointCodeList[0];
-
-            var rList = point.PointCodeList;
-            rList.Remove(station);
-            rList.Add(station);
-
-            point.PointCodeList = rList;
-            return station;
-        }
-        else { return null; }
+        return minRoadwayNo;
     }
 
     #endregion 浠诲姟璇锋眰鏂规硶

--
Gitblit v1.9.3