去掉部分TaskCreationOptions.LongRunning

source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv

@@ -67,7 +67,7 @@ DI,0,SL3上料气缸夹紧端,SL_MoveCylinder_Tighten,8,PRO_AOI_IP_16,0,SL3上料气缸夹紧
 DI,1000,环形线横移2阻挡检测,SW2_StopCheck,2,PRO_AOI_IP_28,0,环形线横移2阻挡检测,X403,X403
 ,,,,,,,,,
 DI,1000,环形线横移2托盘检测,SW2_TrayCheck,9,PRO_AOI_IP_16,0,环形线横移2托盘检测,X210,X210
-,1000,环形线横移2料盘检测1,SW2_ReelCheck,10,PRO_AOI_IP_16,0,环形线横移2料盘检测1,X211,X211
+DI,0,上料3夹爪料盘检测,ReelCheck,10,PRO_AOI_IP_16,0,上料3夹爪料盘检测,X211,X211
 DI,1000,环形线横移2顶升上升端,SW2_TopCylinder_Up,11,PRO_AOI_IP_16,0,环形线横移2顶升上升端,X212,X212
 DI,1000,环形线横移2顶升下降端,SW2_TopCylinder_Down,12,PRO_AOI_IP_16,0,环形线横移2顶升下降端,X213,X213
 DI,1000,环形线横移2定位上升端,SW2_LocationCylinder_Up,13,PRO_AOI_IP_16,0,环形线横移2定位上升端,X214,X214

source/DeviceLibrary/assemblyLine/DischargeLine.cs

@@ -263,7 +263,7 @@ namespace OnlineStore.DeviceLibrary
                             Alarm(LineAlarmType.SuddenStop);
                             return;
                         }
-                    }, TaskCreationOptions.LongRunning);
+                    });
                 }
             }
             else if (IOValue(IO_Type.DLine_Reset).Equals(IO_VALUE.HIGH))

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -365,7 +365,7 @@ namespace OnlineStore.DeviceLibrary
                             }
                             return;
                         }
-                    }, TaskCreationOptions.LongRunning);
+                    });
                 }
             }
             else if (IOValue(IO_Type.SL_Reset_BTN).Equals(IO_VALUE.HIGH))
@@ -764,7 +764,7 @@ namespace OnlineStore.DeviceLibrary
                         {
                             Thread.Sleep(1000);
                             AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.None,  ClientLevel.High, true);
-                        }, TaskCreationOptions.LongRunning);
+                        });
                         ProcessShelfOut = false;
                         LogUtil.info(logName + ",停止转动，清空料架["+ LastOutShelfId + "]，  结束"); 
                     }
@@ -786,7 +786,7 @@ namespace OnlineStore.DeviceLibrary
                     IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.LOW);
                     ProcessShelfOut = false;
                 }
-            }, TaskCreationOptions.LongRunning);
+            });
         }
         internal void ShelfEnterProcess()
         { 
@@ -844,7 +844,7 @@ namespace OnlineStore.DeviceLibrary
                         {
                             Thread.Sleep(1000);
                             AgvClient.SetStatus(Config.AgvInName, "", ClientAction.None, ClientLevel.High, true);
-                        }, TaskCreationOptions.LongRunning);
+                        });
                         ProcessShelfEnter = false;
                         LogUtil.info(logName + "   结束");
                     }
@@ -862,7 +862,7 @@ namespace OnlineStore.DeviceLibrary
                     IOMove(IO_Type.SL_Line_Run, IO_VALUE.LOW);
                     ProcessShelfEnter = false;
                 }
-            }, TaskCreationOptions.LongRunning);
+            });
         }
 
         private bool ReadShelfId()

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -1162,7 +1162,7 @@ namespace OnlineStore.DeviceLibrary
                         //需要等待500再下降
                         Thread.Sleep(500);
                         CylinderMove(null, IO_Type.SW_TopCylinder_Up, IO_Type.SW_TopCylinder_Down);
-                    }, TaskCreationOptions.LongRunning);
+                    });
                 }
             }
             else
@@ -1292,7 +1292,7 @@ namespace OnlineStore.DeviceLibrary
                                 LastCodeList = CodeManager.CameraScan(Config.GetCameraList(), Name, false, 3000);
                             }
                             return LastCodeList;
-                        }, TaskCreationOptions.LongRunning);
+                        });
                     }
                     catch (Exception ex)
                     {

source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs

@@ -661,7 +661,7 @@ namespace OnlineStore.DeviceLibrary
                         LogUtil.error(Name + "【" + MoveInfo.MoveParam.WareCode + "】【" + CurrShelfId + "】【" + OutStoreCount.ToString() + "】afterPutCut 结果：" + msg);
                         taskData = null;
                     }
-                }, TaskCreationOptions.LongRunning);
+                });
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.FO_221_UpdownAxisToP1))
             {

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -182,7 +182,7 @@ namespace OnlineStore.DeviceLibrary
                 canStart = true;
 
                 AgvClient.Init();
-            }, TaskCreationOptions.LongRunning);
+            });
         }
 
 
@@ -686,7 +686,7 @@ namespace OnlineStore.DeviceLibrary
                                     SetWarnMsg("收到急停信号，报警急停");
                                     Alarm(LineAlarmType.SuddenStop);
                                 }
-                            }, TaskCreationOptions.LongRunning);
+                            });
                         }
                     }
                     else if (fuweiValue.Equals(IO_VALUE.HIGH) && (!fuweiValue.Equals(lastFuwei)))

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -534,7 +534,7 @@ namespace OnlineStore.DeviceLibrary
                                 waitInStoreList.RemoveAt(reIndex);
                                 Task.Factory.StartNew(delegate {
                                     SServerManager.cancelPutInTask(Name, currCode.WareCode);
-                                }, TaskCreationOptions.LongRunning);
+                                });
                                 return false;
                             }
 

source/DeviceLibrary/assemblyLine/OutTrayLineBean.cs

@@ -401,7 +401,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 canWhileCount = 3;
                 LineRunAndWait(timeOutMS);
-            }, TaskCreationOptions.LongRunning);
+            });
         }
 
         private string LineRunAndWait(int timeOutMS = 30000)
@@ -519,7 +519,7 @@ namespace OnlineStore.DeviceLibrary
                         Task.Factory.StartNew(delegate
                         {
                             turnEnd?.Invoke(result.Equals(""));
-                        }, TaskCreationOptions.LongRunning);
+                        });
                     }
                     InTurn = false;
                     WaitCheckDI_High = false;

source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs

@@ -149,10 +149,7 @@ namespace OnlineStore.DeviceLibrary
                 //如果分配了库位，需要调用取消
                 if (trayInfo.InoutPar.WareCode != "" && trayInfo.InoutPar.PosId != "")
                 {
-                    Task.Factory.StartNew(delegate
-                    {
-                        SServerManager.cancelPutInTask(Name, trayInfo.InoutPar.WareCode);
-                    }, TaskCreationOptions.LongRunning);
+                    SServerManager.cancelPutInTask(Name, trayInfo.InoutPar.WareCode);
                 }
                 //入料失败料
                 return inoup;

source/DeviceLibrary/assemblymanager/SServerManager.cs

@@ -140,7 +140,7 @@ namespace OnlineStore.DeviceLibrary
                             LogUtil.error(moveEquip.Name + " 入库命令： " + param.ToStr() + " 给料仓发送验证失败，等待3秒后重发 ");
                             Thread.Sleep(3000);
                             LineServer.CheckInStorePos(storeId, param);
-                        }, TaskCreationOptions.LongRunning);
+                        });
                     }
                     lock (moveEquip.waitInListLock)
                     {
@@ -589,7 +589,7 @@ namespace OnlineStore.DeviceLibrary
                     LogUtil.error(deviceName + "[" + moveEquip.Name + " ]入库命令： " + param.ToStr() + " 给料仓发送验证失败，等待3秒后重发 ");
                     Thread.Sleep(3000);
                     LineServer.CheckInStorePos(storeId, param);
-                }, TaskCreationOptions.LongRunning);
+                });
             }
             lock (moveEquip.waitInListLock)
             {

source/DeviceLibrary/model/KTK_Store.cs

@@ -536,7 +536,7 @@ namespace OnlineStore.DeviceLibrary
                         }
                     }
                     IOManager.IOMove(IoType, tValue, baseConfig.Id);
-                }, TaskCreationOptions.LongRunning);
+                });
             }
         }
         public IO_VALUE IOValue(string IoType)

source/LoadCVSLibrary/storeConfig/config/IO_Type.cs

@@ -278,10 +278,14 @@ namespace OnlineStore.LoadCSVLibrary
         #endregion
 
         #region 上料流水线
-       
 
 
         /// <summary>
+        ///    DI	0	上料3夹爪料盘检测	ReelCheck	10	PRO_AOI_IP_16	0	上料3夹爪料盘检测	X211	X211 
+        /// </summary>
+        public static string ReelCheck = "ReelCheck";
+
+        /// <summary>
         ///    DI		SL1急停 SL_SuddenStop_BTN             X101
         /// </summary>
         public static string SL_SuddenStop_BTN = "SL_SuddenStop_BTN";