diff --git a/.vs/HighWayIot/FileContentIndex/15266aad-54eb-487a-9283-ba1d3bee2345.vsidx b/.vs/HighWayIot/FileContentIndex/15266aad-54eb-487a-9283-ba1d3bee2345.vsidx new file mode 100644 index 00000000..34a5d610 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/15266aad-54eb-487a-9283-ba1d3bee2345.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/1c58bf60-4e6a-4112-8008-51d0dd0c0f0c.vsidx b/.vs/HighWayIot/FileContentIndex/1c58bf60-4e6a-4112-8008-51d0dd0c0f0c.vsidx deleted file mode 100644 index 56e8662e..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/1c58bf60-4e6a-4112-8008-51d0dd0c0f0c.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/1df4e39e-3d90-4c7e-ba5b-a9cf6dc85940.vsidx b/.vs/HighWayIot/FileContentIndex/1df4e39e-3d90-4c7e-ba5b-a9cf6dc85940.vsidx new file mode 100644 index 00000000..6418e48d Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/1df4e39e-3d90-4c7e-ba5b-a9cf6dc85940.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/57400528-c7a8-4190-af20-8dc3f0374267.vsidx b/.vs/HighWayIot/FileContentIndex/57400528-c7a8-4190-af20-8dc3f0374267.vsidx new file mode 100644 index 00000000..569e7e4f Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/57400528-c7a8-4190-af20-8dc3f0374267.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/f554ceda-8301-40b0-bd68-92bcbf5a5a81.vsidx b/.vs/HighWayIot/FileContentIndex/f554ceda-8301-40b0-bd68-92bcbf5a5a81.vsidx new file mode 100644 index 00000000..697de80c Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/f554ceda-8301-40b0-bd68-92bcbf5a5a81.vsidx differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 699a47e0..0de946ad 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs index 1b87be3a..1700497f 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -60,7 +60,7 @@ namespace Aucma.Scada.Business /// 初始化入库任务 /// /// - public delegate void RefreshInStoreTask(RealTaskInfo taskInfos); + public delegate void RefreshInStoreTask(RealTaskInfo taskInfos, bool isFinsih = false); public event RefreshInStoreTask RefreshInStoreTaskEvent; /// @@ -93,15 +93,15 @@ namespace Aucma.Scada.Business grabImage.RefreshLogMessageEvent += PrintLogInfoMessage; StartPassDown(); - //Task.Run(() => - //{ - // Thread.Sleep(6000); - // for (int i = 11; i < 12; i++) - // { - // InStore(appConfig.shellStoreCode, "B23600000781101900" + i); - // InStore(appConfig.linerStoreCode, "L23600000788101900" + i); - // } - //}); + Task.Run(() => + { + Thread.Sleep(6000); + for (int i = 1; i < 7; i++) + { + //InStore(appConfig.shellStoreCode, "B23600000781101902" + i); + InStore(appConfig.linerStoreCode, "L23600000788101902" + i); + } + }); } @@ -124,6 +124,7 @@ namespace Aucma.Scada.Business var result = CreateInStoreTask(spaceInfo, materialCode); //创建入库任务 if (result) { + spaceInfo.onRouteAmount += 1; _spaceInfoService.UpdateSpaceInfo(spaceInfo); } } @@ -241,7 +242,7 @@ namespace Aucma.Scada.Business PrintLogInfoMessage($"箱壳入库任务：{taskInfo.taskCode}；执行完成"); - RefreshInStoreTaskEvent?.Invoke(taskInfo); + RefreshInStoreTaskEvent?.Invoke(taskInfo,true); } else { @@ -252,10 +253,8 @@ namespace Aucma.Scada.Business else { PrintLogInfoMessage("未获取到需要下发的箱壳入库任务"); - - Thread.Sleep(5000); } - + Thread.Sleep(3000); } /// @@ -291,7 +290,7 @@ namespace Aucma.Scada.Business PrintLogInfoMessage($"内胆入库任务：{taskInfo.taskCode}；执行完成"); - RefreshInStoreTaskEvent?.Invoke(taskInfo); + RefreshInStoreTaskEvent?.Invoke(taskInfo,true); } else { @@ -302,8 +301,8 @@ namespace Aucma.Scada.Business { PrintLogInfoMessage("未获取到需要下发的内胆入库任务"); - Thread.Sleep(5000); } + Thread.Sleep(3000); } /// diff --git a/Aucma.Scada.Business/InStoreTaskHandle.cs b/Aucma.Scada.Business/InStoreTaskHandle.cs index b03efee3..07590362 100644 --- a/Aucma.Scada.Business/InStoreTaskHandle.cs +++ b/Aucma.Scada.Business/InStoreTaskHandle.cs @@ -139,7 +139,7 @@ namespace Aucma.Scada.Business ReadShellFinish_InStore(taskCode); } - Thread.Sleep(5000); + Thread.Sleep(1000); } while (isFlag); } else @@ -192,7 +192,7 @@ namespace Aucma.Scada.Business isFlag = false; } - Thread.Sleep(5000); + Thread.Sleep(1000); } while (isFlag); } else @@ -294,7 +294,7 @@ namespace Aucma.Scada.Business ReadLinerFinish_InStore(taskCode); } - Thread.Sleep(5000); + Thread.Sleep(1000); } while (isFlag); } else @@ -347,7 +347,7 @@ namespace Aucma.Scada.Business } - Thread.Sleep(5000); + Thread.Sleep(1000); } while (isFlag); } else diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index 99a5b179..baf6aeaf 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -91,6 +91,9 @@ namespace Aucma.Scada.Business public delegate void RefreshAssemblyPlanInit(); public event RefreshAssemblyPlanInit RefreshAssemblyPlanInitEvent; + + public delegate void RefreshStoreStock(); + public event RefreshStoreStock RefreshStoreStockEvent; #endregion private OutStoreBusiness() @@ -289,7 +292,6 @@ namespace Aucma.Scada.Business { while (true) { - Thread.Sleep(10000); PassDownTaskInfo(); Thread.Sleep(1000); } @@ -378,14 +380,17 @@ namespace Aucma.Scada.Business UpdatePlanInfo(executePlanCode); + RefreshStoreStockEvent?.Invoke(); + } } else { PrintLogInfoMessage("未获取到需要下发的出库任务"); - Thread.Sleep(5000); } + + Thread.Sleep(3000); } diff --git a/Aucma.Scada.Business/OutStoreTaskHandle.cs b/Aucma.Scada.Business/OutStoreTaskHandle.cs index e5b6f32b..2bf743a8 100644 --- a/Aucma.Scada.Business/OutStoreTaskHandle.cs +++ b/Aucma.Scada.Business/OutStoreTaskHandle.cs @@ -152,7 +152,7 @@ namespace Aucma.Scada.Business ReadShellFinish_OutStore(taskCode); } - Thread.Sleep(5000); + Thread.Sleep(1000); } while (isFlag); } else @@ -205,7 +205,7 @@ namespace Aucma.Scada.Business isFlag = false; } - Thread.Sleep(5000); + Thread.Sleep(1000); } while (isFlag); } else @@ -311,7 +311,7 @@ namespace Aucma.Scada.Business ReadLinerFinish_OutStore(taskCode); } - Thread.Sleep(5000); + Thread.Sleep(1000); } while (isFlag); } else @@ -364,7 +364,7 @@ namespace Aucma.Scada.Business } - Thread.Sleep(5000); + Thread.Sleep(1000); } while (isFlag); } else diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index 4155b4cf..e43de603 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 a65dbb66..68c0694b 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 ce2f82af..8c6a6cad 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 82671712..2cedf09e 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.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache index ffae37bd..9791b120 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll index 4155b4cf..e43de603 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb index a65dbb66..68c0694b 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache index e221ce3e..af085e1c 100644 Binary files a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache and b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache index 26314f78..dbcd9fbc 100644 Binary files a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll index 4155b4cf..e43de603 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 a65dbb66..68c0694b 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/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe index e788d601..2204b05c 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb index c4c67c2e..cbd10699 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll index ce2f82af..8c6a6cad 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 82671712..2cedf09e 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/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache index fc5ed5f3..613d8617 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe index e788d601..2204b05c 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb index c4c67c2e..cbd10699 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb differ diff --git a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs index 432d5c46..01d7fe49 100644 --- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs @@ -284,46 +284,52 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo /// public void Init() { - Query(); - MaterialNameList = new List() - { - "SC232", - "SA124", - "SC387", - "SC211", - "DQ196", - }; ChartValues achievement = new ChartValues(); - Random random = new Random(); - for (int i = 0; i < 5; i++) - { - achievement.Add(random.Next(60, 100)); - } - var column = new ColumnSeries(); - column.DataLabels = true; - column.Title = "箱壳"; - column.Values = achievement; - ChartValues achievement2 = new ChartValues(); - Random random2 = new Random(); - for (int i = 0; i < 5; i++) + App.Current.Dispatcher.Invoke((Action)(() => { - achievement2.Add(random2.Next(60, 100)); - } + Query(); + MaterialNameList = new List() + { + "SC232", + "SA124", + "SC387", + "SC211", + "DQ196", + }; + + Random random = new Random(); + for (int i = 0; i < 5; i++) + { + achievement.Add(random.Next(60, 100)); + } + var column = new ColumnSeries(); + column.DataLabels = true; + column.Title = "箱壳"; + column.Values = achievement; + + + Random random2 = new Random(); + for (int i = 0; i < 5; i++) + { + achievement2.Add(random2.Next(60, 100)); + } - var column2 = new ColumnSeries(); - column2.DataLabels = true; - column2.Title = "内胆"; - column2.Values = achievement2; - Achievement.Add(column); - Achievement.Add(column2); + var column2 = new ColumnSeries(); + column2.DataLabels = true; + column2.Title = "内胆"; + column2.Values = achievement2; + Achievement.Add(column); + Achievement.Add(column2); + })); + } /// /// 刷新入库任务列表 /// /// - private void RefreshInStoreTask(RealTaskInfo taskInfo) + private void RefreshInStoreTask(RealTaskInfo taskInfo, bool isFinsih = false) { //try //{ @@ -337,7 +343,14 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo //{ // logHelper.Error("入库任务列表刷新异常", ex); //} - Query(); + if (isFinsih) + { + Init(); + } + else + { + Query(); + } } /// diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs index 513634d1..b6d3aa1c 100644 --- a/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs @@ -22,6 +22,8 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo private OutStoreBusiness outStoreBusiness = OutStoreBusiness.Instance; + private InStoreBusiness inStoreBusiness = InStoreBusiness.Instance; + private AppConfig appConfig = AppConfig.Instance; public LinerInventoryViewModel() @@ -40,6 +42,9 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo OutOnlyOneCommand = new RelayCommand(obj => OutOnlyOne(obj)); #endregion + outStoreBusiness.RefreshStoreStockEvent += Query; + + inStoreBusiness.RefreshInStoreTaskEvent += RefreshSpaceInfo; Query(); @@ -89,20 +94,28 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo private void Query() { - var info = inventoryInfoBusiness.GetSpaceInfos(appConfig.linerStoreCode); - if (info != null) + App.Current.Dispatcher.Invoke((Action)(() => { - if (spaceItems.Count > 0) + var info = inventoryInfoBusiness.GetSpaceInfos(appConfig.linerStoreCode); + if (info != null) { - spaceItems.Clear(); + if (spaceItems.Count > 0) + { + spaceItems.Clear(); + } + + foreach (var item in info) + { + spaceItems.Add(item); + } + Shapes = spaceItems; } + })); + } - foreach (var item in info) - { - spaceItems.Add(item); - } - Shapes = spaceItems; - } + private void RefreshSpaceInfo(object obj = null, bool isFinish = true) + { + Query(); } /// diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs index ce9287ba..fcd51dca 100644 --- a/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs @@ -22,6 +22,8 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo private OutStoreBusiness outStoreBusiness = OutStoreBusiness.Instance; + private InStoreBusiness inStoreBusiness = InStoreBusiness.Instance; + private AppConfig appConfig = AppConfig.Instance; public ShellInventoryViewModel() @@ -40,6 +42,11 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo OutOnlyOneCommand = new RelayCommand(obj => OutOnlyOne(obj)); #endregion + + outStoreBusiness.RefreshStoreStockEvent += Query; + + inStoreBusiness.RefreshInStoreTaskEvent += RefreshSpaceInfo; + Query(); } @@ -89,20 +96,29 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo private void Query() { - var info = inventoryInfoBusiness.GetSpaceInfos(appConfig.shellStoreCode); - if (info != null) + App.Current.Dispatcher.Invoke((Action)(() => { - if (spaceItems.Count > 0) + var info = inventoryInfoBusiness.GetSpaceInfos(appConfig.shellStoreCode); + if (info != null) { - spaceItems.Clear(); + if (spaceItems.Count > 0) + { + spaceItems.Clear(); + } + + foreach (var item in info) + { + spaceItems.Add(item); + } + Shapes = spaceItems; } + })); + + } - foreach (var item in info) - { - spaceItems.Add(item); - } - Shapes = spaceItems; - } + private void RefreshSpaceInfo(object obj = null, bool isFinish = true) + { + Query(); } /// diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache index 926ed899..2dae1733 100644 Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache index c9df2a3b..d5515ce5 100644 Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache index 8e73522c..2db37a2e 100644 Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache index e7e05768..2d3de4b6 100644 Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll index ce2f82af..8c6a6cad 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 82671712..2cedf09e 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/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index d815c654..3f055fb0 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll index ce2f82af..8c6a6cad 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb index 82671712..2cedf09e 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs index 235d7de7..d2637bbd 100644 --- a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs @@ -29,7 +29,7 @@ namespace HighWayIot.Repository.service.Impl try { Expression> exp = s1 => true; - exp = exp.And(x => x.storeCode == store && x.materialType == materialType && x.spaceStatus == 1 && x.spaceCapacity != (x.spaceStock + x.onRouteAmount)); //相同型号、启用状态、库存未满的货道信息 + exp = exp.And(x => x.storeCode == store && x.materialType == materialType && x.spaceStatus == 1 && x.spaceCapacity > (x.spaceStock + x.onRouteAmount)); //相同型号、启用状态、库存未满的货道信息 spaceInfos = _mesRepository.GetList(exp); diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache index 906109d8..c70c8ff0 100644 Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache index 65becccd..36310472 100644 Binary files a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache and b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index 9fe82a1e..1226add8 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ