diff --git a/WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs b/WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs index 082882e..089934a 100644 --- a/WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs +++ b/WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs @@ -2,6 +2,7 @@ using WcsMain.Business.Convey.HistoryDataHandler; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; +using WcsMain.DataService; using WcsMain.Enum.General; using WcsMain.EquipOperation.Convey; @@ -12,13 +13,8 @@ namespace WcsMain.Business.CirculationTask.Convey; /// 箱式线读取扫码信息 /// [Circulation] -public class ReadScanCode(AppRouterMethodDao routerMethodDao, ConveyOperation conveyOperation, HistoryConveyDataHander historyConveyDataHander) +public class ReadScanCode(AppRouterMethodDao routerMethodDao, ConveyOperation conveyOperation, HistoryConveyDataHander historyConveyDataHander, AppScanRecordDao scanRecordDao, DataBaseData dataBaseData) { - private readonly ConveyOperation _conveyOperation = conveyOperation; - private readonly AppRouterMethodDao _routerMethodDao = routerMethodDao; - private readonly HistoryConveyDataHander _historyConveyDataHander = historyConveyDataHander; - - private static List? routers; /// @@ -30,13 +26,13 @@ public class ReadScanCode(AppRouterMethodDao routerMethodDao, ConveyOperation co { if(routers == default) { - routers = _routerMethodDao.Query(new AppRouterMethod() { RouterStatus = (int)TrueFalseEnum.TRUE }); + routers = routerMethodDao.Query(new AppRouterMethod() { RouterStatus = (int)TrueFalseEnum.TRUE }); return true; } List tasks = []; foreach(AppRouterMethod router in routers) { - (var readErrText, var scanOk, var code) = _conveyOperation.ReadScanInfo(router.Area); + (var readErrText, var scanOk, var code) = conveyOperation.ReadScanInfo(router.Area); if(!string.IsNullOrEmpty(readErrText)) { ConsoleLog.Exception($"【异常】读取扫码:{router.Area} 数据异常,信息:{readErrText}"); @@ -46,12 +42,13 @@ public class ReadScanCode(AppRouterMethodDao routerMethodDao, ConveyOperation co if(scanOk != (int)TrueFalseEnum.TRUE) { continue; } tasks.Add(Task.Factory.StartNew(() => { - _historyConveyDataHander.GetData("-", code, router.Area ?? ""); - string clearErrText = _conveyOperation.ClearScanStatus(router.Area); + historyConveyDataHander.GetData("-", code, router.Area ?? ""); + string clearErrText = conveyOperation.ClearScanStatus(router.Area); if(!string.IsNullOrEmpty(clearErrText)) { ConsoleLog.Exception($"【异常】扫码:{router.Area} 清理读码信号异常,信息:{clearErrText}"); } + scanRecordDao.Insert(new AppScanRecord() { RecordId = dataBaseData.GetNewUUID2(), ScanId = router.Area, Code = code, ScanTime = DateTime.Now }); })); } Task.WaitAll([.. tasks]);