1

JunmpPoliceStation/Controllers/InventoryController.cs

@@ -7459,6 +7459,15 @@ namespace JunmpPoliceStation.Controllers
                             _unitOfWork.EquipmentInventoryRepository.Update(UpdateEpc);
                         }
 
+                        if (currentState.Equals("0") && UpdateEpc.Count > 0)   //出库+物资更新
+                        {
+                            //更新redis上货架相关数据
+                            if (!ChannelExtension.UpdateOpenOrderInvInfo(_unitOfWork, warehouseId, "", "", out string msg))
+                            {
+                                _logger.LogError("更新redis上货架相关数据失败：" + msg);
+                            }
+                        }
+
                         //计算阈值
                         var sizeList = InsertEpc.Select(x => x.EquipmentSizecode).ToList();
                         sizeList.AddRange(UpdateEpc.Select(x => x.EquipmentSizecode).ToList());
@@ -9344,7 +9353,7 @@ namespace JunmpPoliceStation.Controllers
                         }
 
                         var EquipmentList = _unitOfWork.EquipmentInventoryRepository.GetList(expression, c => c.CreateTime, false, param)
-                        .OrderBy(x=>x.EquipmentCodeNavigation.Code)
+                        .OrderBy(x => x.EquipmentCodeNavigation.Code)
                             .ToList();
 
                         var datas = EquipmentList.Select(equipment => new

JunmpPoliceStation/Controllers/ShelfController.cs

@@ -183,6 +183,10 @@ namespace JunmpPoliceStation.Controllers
                             "CommonJpEquipmentInventories.EquipmentCodeNavigation.Equipment",
                         };
 
+                        var allEquList = _unitOfWork.EquipmentInventoryRepository
+                            .GetList(z => z.ShelfRow != null && z.CurrentState != 6 && z.InventoryState != "loss")
+                            .ToList();
+
                         var dataList = _unitOfWork.BaseJpShelfInfoRepository
                             .GetList(expression, x => x.Url, false, param)
                             .Select(x => new
@@ -212,15 +216,9 @@ namespace JunmpPoliceStation.Controllers
                                             Name = x.FirstOrDefault().EquipmentCodeNavigation.Name,
                                             Count = x.Count(),
                                             row = string.Join(',',
-                                                _unitOfWork.EquipmentInventoryRepository
-                                                    .GetList(z => z.EquipmentCode == x.Key
-                                                                  && z.ShelfId == c.Id
-                                                                  && z.ShelfRow != null
-                                                                  && z.CurrentState != 6
-                                                                  && z.InventoryState != "loss")
+                                                allEquList.Where(z => z.EquipmentCode == x.Key && z.ShelfId == c.Id)
                                                     .GroupBy(z => z.ShelfRow)
                                                     .Select(z => z.Key)
-
                                             )
                                         })
                                         .OrderBy(x => x.Name)
@@ -296,7 +294,10 @@ namespace JunmpPoliceStation.Controllers
                     {
                         if (!string.IsNullOrEmpty(pushClientId))
                         {
-                            mqttServer.ServerPublishMqttTopic(pushClientId, $"/C|ResponseShelfGetOrder|{{}}");
+                            mqttServer.ServerPublishMqttTopic(pushClientId, @$"/C|ResponseShelfGetOrder|{JsonConvert.SerializeObject(new
+                            {
+                                warehouseId = warehouseId,
+                            })}");
                         }
                         return JsonManager.SimpleCustResponse("无开启单据", "10000");
                     }
@@ -390,6 +391,7 @@ namespace JunmpPoliceStation.Controllers
                                 {
                                     mqttServer.ServerPublishMqttTopic(pushClientId, $@"/C|ResponseShelfGetOrder|{JsonConvert.SerializeObject(new
                                     {
+                                        warehouseId = data.warehouseId,
                                         orderCode = data.OrderCode,
                                         data = list
                                     })}");
@@ -522,6 +524,7 @@ namespace JunmpPoliceStation.Controllers
                                 {
                                     mqttServer.ServerPublishMqttTopic(pushClientId, $@"/C|ResponseShelfGetOrder|{JsonConvert.SerializeObject(new
                                     {
+                                        warehouseId = data.warehouseId,
                                         orderCode = data.order,
                                         data = list
                                     })}");
@@ -532,7 +535,10 @@ namespace JunmpPoliceStation.Controllers
                             {
                                 if (!string.IsNullOrEmpty(pushClientId))
                                 {
-                                    mqttServer.ServerPublishMqttTopic(pushClientId, $"/C|ResponseShelfGetOrder|{{}}");
+                                    mqttServer.ServerPublishMqttTopic(pushClientId, @$"/C|ResponseShelfGetOrder|{JsonConvert.SerializeObject(new
+                                    {
+                                        warehouseId = warehouseId,
+                                    })}");
                                 }
                                 return JsonManager.SimpleCustResponse("异常OrderType");
                             }

JunmpPoliceStation/JunmpPoliceStation.csproj

@@ -116,7 +116,6 @@
   <ItemGroup>
     <ProjectReference Include="..\JmpCommon\JmpCommon.csproj" />
     <ProjectReference Include="..\JmpModel\JmpModel.csproj" />
-    <ProjectReference Include="..\JmpMsgService\JmpMsgService.csproj" />
   </ItemGroup>
 
   <ProjectExtensions><VisualStudio><UserProperties properties_4launchsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>

JunmpPoliceStation/Program.cs

@@ -35,7 +35,7 @@ namespace JunmpPoliceStation
 #if DEBUG
                     CreateWebHostBuilder(args).Build().Run();
 #else
-                    CreateWebHostBuilder(args).Build().RunAsService();
+                    CreateWebHostBuilder(args).Build().Run();
 #endif
                 }
                 catch (Exception ex)