Commit 3e118616 刘韬

修正入库扫码后立刻拿走盘的逻辑

1 个父辈 8def8f29
...@@ -103,12 +103,12 @@ namespace OnlineStore.ACSingleStore ...@@ -103,12 +103,12 @@ namespace OnlineStore.ACSingleStore
} }
static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{ {
LogUnhandledException(e.ExceptionObject); LogUnhandledException(e);
} }
static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e) static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
{ {
LogUnhandledException(e.Exception); LogUnhandledException(e);
} }
static void LogUnhandledException(object exceptionobj) static void LogUnhandledException(object exceptionobj)
......
...@@ -9,7 +9,7 @@ using System.Runtime.InteropServices; ...@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore 404f41fe38d402c5725ea11cb443fd9d6d99c0c3")] [assembly: AssemblyProduct("SO951-HC-ACSingleStore 8def8f29ef6dde286408d4a719172e2c926b2622")]
[assembly: AssemblyCopyright("Copyright ? 2017")] [assembly: AssemblyCopyright("Copyright ? 2017")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
......
...@@ -398,8 +398,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -398,8 +398,8 @@ namespace OnlineStore.DeviceLibrary
{ {
InStoreLog("入库:SI_06 未检测到料盘,任务取消 "); InStoreLog("入库:SI_06 未检测到料盘,任务取消 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_14_CheckTray); StoreMove.NextMoveStep(StoreMoveStep.SI_14_CheckTray);
HttpHelper.cancelPutInTask(Name, StoreMove.MoveParam.WareNumber); ACAxisMove(Config.InOut_Axis, StoreMove.MoveParam.MoveP.InOut_P1, Config.InOutAxis_P1_Speed);
HttpHelper.cancelPutInTask(Name, StoreMove.MoveParam.WareNumber);
} }
else else
{ {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!