From b17a4053ea18e143dc39e3e7122afe1cae1e19be Mon Sep 17 00:00:00 2001
From: gaojianan <gaojianan@siasun.com>
Date: Wed, 26 Jun 2024 11:56:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BB=E5=8F=96=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E6=8C=89=E7=B1=BB=E5=88=AB=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WcfControlMonitorLib/CDisassembleTask.cs | 3 ++-
 WcfControlMonitorLib/SControlMonitor.cs  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WcfControlMonitorLib/CDisassembleTask.cs b/WcfControlMonitorLib/CDisassembleTask.cs
index e32e3b0..6dcac33 100644
--- a/WcfControlMonitorLib/CDisassembleTask.cs
+++ b/WcfControlMonitorLib/CDisassembleTask.cs
@@ -1386,7 +1386,8 @@ namespace WcfControlMonitorLib
                 {
                     //选择最短调度路径并且判断此路径上是否有设备发生故障
                     routeid = MinRouteID(Convert.ToInt32(dvM[i]["FSTARTDEVICE"]), Convert.ToInt32(dvM[i]["FENDDEVICE"]), dvM[i]["FUseAwayFork"]);
-                    routeid = 108001;
+
+                    //routeid = 108001;
                     
                     if (routeid == -1)
                     {
diff --git a/WcfControlMonitorLib/SControlMonitor.cs b/WcfControlMonitorLib/SControlMonitor.cs
index a775696..61aace1 100644
--- a/WcfControlMonitorLib/SControlMonitor.cs
+++ b/WcfControlMonitorLib/SControlMonitor.cs
@@ -5828,7 +5828,7 @@ namespace WcfControlMonitorLib
                                             //}
 
                                             int startindex = 10;//鏉＄爜寮�濮嬩綅缃�   db2棰勭暀浜�10涓瓧鑺�  鎵樼洏鏉＄爜鑾峰彇鐨勫湴鏂�
-                                            if (dvsp[0]["F_Askkind"].ToString() == "7")
+                                            if (dvsp[0]["F_Askkind"].ToString() != "16")
                                             {
                                                 for (int j = startindex; j < PalletBarcodeLength + startindex; j++)
                                                 {
@@ -5963,7 +5963,7 @@ namespace WcfControlMonitorLib
 
                                                             dboMan.ExecuteSql(
                                                                     string.Format(
-                                                                        "INSERT INTO IO_CONTROL_APPLY (CONTROL_APPLY_TYPE,DEVICE_CODE,STOCK_BARCODE,CONTROL_APPLY_PARAMETER,CONTROL_APPLY_PARA01,APPLY_TASK_STATUS, CREATE_TIME)VALUES ({0},'{1}','{3}',{3},'{4}')",
+                                                                        "INSERT INTO IO_CONTROL_APPLY (CONTROL_APPLY_TYPE,DEVICE_CODE,STOCK_BARCODE,CONTROL_APPLY_PARAMETER,CONTROL_APPLY_PARA01,APPLY_TASK_STATUS, CREATE_TIME)VALUES ({0},'{1}','{2}',{7},'{5}',{6},'{4}')",
                                                                         ob1));
 
                                                             //dbo.ExecuteSql(