From fbb00fcb70e66f59b90cdd30a266518bab42a49d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=97=E9=93=AD=20=E5=90=95?= <896951544@qq.com>
Date: Thu, 20 Mar 2025 08:29:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9WCS-LCS=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WcfControlMonitorLib/CCallService.cs  | 2 +-
 WcfControlMonitorLib/CObtainTask.cs   | 6 +++---
 webapi/WindowsFormsApp1/APIChannel.cs | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/WcfControlMonitorLib/CCallService.cs b/WcfControlMonitorLib/CCallService.cs
index 1648f13..954e860 100644
--- a/WcfControlMonitorLib/CCallService.cs
+++ b/WcfControlMonitorLib/CCallService.cs
@@ -629,7 +629,7 @@ namespace WcfControlMonitorLib
             /// <summary>
             /// 任务优先级
             /// </summary>
-            public string priority { get; set; }
+            public int priority { get; set; }
             /// <summary>
             /// 下发时间
             /// </summary>
diff --git a/WcfControlMonitorLib/CObtainTask.cs b/WcfControlMonitorLib/CObtainTask.cs
index 21515d2..af73d87 100644
--- a/WcfControlMonitorLib/CObtainTask.cs
+++ b/WcfControlMonitorLib/CObtainTask.cs
@@ -164,7 +164,7 @@ namespace WcfControlMonitorLib
                             {
                                 obj = dbo.GetSingle(string.Format("SELECT top 1 FCELLCODE from ST_CELL where FLaneWay={0} order by FCELLCODE desc", dvnew[xd]["F_StartDevice"]));
                             }
-                            
+
                             if (obj != null)
                             {
                                 endcell.Append(obj.ToString());
@@ -196,9 +196,9 @@ namespace WcfControlMonitorLib
                             sbs.Append(" and END_DEVICE_CODE='").Append(dvc[i]["F_DeviceIndex"]).Append("'");
                             sbs.Append(" order by CONTROL_TASK_LEVEL desc,CONTROL_BEGIN_TIME asc,CONTROL_ID asc ");
                             dvIOC = dboM.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
-                            for (int inew = 0; inew < dvIOC.Count; inew++)
                             {
-                                ObtainDoubleForkTask(dvIOC[inew]["CONTROL_ID"], "0");
+                                for (int inew = 0; inew < dvIOC.Count; inew++) 
+                                    ObtainDoubleForkTask(dvIOC[inew]["CONTROL_ID"], "0");                              
                             }
                             leftTask = leftTask - dvIOC.Count;
                             if (leftTask <= 0) break;
diff --git a/webapi/WindowsFormsApp1/APIChannel.cs b/webapi/WindowsFormsApp1/APIChannel.cs
index 9bba752..783e97b 100644
--- a/webapi/WindowsFormsApp1/APIChannel.cs
+++ b/webapi/WindowsFormsApp1/APIChannel.cs
@@ -262,7 +262,7 @@ namespace WindowsFormsApp1
                         if (dv.Count == 1)
                         {
                            
-                            string sql1 = "updata t_manage_task set F_MonitorTaskLevel="+ wms_wcs_cancel.priority+ "  where FID = '" + wms_wcs_cancel.taskId + "'";
+                            string sql1 = "update t_manage_task set FTaskLevel="+ wms_wcs_cancel.priority+ "  where FID = '" + wms_wcs_cancel.taskId + "'";
                             int count = dbo.ExecuteSql(sql1);
                             if (count > 0)
                             {
@@ -289,6 +289,8 @@ namespace WindowsFormsApp1
                             wcs_wms_cancel.data = "数据库删除数据失败";
                         }
                     }
+                    returnJson = Model.JsonHelper.Serializer(wcs_wms_cancel);
+                    CommonClassLib.CCarryConvert.WriteLog("WEBAPI", "返回报文", returnJson, "");
                     return returnJson;
                 }
                 catch (Exception ex)
@@ -305,7 +307,7 @@ namespace WindowsFormsApp1
             };
             #endregion
 
-            #region WMS调用, 在此处理，入库任务 单条形式
+            #region WMS调用, 在此处理，入库任务 单条形式 无用
             Post["/api/wcs/thirdParty/deliverWmsInTask", true] = async (x, ct) =>
             {
                 try