1.出库界面展示当前正在进行出库的单据

2.后台退出了入库模式 通知前台扫码枪退出入库
3.对接盟讯公司登录Mes接口
4.接口记录增加本地日志排查问题

WCS.BLL/Services/Service/OutstoreService.cs

@@ -474,23 +474,30 @@ namespace WCS.BLL.Services.Service
             var recordsQueryable = DbHelp.db.Queryable<OutOrder>()
                                             .Where(t => request.OrderExeStatus.Contains(t.OutOrderExeStatus))
                                             .WhereIF(request.IsMXPD != null, t => t.IsMXPD == request.IsMXPD)
-                                            .WhereIF(LocalFile.Config.IsMx, t => t.CreateTime > DateTime.Now.AddDays(-3));
+                                            .WhereIF(LocalFile.Config.IsMx, t => t.CreateTime > DateTime.Now.AddDays(-3))
+                                            .WhereIF(!string.IsNullOrEmpty(LocalFile.Config.GroupName), t => t.GroupName == LocalFile.Config.GroupName);
 
             var totalCount = await recordsQueryable.CountAsync();
             var records = await recordsQueryable
                                 .OrderByDescending(t => t.CreateTime)
-                                //.Take(request.PageSize)
                                 .ToListAsync();
 
+            //获取后台当前正在进行出库的订单 将出库状态反馈给前端
+            var outingOrderNumbers = ShelfManager.Shelves
+                                                .Where(t => t.CurrentMode == HardWare.Mode.出库模式).Select(t => t.OrderNumber)
+                                                .ToList();
+            foreach (var record in records)
+            {
+                if (outingOrderNumbers.Contains(record.OrderNumber))
+                    record.IsOuting = true;
+            }
+
             return new PageQueryResponse<OutOrder>()
             {
                 Code = 200,
                 Message = $"success",
                 Data = new PageQueryResponseData<OutOrder>()
                 {
-                    //TotalCount = totalCount,
-                    //MaxPage = request.PageSize == 0 ? 0 : (int)Math.Ceiling((decimal)totalCount / request.PageSize),
-                    //Count = records.Count,
                     Lists = records.ToList()
                 }
             };

WCS.BLL/Services/Service/UserService.cs

@@ -5,12 +5,16 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using TouchSocket.Core;
+using WCS.BLL.Config;
+using WCS.BLL.DbModels;
 using WCS.BLL.Manager;
 using WCS.BLL.Services.IService;
+using WCS.BLL.Tool;
 using WCS.DAL;
 using WCS.DAL.Db.AuthDb;
 using WCS.Model;
 using WCS.Model.ApiModel;
+using WCS.Model.ApiModel.MXBackgroundThread;
 using WCS.Model.ApiModel.User;
 
 namespace WCS.BLL.Services.Service
@@ -394,15 +398,67 @@ namespace WCS.BLL.Services.Service
                 }
                 else//登录模式需要校验密码
                 {
-                    user = await AuthDbHelp.db.Queryable<UserBase>()
-                             .Where(t => t.LoginName == request.UserName)
-                             .FirstAsync();
+                    #region 盟讯公司登录接入系统接口
+                    if (LocalFile.Config.IsMx)
+                    {
+                        #region 调用接口 接入盟讯公司登录
+                        try
+                        {
+                            var body = new
+                            {
+                                uername = request.UserName,
+                                password = request.PassWord,
+                            };
+                            var Result = ApiHelp.GetDataFromHttpShortTime<MXResponse>("http://192.168.2.23:9213/integrate/login/queryGenerLogin", body, "POST", true);
+                            //账号密码验证成功
+                            if (Result != null && Result.code == 200)
+                            {
+                                //判断系统中是否有对应用户
+                                user = await AuthDbHelp.db.Queryable<UserBase>()
+                                 .Where(t => t.LoginName == request.UserName)
+                                 .FirstAsync();
+                                //Mes登录成功后wcs这边也添加一个用户
+                                if (user == null)
+                                {
+                                    user = new UserBase()
+                                    {
+                                        LoginName = request.UserName,
+                                        Password = request.PassWord,
+                                        RoleIds = new List<int>() { 2 },
+                                        IsAdmin = false,
+                                        Time = DateTime.Now,
+                                    };
+                                    await AuthDbHelp.db.Insertable(user).ExecuteCommandAsync();
+                                }
+                                else if (user.Password != request.PassWord)
+                                {
+                                    user.Password = request.PassWord;
+                                    await AuthDbHelp.db.Updateable(user).ExecuteCommandAsync();
+                                }
+                            }
+                            //账号密码验证失败
+                            else
+                            {
+
+                            }
+                        }
+                        catch (Exception e)
+                        {
+
+                        }
+                        #endregion
+                    }
+                    #endregion
+                    if (user == null)
+                        user = await AuthDbHelp.db.Queryable<UserBase>()
+                                 .Where(t => t.LoginName == request.UserName)
+                                 .FirstAsync();
                     if (user == null)
                     {
                         return new ResponseCommon<UserBase>()
                         {
                             Code = 201,
-                            Message = $"登录失败:用户名[{request.UserName}]不存在！",
+                            Message = $"登录失败:用户名[{request.UserName}]不存在或密码输入错误！",
                             Data = null
                         };
                     }