diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs index 44031f1f..49a8377a 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -112,17 +112,17 @@ namespace Aucma.Scada.Business StartPassDown(); - //Task.Run(() => - //{ - // Thread.Sleep(6000); - // for (int i = 1; i < 2; i++) - // { - // InStore("B2401018302500586001" + i.ToString().PadLeft(2, '0') , "169.254.100.169"); - // // Thread.Sleep(1000 * 30); - // // InStore(appConfig.linerStoreCode, "L23600000788110900" + i.ToString().PadLeft(2, '0')); - // // Thread.Sleep(1000 * 30); - // } - //}); + Task.Run(() => + { + Thread.Sleep(6000); + for (int i = 1; i < 2; i++) + { + InStore("B2401018302500586001" + i.ToString().PadLeft(2, '0'), "169.254.100.169"); + // Thread.Sleep(1000 * 30); + // InStore(appConfig.linerStoreCode, "L23600000788110900" + i.ToString().PadLeft(2, '0')); + // Thread.Sleep(1000 * 30); + } + }); } diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index a97eca59..07e8206e 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb index 51221846..49ce11b5 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll index 5dbf48ba..38e6c377 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb index fb56bc94..bf0a0076 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll index a97eca59..07e8206e 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb index 51221846..49ce11b5 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll index 5dbf48ba..38e6c377 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb index fb56bc94..bf0a0076 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll index 5dbf48ba..38e6c377 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb index fb56bc94..bf0a0076 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/service/Impl/BaseMaterialInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/BaseMaterialInfoServiceImpl.cs index dd5b02cf..1af98b45 100644 --- a/HighWayIot.Repository/service/Impl/BaseMaterialInfoServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/BaseMaterialInfoServiceImpl.cs @@ -18,7 +18,7 @@ namespace HighWayIot.Repository.service.Impl { try { - var info = _baseMaterialInfo.GetList(x => x.MaterialSubclass == "200"); + var info = _baseMaterialInfo.GetList(x => x.MaterialSubclass == "400" || x.MaterialSubclass == "500"); return info; } catch (Exception ex)