From 95c865c03a9cb128af51ac4b7d7f9d7149441efd Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期一, 07 七月 2025 17:30:35 +0800
Subject: [PATCH] agv效率开发

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
index b8f0cfa..fe3d3c1 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
@@ -15,6 +15,7 @@
 using System.Diagnostics.Eventing.Reader;
 using System.IdentityModel.Protocols.WSTrust;
 using System.Linq;
+using System.Net.NetworkInformation;
 using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
@@ -96,7 +97,7 @@
         /// <param name="model">璇锋眰鍙傛暟</param>
         /// <param name="url">鍦板潃</param>
         /// <param name="TN_Task">浠诲姟</param>
-        internal static void OperateReq(AgvTaskState model, string url, WCSTask TN_Task)
+        internal static void OperateReq(AgvTaskState model, string url, WCSTask TN_Task, string name)
         {
             try
             {
@@ -184,7 +185,7 @@
                             }
                             else
                             {
-                                if (OperateReqByPost(url, TN_Task.S_EQ_NO, TN_Task.S_CODE, loc, type, model.state))
+                                if (OperateReqByPost(url, TN_Task.S_EQ_NO, TN_Task.S_CODE, loc, type, model.state, name))
                                 {
                                     // NDCHelper.ChangeParam(TN_Task.S_CODE.Trim(), 1101, 18);
                                     NDCApi.ChangeOrderParam(TN_Task.S_CODE.Trim(), 6, "1");
@@ -287,7 +288,7 @@
                         }
                         else
                         {
-                            if (OperateReqByPost(url, TN_Task.S_EQ_NO, TN_Task.S_CODE, loc, type, model.state))
+                            if (OperateReqByPost(url, TN_Task.S_EQ_NO, TN_Task.S_CODE, loc, type, model.state, name))
                             {
                                 NDCApi.ChangeOrderParam(TN_Task.S_CODE.Trim(), 6, "1");
                             }
@@ -341,7 +342,6 @@
             }
             catch (Exception ex)
             {
-
                 LogHelper.Info($"OperateReq Error ==銆媨ex.ToString()}");
             }
 
@@ -358,7 +358,7 @@
         /// <param name="type"></param>
         /// <param name="taskStatus"></param>
         /// <returns></returns>
-        internal static bool OperateReqByPost(string url, string tasknum, string ordernum, string station, int type, int taskStatus)
+        internal static bool OperateReqByPost(string url, string tasknum, string ordernum, string station, int type, int taskStatus, string name)
         {
             bool permit = false;
             try
@@ -383,6 +383,7 @@
                     LogHelper.Info($"瀹夊叏璇锋眰澶辫触=>msg:{result.msg}");
                     ApiHelper.AddErrorInfo("瀹夊叏浜や簰澶辫触", result.msg, "", tasknum);
                 }
+                ApiHelper.AddInfo(name, "瀹夊叏璇锋眰", date, JsonConvert.SerializeObject(result), "Post", url);
                 return permit;
             }
             catch (Exception)
@@ -433,6 +434,7 @@
                     LogHelper.Info($"瀹夊叏璇锋眰澶辫触=>msg:{result.err_msg}");
                     ApiHelper.AddErrorInfo("瀹夊叏浜や簰澶辫触", result.err_msg, "", no);
                 }
+                ApiHelper.AddInfo("YCL", "瀹夊叏璇锋眰", date, JsonConvert.SerializeObject(result), "Post", url);
                 return permit;
             }
             catch (Exception)
@@ -671,7 +673,22 @@
             //  }
             return result;
         }
-
+        /// <summary>
+        /// 绌烘墭绛夊緟浠诲姟 瓒呮椂5鍒嗙粍鐩存帴鎺ㄩ�
+        /// </summary>
+        /// <param name="mst"></param>
+        /// <returns></returns>
+        internal static void WaitSend(WCSTask mst)
+        {
+            // 璁$畻涓庡綋鍓嶆椂闂寸殑宸�
+            TimeSpan timeDifference = DateTime.Now - mst.T_CREATE;
+            if (timeDifference.TotalMinutes > 5)
+            {
+                var db = new SqlHelper<WCSTask>().GetInstance();
+                mst.S_B_STATE = "绛夊緟";
+                db.Updateable(mst).UpdateColumns(it => new { it.S_B_STATE }).ExecuteCommand();
+            }
+        }
         /// <summary>
         /// 浠诲姟鐘舵�鍥炴姤
         /// </summary>
@@ -679,7 +696,7 @@
         /// <param name="orderNum">鍗曞彿</param>
         /// <param name="taskStatus">浠诲姟鐘舵�</param>
         /// <param name="url">涓婃姤鎺ュ彛</param>
-        public static void Reportback(string taskNum, string orderNum, int taskStatus, string url)
+        public static void Reportback(string taskNum, string orderNum, int taskStatus, string url, string ly)
         {
             LogHelper.Info($"------------寮�浠诲姟鍥炴姤-----------");
             try
@@ -709,6 +726,7 @@
                 {
                     LogHelper.Info($"浠诲姟鍥炴姤澶辫触=>msg:{result.msg}");
                 }
+                ApiHelper.AddInfo(ly, "浠诲姟鐘舵�鍥炴姤", date, JsonConvert.SerializeObject(result), "Post", url);
             }
             catch (Exception ex)
             {
@@ -762,6 +780,7 @@
                 {
                     LogHelper.Info($"浠诲姟鍥炴姤澶辫触=");
                 }
+                ApiHelper.AddInfo("Wms", "浠诲姟鐘舵�鍥炴姤", date, JsonConvert.SerializeObject(result), "Post", url);
             }
             catch (Exception ex)
             {
@@ -807,6 +826,7 @@
                 {
                     LogHelper.Info($"浠诲姟鍥炴姤澶辫触=>msg:{result.err_msg}");
                 }
+                ApiHelper.AddInfo("YCL", "浠诲姟鐘舵�鍥炴姤", date, JsonConvert.SerializeObject(result), "Post", url);
             }
             catch (Exception ex)
             {
@@ -885,6 +905,7 @@
                 {
                     LogHelper.Info($"浠诲姟鍥炴姤澶辫触=>msg:{result.imsg}");
                 }
+                ApiHelper.AddInfo("Mes", "浠诲姟鐘舵�鍥炴姤", date, JsonConvert.SerializeObject(result), "Post", url);
             }
             catch (Exception ex)
             {
@@ -916,6 +937,7 @@
                 //绮夋枡鍥炲簱涓嶉渶瑕佸洖鎶�                 if (cntritem != null && mst.S_TYPE == "浣欐枡杩斿洖" && cntritem.S_ITEM_CODE.StartsWith("4X"))
                 {
+                    LogHelper.Info("绮夋枡鍥炲簱涓嶉渶瑕佸埌浣嶅彂閫佺墿鏂欏埌浣�);
                     return;
                 }
                 //鑾峰彇鏃堕棿鎴�@@ -992,6 +1014,7 @@
                 {
                     LogHelper.Info($"鐗╂枡鍒颁綅鍥炴姤澶辫触=>msg:{result.imsg}");
                 }
+                ApiHelper.AddInfo("Mes", "鐗╂枡鍒颁綅鍥炴姤", date, JsonConvert.SerializeObject(result), "Post", url);
             }
             catch (Exception ex)
             {

--
Gitblit v1.9.1