From f8f31ede7a7d550cf0cea943226bd521bd4274a8 Mon Sep 17 00:00:00 2001
From: Zhang-Hong-Lin <a3219986988@163.com>
Date: 星期二, 04 三月 2025 20:24:52 +0800
Subject: [PATCH] a

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs |  336 +++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 261 insertions(+), 75 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 9d2d993..4b4aad7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -16,15 +16,22 @@
 #endregion << 鐗� 鏈� 娉� 閲� >>
 
 using AutoMapper;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
 using SqlSugar;
 using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using WIDESEAWCS_Common.LocationEnum;
+using WIDESEAWCS_Common.StockEnum;
 using WIDESEAWCS_Common.TaskEnum;
 using WIDESEAWCS_Core;
 using WIDESEAWCS_Core.BaseRepository;
 using WIDESEAWCS_Core.BaseServices;
 using WIDESEAWCS_DTO.TaskInfo;
+using WIDESEAWCS_ISystemServices;
 using WIDESEAWCS_ITaskInfoService;
+using WIDESEAWCS_IWMSPart;
 using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_Model.Models.System;
 using WIDESEAWCS_QuartzJob.Models;
 using WIDESEAWCS_QuartzJob.Service;
 
@@ -35,6 +42,13 @@
         private readonly IRouterService _routerService;
         private readonly ITaskExecuteDetailService _taskExecuteDetailService;
         private readonly IRepository<Dt_TaskExecuteDetail> _taskExecuteDetailRepository;
+        private readonly IRepository<Dt_StockInfo> _stockRepository;
+        private readonly IRepository<Dt_LocationInfo> _locationRepository;
+        private readonly IRepository<dt_batchInfo> _batchinfoRepository;
+        private readonly IRepository<Dt_Task_hty> _taskhtyRepository;
+        private readonly IUnitOfWorkManage _unitOfWorkManage;
+        private readonly IRepository<dt_errormsgInfo> _errorinfoRepository;
+        private readonly Idt_ErrormsginfoService _ErrormsginfoService;
         private readonly IMapper _mapper;
 
         private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -54,11 +68,30 @@
         /// </summary>
         public IRepository<Dt_Task> Repository => BaseDal;
 
-        public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper) : base(BaseDal)
+        //SBText ITaskService.text { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+
+        public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, 
+            ITaskExecuteDetailService taskExecuteDetailService, 
+            IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository,
+            IRepository<Dt_StockInfo> stockRepository,
+            IRepository<Dt_LocationInfo> locationRepository,
+            IRepository<dt_batchInfo> batchRepository,
+            IRepository<Dt_Task_hty> taskhtyRepository,
+            IRepository<dt_errormsgInfo> errorinfoRepository,
+            Idt_ErrormsginfoService errormsginfoService,
+            IUnitOfWorkManage unitOfWorkManage,
+            IMapper mapper) : base(BaseDal)
         {
             _routerService = routerService;
             _taskExecuteDetailService = taskExecuteDetailService;
             _taskExecuteDetailRepository = taskExecuteDetailRepository;
+            _stockRepository = stockRepository;
+            _locationRepository = locationRepository;
+            _batchinfoRepository = batchRepository;
+            _taskhtyRepository = taskhtyRepository;
+            _unitOfWorkManage = unitOfWorkManage;
+            _errorinfoRepository = errorinfoRepository;
+            _ErrormsginfoService = errormsginfoService;
             _mapper = mapper;
         }
 
@@ -170,7 +203,7 @@
         /// <returns></returns>
         public Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress)
         {
-            return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.NextAddress == nextAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting), TaskOrderBy);
+            return null;// BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.NextAddress == nextAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting), TaskOrderBy);
         }
 
         /// <summary>
@@ -181,7 +214,7 @@
         /// <returns></returns>
         public Dt_Task QueryCompletedConveyorLineTask(int taskNum, string currentAddress)
         {
-            return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InFinish || x.TaskState == (int)TaskOutStatusEnum.Line_OutFinish), TaskOrderBy);
+            return null;// BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InFinish || x.TaskState == (int)TaskOutStatusEnum.Line_OutFinish), TaskOrderBy);
         }
 
         /// <summary>
@@ -207,12 +240,39 @@
         /// <param name="deviceNo">璁惧缂栧彿</param>
         /// <param name="currentAddress">褰撳墠鍦板潃</param>
         /// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
-        public Dt_Task QueryStackerCraneTask(string deviceNo, string currentAddress = "")
+        public Dt_Task QueryStackerCraneTask(string workTpe, string currentAddress = "")
         {
-            if (string.IsNullOrEmpty(currentAddress))
-                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy);
-            else
-                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.CurrentAddress == currentAddress && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy);
+            Dt_Task task = new Dt_Task();
+            try
+            {
+                //浼樺厛鏌ヨ褰撳墠浠诲姟姹犱腑鏄惁鏈夊彇璐у畬鎴愮殑浠诲姟
+                task = BaseDal.QueryFirst(v => v.TaskState == (int)TaskInStatusEnum.Line_Ingrab || v.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting);
+                if (task != null)
+                {
+                    //浼樺厛杩斿洖鎵ц鍒颁竴鍗婄殑浠诲姟缁х画鎵ц
+                    return task;
+                }
+                //鏌ヨ褰撳墠浠诲姟姹犱腑鏄惁瀛樺湪鐘舵�佷负闈炴柊寤虹殑
+                //task= BaseDal.QueryFirst(v => v.TaskState != (int)TaskInStatusEnum.InNew || v.TaskState != (int)TaskOutStatusEnum.OutNew);
+                //if (task != null)
+                //{
+                //    throw new Exception($"褰撳墠浠诲姟姹犱腑瀛樺湪鎵ц涓殑浠诲姟,浠诲姟鍙�:銆恵task.TaskNum}銆�");
+                //}
+                if (workTpe.Equals("In"))
+                {
+                    task = BaseDal.QueryData(v=>v.TaskType==(int)TaskInboundTypeEnum.Inbound && v.TaskState==(int)TaskInStatusEnum.InNew).OrderByDescending(v=>v.Grade) .OrderBy(v=>v.CreateDate).First();
+                }
+                else if (workTpe.Equals("Out"))
+                {
+                    task = BaseDal.QueryData(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
+                }
+            }
+            catch (Exception)
+            {
+                //灏嗛敊璇俊鎭洿鏂拌嚦閿欒淇℃伅璁板綍琛�
+
+            }
+            return task;
         }
 
         /// <summary>
@@ -244,6 +304,58 @@
         }
 
         /// <summary>
+        /// 鏍规嵁浠诲姟鍙疯繑鍥炲綋鍓嶄换鍔�
+        /// </summary>
+        /// <param name="deviceNo">璁惧缂栧彿</param>
+        /// <param name="currentAddress">褰撳墠鍦板潃</param>
+        /// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
+        public Dt_Task QueryTakNnmTask(int taskNum)
+        {
+            return BaseDal.QueryFirst(v=>v.TaskId== taskNum);
+        }
+        /// <summary>
+        /// 淇敼澶╄溅浠诲姟鐘舵�侊紝灏嗗叆搴撳彇璐ф墽琛屼腑淇敼涓哄叆搴撳彇璐у畬鎴�
+        /// </summary>
+        /// <returns></returns>
+        public WebResponseContent UpdateTaskStatusToLine_Ingrab(Dt_Task task) 
+        {
+            WebResponseContent content = new WebResponseContent();
+            try
+            {
+                task.TaskState = (int)TaskInStatusEnum.Line_Ingrab;
+                BaseDal.UpdateData(task);
+                content = WebResponseContent.Instance.OK();
+            }
+            catch (Exception ex)
+            {
+                content = WebResponseContent.Instance.Error(ex.Message);
+                UpdateTaskExceptionMessage(task.TaskNum, ex.Message);
+            }
+            return content;
+        }
+
+        /// <summary>
+        /// 淇敼澶╄溅浠诲姟鐘舵�侊紝灏嗗嚭搴撳彇璐ф墽琛屼腑淇敼涓哄嚭搴撳彇璐у畬鎴�
+        /// </summary>
+        /// <returns></returns>
+        public WebResponseContent UpdateTaskStatusToLine_Outgrab(Dt_Task task)
+        {
+            WebResponseContent content = new WebResponseContent();
+            try
+            {
+                task.TaskState = (int)TaskOutStatusEnum.SC_OutExecuting;
+                BaseDal.UpdateData(task);
+                content = WebResponseContent.Instance.OK();
+            }
+            catch (Exception ex)
+            {
+                content = WebResponseContent.Instance.Error(ex.Message);
+                UpdateTaskExceptionMessage(task.TaskNum, ex.Message);
+            }
+            return content;
+        }
+
+        /// <summary>
         /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鍑哄簱绫诲瀷鐨勬柊澧炵殑浠诲姟
         /// </summary>
         /// <param name="deviceNo">璁惧缂栧彿</param>
@@ -266,19 +378,19 @@
             {
                 Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                 if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
-                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
-                {
-                    task.TaskState = (int)TaskOutStatusEnum.OutPending;
-                }
-                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
-                {
-                    task.TaskState = (int)TaskInStatusEnum.InPending;
-                }
+                //if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
+                //{
+                //    task.TaskState = (int)TaskOutStatusEnum.OutPending;
+                //}
+                //else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
+                //{
+                //    task.TaskState = (int)TaskInStatusEnum.InPending;
+                //}
                 task.ExceptionMessage = message;
                 task.ModifyDate = DateTime.Now;
                 BaseDal.UpdateData(task);
 
-                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, task.ExceptionMessage);
+                //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, task.ExceptionMessage);
 
                 content = WebResponseContent.Instance.OK();
             }
@@ -290,17 +402,38 @@
         }
 
         /// <summary>
-        /// 鏇存柊浠诲姟鐘舵�佷俊鎭紝骞跺悓姝ヨ嚦WMS
+        /// 鏇存柊浠诲姟鐘舵�佷俊鎭�
         /// </summary>
         /// <param name="taskNum">浠诲姟鍙�</param>
         /// <param name="status">浠诲姟鐘舵��</param>
         public void UpdateTaskStatus(int taskNum, int status)
         {
-            Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
-            if (task == null) return;
-            task.TaskState = status;
-            task.ModifyDate = DateTime.Now;
-            BaseDal.UpdateData(task);
+            try
+            {
+                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+                if (status == 2 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
+                {
+                    task.TaskState = (int)TaskInStatusEnum.Line_InGrabExecuting;
+                }
+                else if (status == 2 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+                {
+                    task.TaskState = (int)TaskOutStatusEnum.Line_OutGrabExecuting;
+                }
+                if (status == 3 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
+                {
+                    task.TaskState = (int)TaskInStatusEnum.Line_InDownExecuting;
+                }
+                else if (status == 3 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+                {
+                    task.TaskState = (int)TaskOutStatusEnum.Line_OutWownExecuting;
+                }
+                task.ModifyDate = DateTime.Now;
+                BaseDal.UpdateData(task);
+            }
+            catch (Exception ex)
+            {
+                UpdateTaskExceptionMessage(taskNum, ex.Message);
+            }
         }
 
         /// <summary>
@@ -428,74 +561,127 @@
         /// </summary>
         /// <param name="taskNum">浠诲姟缂栧彿</param>
         /// <returns>杩斿洖澶勭悊缁撴灉</returns>
-        public WebResponseContent StackCraneTaskCompleted(int taskNum)
+        public WebResponseContent StackCraneTaskCompleted(int taskNum,float weight)
         {
             WebResponseContent content = new WebResponseContent();
             try
             {
-                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
-                if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
-
-                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
+                var nawtask = BaseDal.QueryFirst(v=>v.TaskId== taskNum);
+                if (nawtask == null)
                 {
-                    List<Dt_Router> routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);
-                    if (!routers.Any()) return WebResponseContent.Instance.Error($"鏈壘鍒拌澶囪矾鐢变俊鎭�");
-
-                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
-                    task.TaskState = nextStatus;
-                    task.CurrentAddress = task.NextAddress;
-                    task.NextAddress = routers.FirstOrDefault().ChildPosi;
-                    task.ModifyDate = DateTime.Now;
-                    task.Modifier = "System";
-                    BaseDal.UpdateData(task);
-
-                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
-                    //todo 鍚屾鍒癢MS
-
-                    //鏆備笉鑰冭檻澶氫釜鍑哄簱鍙�
+                    throw new Exception(string.Format("澶╄溅鏀捐揣瀹屾垚浠诲姟鏈煡璇㈠埌浠诲姟鍙穥0}", taskNum));
                 }
-                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
+                if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
                 {
-                    //todo 
-                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
-                    task.TaskState = nextStatus;
-                    task.ModifyDate = DateTime.Now;
-                    task.Modifier = "System";
-                    BaseDal.UpdateData(task);
-                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撳畬鎴�");
-
-                    WMSTaskDTO taskDTO = new WMSTaskDTO()
+                    var batck = _batchinfoRepository.QueryFirst(v=>v.Id==1);
+                    //鏂板缓搴撳瓨
+                    Dt_StockInfo stock = new Dt_StockInfo();
+                    stock.LocationCode = nawtask.TargetAddress;
+                    stock.Weight = (decimal)weight;
+                    stock.StockStatus = (int)stockEnum.Free;
+                    stock.BatchNo = batck.InBatch;
+                    if (nawtask.Remark== (int)MateTypeEnum.ZiChan)
                     {
-                        TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),
-                        Grade = 1,
-                        PalletCode = task.PalletCode + "S",
-                        RoadWay = "SC01",
-                        SourceAddress = task.TargetAddress,
-                        TargetAddress = "CLOutAreaA",
-                        TaskState = (int)TaskOutStatusEnum.OutNew,
-                        Id = 0,
-                        TaskType = (int)TaskOutboundTypeEnum.Outbound
-                    };
-
-                    content = ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
+                        stock.Remark = (int)MateTypeEnum.ZiChan;
+                    }
+                    else
+                    {
+                        stock.Remark = (int)MateTypeEnum.WaiGou;
+                    }
+                    Dt_StockInfo stockTow = new Dt_StockInfo();
+                    stockTow.LocationCode = nawtask.NextAddress;
+                    stockTow.Weight = (decimal)weight;
+                    stockTow.StockStatus = (int)stockEnum.Free;
+                    stockTow.BatchNo = batck.InBatch;
+                    if (nawtask.Remark == (int)MateTypeEnum.ZiChan)
+                    {
+                        stockTow.Remark = (int)MateTypeEnum.ZiChan;
+                    }
+                    else
+                    {
+                        stockTow.Remark = (int)MateTypeEnum.WaiGou;
+                    }
+                    //淇敼璐т綅淇℃伅
+                    var location = _locationRepository.QueryFirst(v=>v.LocationCode==nawtask.TargetAddress);
+                    location.LocationStatus = (int)LocationStatusEnum.InStock;
+                    //淇敼璐т綅淇℃伅
+                    var locationtow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
+                    locationtow.LocationStatus = (int)LocationStatusEnum.InStock;
+                    //澶勭悊浠诲姟淇℃伅
+                    Dt_Task_hty taskhty = new Dt_Task_hty();
+                    taskhty.TaskNum = nawtask.TaskNum;
+                    taskhty.Roadway = nawtask.Roadway;
+                    taskhty.TaskType = nawtask.TaskType;
+                    taskhty.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+                    taskhty.SourceAddress = nawtask.SourceAddress;
+                    taskhty.TargetAddress = nawtask.TargetAddress;
+                    taskhty.ExceptionMessage = nawtask.ExceptionMessage;
+                    taskhty.Grade = nawtask.Grade;
+                    taskhty.Dispatchertime = nawtask.Dispatchertime;
+                    taskhty.Remark = nawtask.Remark;
+                    taskhty.PalletCode = nawtask.PalletCode;
+                    taskhty.NextAddress = nawtask.NextAddress;
+                    taskhty.CurrentAddress = nawtask.CurrentAddress;
+                    //寮�濮嬫暟鎹簱浜嬪姟
+                    _unitOfWorkManage.BeginTran();
+                    _stockRepository.AddData(stock);
+                    _stockRepository.AddData(stockTow);
+                    _locationRepository.UpdateData(location);
+                    _locationRepository.UpdateData(locationtow);
+                    _taskhtyRepository.AddData(taskhty);
+                    BaseDal.DeleteData(nawtask);
+                    //鎻愪氦浜嬪姟
+                    _unitOfWorkManage.CommitTran();
                 }
-                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
+                else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                 {
-                    //todo 璋冪敤WMS绉诲簱瀹屾垚
-                }
-                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OtherGroup)
-                {
-
-                }
-                else
-                {
-                    throw new Exception($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
+                    //鏌ユ壘搴撳瓨
+                    var stock = _stockRepository.QueryFirst(v=>v.LocationCode== nawtask.SourceAddress);
+                    if (stock == null) 
+                    {
+                        throw new Exception($"鏈壘鍒板簱瀛樹俊鎭揣浣嶅彿:銆恵nawtask.TargetAddress}銆�");
+                    }
+                    var Towstock = _stockRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
+                    //淇敼璐т綅鐘舵��
+                    var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress);
+                    location.LocationStatus = (int)LocationStatusEnum.Free;
+                    //淇敼璐т綅鐘舵��
+                    var locationTow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
+                    locationTow.LocationStatus = (int)LocationStatusEnum.Free;
+                    //鍑嗗鍘嗗彶浠诲姟鏁版嵁
+                    Dt_Task_hty taskhty = new Dt_Task_hty();
+                    taskhty.TaskNum = nawtask.TaskNum;
+                    taskhty.Roadway = nawtask.Roadway;
+                    taskhty.TaskType = nawtask.TaskType;
+                    taskhty.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+                    taskhty.SourceAddress = nawtask.SourceAddress;
+                    taskhty.TargetAddress = nawtask.TargetAddress;
+                    taskhty.ExceptionMessage = nawtask.ExceptionMessage;
+                    taskhty.Grade = nawtask.Grade;
+                    taskhty.Dispatchertime = nawtask.Dispatchertime;
+                    taskhty.Remark = nawtask.Remark;
+                    taskhty.PalletCode = nawtask.PalletCode;
+                    taskhty.NextAddress = nawtask.NextAddress;
+                    taskhty.CurrentAddress = nawtask.CurrentAddress;
+                    //寮�濮嬫暟鎹簱浜嬪姟
+                    _unitOfWorkManage.BeginTran();
+                    _stockRepository.DeleteData(stock);
+                    _stockRepository.DeleteData(Towstock);
+                    _locationRepository.UpdateData(location);
+                    _locationRepository.UpdateData(locationTow);
+                    _taskhtyRepository.AddData(taskhty);
+                    BaseDal.DeleteData(nawtask);
+                    //鎻愪氦浜嬪姟
+                    _unitOfWorkManage.CommitTran();
                 }
                 content = WebResponseContent.Instance.OK();
             }
             catch (Exception ex)
             {
+                //鍥炴粴浜嬪姟
+                _unitOfWorkManage.RollbackTran();
                 content = WebResponseContent.Instance.Error($"浠诲姟瀹屾垚寮傚父,浠诲姟鍙�:銆恵taskNum}銆�");
+                UpdateTaskExceptionMessage(taskNum,ex.Message);
             }
             return content;
         }

--
Gitblit v1.9.3