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(