From 1d044540ee1b7041c7e89bdfe6d1339c99e80a4e Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期三, 08 一月 2025 14:41:16 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu

---
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 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 85c1e58..1864fd5 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
@@ -303,6 +303,7 @@
 
         if (stationManager.stationType == 1)
         {
+            #region
             // 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
             TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
             {
@@ -368,6 +369,7 @@
             ////// 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
             ////var processResponse = await GetProcessResponseAsync(process, input.Position);
             var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+            #endregion
         }
 
         var task = new Dt_Task
@@ -387,10 +389,13 @@
             TaskNum = await BaseDal.GetTaskNo(),
             Creater = "Systeam"
         };
-        ConsoleHelper.WriteSuccessLine($"淇敼鍓嶏細" + locationInfo.LocationStatus.ToString());
+        int lastStatus = locationInfo.LocationStatus;
+        ConsoleHelper.WriteSuccessLine($"淇敼鍓嶏細" + lastStatus.ToString());
         locationInfo.LocationStatus = (int)LocationEnum.FreeDisable;
         ConsoleHelper.WriteSuccessLine($"淇敼鍚庯細" + locationInfo.LocationStatus.ToString());
         await UpdateLocationAsync(locationInfo);
+
+        _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInfo, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
 
         return task;
     }
@@ -672,10 +677,15 @@
 
             var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
 
-            ConsoleHelper.WriteSuccessLine($"淇敼鍓嶏細" + locationInfo.LocationStatus.ToString());
+            int lastStatus = locationInfo.LocationStatus;
+
+            ConsoleHelper.WriteSuccessLine($"淇敼鍓嶏細" + lastStatus.ToString());
             locationInfo.LocationStatus = (int)LocationEnum.FreeDisable;
             ConsoleHelper.WriteSuccessLine($"淇敼鍚庯細" + locationInfo.LocationStatus.ToString());
             await UpdateLocationAsync(locationInfo);
+
+            _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInfo, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
+
             return task;
         }
         catch (Exception ex)
@@ -784,10 +794,13 @@
                             var content = JsonConvert.DeserializeObject<WebResponseContent>(result);
                             if (content.Status)
                             {
+                                int lastStatus = item.LocationInfo.LocationStatus;
                                 await BaseDal.AddDataAsync(task);
                                 // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
                                 item.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
                                 await _locationRepository.UpdateDataAsync(item.LocationInfo);
+
+                                _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(item.LocationInfo, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
                             }
                         }
                     }
@@ -833,6 +846,7 @@
                     WMSTaskDTO wmsTask = CreateTaskDTO(task);
 
                     // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+                    int lastStatus = location.LocationStatus;
                     stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
                     location.LocationStatus = (int)LocationEnum.Distribute;
                     await _unitOfWorkManage.UseTranAsync(async () =>
@@ -841,6 +855,8 @@
                         await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
                         await _locationRepository.UpdateDataAsync(location);
                     });
+
+                    _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
 
                     // 杩斿洖鎴愬姛鍝嶅簲
                     return content.OK(data: wmsTask);
@@ -867,7 +883,6 @@
 
             var stockInfo = _stockInfoRepository.Db.Queryable<DtStockInfo>()
                     .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
-                    .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
                     .Where(x => x.AreaCode == "CWSC3" && x.IsFull == true) // 杩囨护鏉′欢
                     .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock) // 杩囨护鏉′欢
                     .OrderBy(x => x.OutboundTime) // 鎺掑簭
@@ -901,10 +916,14 @@
 
             WMSTaskDTO taskDTO = CreateTaskDTO(task);
 
+            int lastStatus = locationInfo.LocationStatus;
+
             BaseDal.AddData(task);
             stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
             _locationRepository.UpdateData(stockInfo.LocationInfo);
 
+            _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(stockInfo.LocationInfo, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
+
             return content.OK(data: taskDTO);
         }
         catch (Exception ex)

--
Gitblit v1.9.3