From d6692e7dc87e3183513831af334a9bab1cb1e5d7 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, 15 May 2025 16:17:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=9A=84=E9=80=BB=E8=BE=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WcfControlMonitorLib/CControl.cs      | 6 +++---
 webapi/WindowsFormsApp1/APIChannel.cs | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/WcfControlMonitorLib/CControl.cs b/WcfControlMonitorLib/CControl.cs
index 185d170..05db94b 100644
--- a/WcfControlMonitorLib/CControl.cs
+++ b/WcfControlMonitorLib/CControl.cs
@@ -2089,7 +2089,7 @@ namespace WcfControlMonitorLib
 
                 #endregion
                 #region 山东时代20250303 12051 终点出库，检查电气出入库模式
-                if (CONTROLTASKTYPE == 2 && EndDevice == 12051&&StartDevice!=13008)
+                if (CONTROLTASKTYPE == 2 && EndDevice == 12051&&StartDevice!=13008)//2出库
                 {
                     // 增加一个设备号 12000，电气上报状态到state字节 0，1
                     Model.MDevice devOutMode = Model.CGetInfo.GetDeviceInfo(15101);
@@ -2100,7 +2100,7 @@ namespace WcfControlMonitorLib
                         return false;
                     }
                 }
-                 else  if (CONTROLTASKTYPE == 2 &&StartDevice == 13008 && EndDevice != 12051)
+                 else  if (CONTROLTASKTYPE == 1 &&StartDevice == 13008 && EndDevice != 12051)
                 {
                     // 增加一个设备号 12000，电气上报状态到state字节 0，1
                     Model.MDevice devOutMode = Model.CGetInfo.GetDeviceInfo(15101);
@@ -2124,7 +2124,7 @@ namespace WcfControlMonitorLib
                         return false;
                     }
                 }
-                else if (CONTROLTASKTYPE == 2 && StartDevice == 14004 && EndDevice != 12004)
+                else if (CONTROLTASKTYPE == 1 && StartDevice == 14004 && EndDevice != 12004)
                 {
                     // 增加一个设备号 12000，电气上报状态到state字节 0，1
                         Model.MDevice devOutMode = Model.CGetInfo.GetDeviceInfo(15102);
diff --git a/webapi/WindowsFormsApp1/APIChannel.cs b/webapi/WindowsFormsApp1/APIChannel.cs
index b0e2aa7..a7229de 100644
--- a/webapi/WindowsFormsApp1/APIChannel.cs
+++ b/webapi/WindowsFormsApp1/APIChannel.cs
@@ -160,7 +160,7 @@ namespace WindowsFormsApp1
                         wms_wcs_cancel.taskId =  wms_wcs_cancel.taskId.Trim('D').Trim('C');
                         string sql = "select * from t_manage_task where FID = '" + wms_wcs_cancel.taskId + "'";
                         dv = dbo.ExceSQL(sql).Tables[0].DefaultView;
-                            if (dv.Count == 1)//瀛樺湪闇�瑕佸垹闄ょ殑浠诲姟
+                        if (dv.Count == 1)//瀛樺湪闇�瑕佸垹闄ょ殑浠诲姟
                             {
                             int stepOk = Convert.ToInt32(dv[0]["FIntoStepOK"]);//鎷嗗垎涓嬪彂
                             if (stepOk == 0)//鏈媶鍒�
@@ -186,6 +186,7 @@ namespace WindowsFormsApp1
                             }
                             else
                             {
+
                                 wcs_wms_cancel.code = 1;
                                 wcs_wms_cancel.msg = "鍙栨秷浠诲姟澶辫触锛屼换鍔″凡鎵ц锛�";
                                 wcs_wms_cancel.data = "";