From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突

---
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs |   49 +++++++++++++++++++------------------------------
 1 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
index 7f61b12..89e5155 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -1,22 +1,7 @@
-锘�
-using log4net.Core;
-using Mapster;
-using Masuit.Tools;
-using Masuit.Tools.Models;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
-using SixLabors.Fonts.Tables.AdvancedTypographic;
-using System.Diagnostics;
-using WIDESEA_Common;
+锘縰sing Masuit.Tools;
 using WIDESEA_Core.Const;
-using WIDESEA_DTO;
 using WIDESEA_DTO.MOM;
 using WIDESEA_DTO.WMS;
-using WIDESEA_IStorageBasicRepository;
-using WIDESEA_IStoragIntegrationServices;
-using WIDESEA_Model.Models;
-using WIDESEA_StorageBasicRepository;
-using WIDESEA_StorageTaskRepository;
-using WIDESEA_StoragIntegrationServices;
 using WIDESEAWCS_Model.Models;
 
 namespace WIDESEA_StorageTaskServices;
@@ -24,6 +9,7 @@
 public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
 {
     #region 璇锋眰浠诲姟鍏ュ簱
+
     /// <summary>
     /// 璇锋眰鍏ュ簱
     /// </summary>
@@ -73,7 +59,7 @@
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="input">璇锋眰鍙傛暟</param>
     /// <param name="flag">瀹炴绌烘鏍囪瘑</param>
@@ -156,10 +142,10 @@
     }
 
     #region 鐩存帴鍑哄簱浠诲姟
+
     private async Task<Dt_Task> CreateInToOutTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
     {
         //if (stationManager.stationType != 5) throw new Exception("閿欒鐨勮皟鍙�");
-
 
         input.EquiCodeMOM = "24MEJQ11-1006-1";
 
@@ -259,10 +245,11 @@
 
         return task;
     }
-    #endregion
 
+    #endregion 鐩存帴鍑哄簱浠诲姟
 
     #region 鍏ュ簱浠诲姟
+
     private async Task<Dt_Task> CreateInTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
     {
         if (stationManager.stationType != 1 && stationManager.stationType != 6) throw new Exception("閿欒鐨勮皟鍙�");
@@ -373,11 +360,13 @@
 
         return task;
     }
-    #endregion
+
+    #endregion 鍏ュ簱浠诲姟
 
     #region 搴撲綅鍒嗛厤
+
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="requestTask">璇锋眰鍙傛暟</param>
     /// <param name="isCheckRequest">鏄惁鏈娴嬪簱浣嶇被鍨�</param>
@@ -385,6 +374,7 @@
     private async Task<DtLocationInfo> RequestLocation(RequestTaskDto requestTask, bool isCheckRequest = false)
     {
         #region 鑾峰彇璐т綅
+
         try
         {
             List<DtLocationInfo> locations;
@@ -409,9 +399,11 @@
             Console.WriteLine(err.Message.ToString());
             return null;
         }
+
         #endregion 鑾峰彇璐т綅
     }
-    #endregion
+
+    #endregion 搴撲綅鍒嗛厤
 
     // 鑾峰彇宸ヨ壓鐢宠
     private async Task<ProcessApplyDto> GetProcessApplyAsync(RequestTaskDto input, ResultTrayCellsStatus content)
@@ -429,7 +421,7 @@
         };
     }
 
-    #endregion 璇锋眰绌烘鍑哄簱
+    #endregion 璇锋眰浠诲姟鍏ュ簱
 
     #region 鍒涘缓绌烘鍑哄簱浠诲姟
     public async Task<Dt_Task> CreateEmptyOutTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
@@ -469,13 +461,13 @@
         }
         catch (Exception ex)
         {
-
             throw new Exception(ex.Message);
         }
     }
     #endregion
 
     #region 鐩存帴鍑哄簱浠诲姟瀹屾垚
+
     public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task)
     {
         WebResponseContent content = new WebResponseContent();
@@ -494,7 +486,6 @@
             return content.Error(ex.Message);
         }
     }
-    #endregion
 
     #region 寮傚父鍙ｄ换鍔℃娴�
     public async Task<Dt_Task> CheckAbnormalTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
@@ -634,12 +625,12 @@
             throw new Exception(err.Message); // 鎶涘嚭寮傚父浠ヤ究澶栭儴鎹曡幏
         }
     }
-    #endregion
+
+    #endregion MyRegion
 
     #region 妫�娴嬮珮娓╁簱鏄惁鏈夊彲鍑哄簱搴撳瓨
     public WebResponseContent StockCheckingAsync()
     {
-
         WebResponseContent webResponseContent = new WebResponseContent();
         try
         {
@@ -663,7 +654,6 @@
                         if (stockInfo.Count <= 0) continue;
                         foreach (var item in stockInfo)
                         {
-
                             var hasTask = BaseDal.QueryFirst(x => x.PalletCode == item.PalletCode);
                             if (hasTask != null)
                             {
@@ -681,7 +671,6 @@
                             task.NextAddress = "002-000-002";
                             // 鍒涘缓浠诲姟DTO
                             WMSTaskDTO taskDTO = CreateTaskDTO(task);
-
 
                             var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                             var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
@@ -718,7 +707,7 @@
         }
     }
 
-    #endregion
+    #endregion 妫�娴嬮珮娓╁簱鏄惁鏈夊彲鍑哄簱搴撳瓨
 
     #region 甯告俯琛ョ┖鎵樼洏鑷冲垎瀹�
     public async Task<WebResponseContent> GetFROutTrayToCW(RequestTaskDto taskDTO)

--
Gitblit v1.9.3