From 2de09bec5cc05bf875543fa8956167ca7db73021 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期三, 25 六月 2025 11:36:44 +0800
Subject: [PATCH] 合并

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs |   66 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 0 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
index 43a9f6d..07715d9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
@@ -74,6 +74,66 @@
             }
         }
 
+        /// <summary>
+        /// 鏍规嵁鎵樼洏鍙枫�佽捣濮嬪湴鍧�鍚慦MS璇锋眰浠诲姟锛堝叆搴撶増鏈�)
+        /// </summary>
+        /// <param name="palletCode">鎵樼洏鍙�</param>
+        /// <param name="sourceAddress">璧峰鍦板潃</param>
+        /// <returns></returns>
+        public Dt_Task? InBeforeCheck(int taskNum)
+        {
+            WebResponseContent content = new WebResponseContent();
+            try
+            {
+                var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+                var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
+                var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.InTransferCheck)?.ConfigValue;
+                if (wmsBase == null || requestTask == null)
+                {
+                    throw new InvalidOperationException("WMS IP 鏈厤缃�");
+                }
+                var wmsIpAddrss = wmsBase + requestTask;
+
+                var result = HttpHelper.Post(wmsIpAddrss, new { taskNum = taskNum }.ToJsonString());
+                content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+
+                if (!content.Status)
+                {
+                    // wms澶辫触
+                    throw new Exception();
+                }
+
+
+                //todo 浼樺寲 濡傛湭鏌ヨ鍒颁换鍔″垯澶勭悊
+                //if (content.Data != null)
+                //{
+                var task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());
+
+                Dt_Task? Relocationtask = null;
+                if (task.TaskNum != taskNum)
+                {
+
+                    BaseDal.AddData(task);
+                    Relocationtask = BaseDal.QueryFirst(x => x.TaskNum == task.TaskNum);
+                }
+                //}
+
+                if (Relocationtask != null)
+                {
+                    return task;
+                }
+                else
+                {
+                    return null;
+                }
+
+            }
+            catch (Exception ex)
+            {
+                throw new Exception($"璇锋眰寮傚父锛歿ex.Message}");
+            }
+        }
+
         #region 鏍规嵁鎵樼洏鍙枫�佺珯鍙板悜WMS璇锋眰浠诲姟
         /// <summary>
         /// 鏍规嵁鎵樼洏鍙枫�佺珯鍙板悜WMS璇锋眰浠诲姟
@@ -213,7 +273,13 @@
                 if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                 {
                     var stationinfo = _stationManagerRepository.QueryFirst(x => x.stationLocation == taskDTO.TargetAddress && x.Roadway == taskDTO.RoadWay);
+
                     task.TaskState = (int)TaskOutStatusEnum.OutNew;
+                    if (task.SourceAddress == "2009")
+                    {
+                        task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
+                    }
+                    
                     task.CurrentAddress = taskDTO.RoadWay;
                     task.NextAddress = stationinfo.stationChildCode;
                     task.SourceAddress = taskDTO.SourceAddress;

--
Gitblit v1.9.3