1.移植查询电压值功能

WCS.BLL/Services/IService/IStoreInfoService.cs

@@ -45,6 +45,13 @@ namespace WCS.BLL.Services.IService
         /// <returns></returns>
         public Task<ResponseCommon> disableOrEnableModule(DisableOrEnableModuleRequest request);
 
+        /// <summary>
+        /// 查询模组电压值
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public Task<ResponseCommon> queryModuleVoltage(QueryModuleVoltageRequest request);
+
 
         /// <summary>
         /// 查询库位列表

WCS.BLL/Services/Service/OutstoreService.cs

@@ -691,6 +691,12 @@ namespace WCS.BLL.Services.Service
                         outOrderMatDetails = outOrderMatDetails.Where(t => t.MatCode == matCode)
                                                          .ToList();
                         Logs.Write($"出库单{order.OrderNumber}，本次亮灯物料{matCode}！",LogsType.Outstore);
+
+                        //分批次亮灯再计算一次出哪些货架 以免亮大灯不亮小灯
+                        shelfIds = outOrderMatDetails.Select(t => t.StoreInfo.ShelfId)
+                                                         .Distinct()
+                                                         .ToList();
+                        shelfs = ShelfManager.Shelves.Where(t => shelfIds.Contains(t.ShelfId)).ToList();
                     }
                     //相同物料不存在盘数超过n的情况，剩余物料全部亮灯
                     else
@@ -698,6 +704,8 @@ namespace WCS.BLL.Services.Service
                         //剩余物料全出
                         Logs.Write($"出库单{order.OrderNumber}，剩余物料灯全亮！", LogsType.Outstore);
                     }
+
+
                 }
 
                 //对应的货架对应位置 进入出库模式 亮灯

WCS.BLL/Services/Service/StoreInfoService.cs

@@ -397,6 +397,53 @@ namespace WCS.BLL.Services.Service
                 };
             }
         }
+
+
+        /// <summary>
+        /// 发送指令获取模组的电压值
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<ResponseCommon> queryModuleVoltage(QueryModuleVoltageRequest request)
+        {
+            try
+            {
+                var modules = await DbHelp.db.Queryable<ModuleInfo>().Where(t => request.MouduleIds.Contains(t.Id)).ToListAsync();
+                var isSend = false;
+                foreach (var module in modules)
+                {
+                    var shelf = ShelfManager.Shelves.Where(t => t.ShelfId == module.ShelfId).FirstOrDefault();
+                    if (shelf != null && shelf is SmartShelf)
+                    {
+                        var smartShelf = (SmartShelf)shelf;
+                        smartShelf.QueryVoltage(module.Id);
+                        isSend = true;
+                    }
+                }
+                if (isSend)
+                    return new ResponseCommon()
+                    {
+                        Code = 200,
+                        Message = "Success"
+                    };
+                else
+                    return new ResponseCommon()
+                    {
+                        Code = 201,
+                        Message = "操作失败：未找到对应模组"
+                    };
+            }
+            catch (Exception ex)
+            {
+                return new ResponseCommon()
+                {
+                    Code = 300,
+                    Message = "操作失败：" + ex.Message
+                };
+            }
+        }
+
         #endregion
 
         #region 库位管理
@@ -534,6 +581,7 @@ namespace WCS.BLL.Services.Service
             }
         }
 
+
         #endregion
     }
 }