From 5200b8b5a92b707ae7f115c7fd07cb7afc109980 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 03 七月 2025 15:44:03 +0800
Subject: [PATCH] 更新配置和扩展功能,优化代码结构  修改 `http.js` 中的 `axios.defaults.baseURL` 配置,调整开发环境 URL。 - 在 `Dt_BillGroupStock_Hty.jsx` 和 `Dt_OutTime.jsx` 中添加作者信息和文档链接,增强组件扩展功能。 - 新增 `tables.js` 中的路由配置,包含 `Dt_BillGroupStock_Hty` 的路径。 - 在 `Dt_BillGroupStock_Hty.vue` 和 `Dt_OutTime.vue` 中定义表格列、编辑和搜索表单字段。 - 新增 `IStockInfoHtyRepository.cs` 和 `IStockInfoHtyService.cs` 接口定义。 - 在 `StockInfoHtyRepository.cs` 和 `StockInfoHtyService.cs` 中实现分页查询和批量删除功能。 - 更新 `appsettings.json` 中的数据库连接字符串,修改数据库名称。

---
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs |   45 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index 6c2258f..daa6bbc 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -316,6 +316,17 @@
         }
 
         /// <summary>
+        /// 鏍规嵁鎵樼洏鍙枫�佷笅涓�鍦板潃鏌ヨ杈撻�佺嚎鎵ц涓殑浠诲姟
+        /// </summary>
+        /// <param name="taskNum">浠诲姟鍙�</param>
+        /// <param name="nextAddress">涓嬩竴鍦板潃</param>
+        /// <returns></returns>
+        public Dt_Task QueryExecutingConveyorLineTask(string nextAddress, string Barcode)
+        {
+            return BaseDal.QueryFirst(x => (x.NextAddress == nextAddress||x.TargetAddress==nextAddress) && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting), TaskOrderBy);
+        }
+
+        /// <summary>
         /// 鏍规嵁浠诲姟鍙枫�佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎瀹屾垚鐨勪换鍔�
         /// </summary>
         /// <param name="taskNum">浠诲姟鍙�</param>
@@ -571,9 +582,15 @@
                         // 鍙嶅簭鍒楀寲鍝嶅簲鍐呭
                         content = JsonConvert.DeserializeObject<WebResponseContent>(abc);
 
+
+                        QuartzLogger.WriteLogToFile($"Info_鑾峰彇璐т綅", $"鑾峰彇璐т綅,浠诲姟鍙�:銆恵task.TaskNum}銆�,鎵樼洏鍙凤細銆恵task.PalletCode}銆戣繑鍥炲弬鏁般�恵JsonConvert.SerializeObject(content)}銆憑Environment.NewLine}{Environment.NewLine}");
+
+
                         // 妫�鏌ョ姸鎬佸苟杩斿洖
                         if (!content.Status)
+                        {
                             return content;
+                        }
 
                         // 鍙嶅簭鍒楀寲浠诲姟鏁版嵁
                         var taskResult = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
@@ -709,18 +726,24 @@
                 var wmsIpAddress = wmsBase + completeTask;
 
                 var result = HttpHelper.GetAsync(wmsIpAddress, keys).Result;
-                content = JsonConvert.DeserializeObject<WebResponseContent>(result);
-                if (!content.Data.IsNullOrEmpty())
-                {
-                    if (content.Data.ToString() == "NG")
-                    {
-                        task.Remark = "NG";
-                        //BaseDal.UpdateData(task);
-                        //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴愶紝MOM杩斿洖NG");
-                    }
-                }
-                task.ExceptionMessage += "   " + content.Message;
 
+                QuartzLogger.WriteLogToFile($"Info_浠诲姟瀹屾垚", $"浠诲姟瀹屾垚,浠诲姟鍙�:銆恵taskNum}銆戣繑鍥炲弬鏁般�恵JsonConvert.SerializeObject(result)}銆憑Environment.NewLine}{Environment.NewLine}");
+                if(result != null)
+                {
+
+                    content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+                    if (!content.Data.IsNullOrEmpty())
+                    {
+                        if (content.Data.ToString() == "NG")
+                        {
+                            task.Remark = "NG";
+                            //BaseDal.UpdateData(task);
+                            //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴愶紝MOM杩斿洖NG");
+                        }
+                    }
+                    task.ExceptionMessage += "   " + content.Message;
+
+                }
                 #endregion WMS鍚屾浠诲姟瀹屾垚
 
                 if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)

--
Gitblit v1.9.3