公共柜获取绑定信息

3d大屏接口调整

JunmpPoliceStation/Controllers/CabinetController.cs

@@ -457,7 +457,13 @@ namespace JunmpPoliceStation.Controllers
                                         _unitOfWork.DbContext.BaseJpCabinetWorklogs
                                             .Where(x => x.DeviceNo == oldCabinetRealNum)
                                             .UpdateFromQuery(x => new BaseJpCabinetWorklog { DeviceNo = replaceCabinetNum });
-
+                                        if (first.Type == 2)
+                                        {
+                                            //公共柜更新表base_jp_cabinet_policeman_multiple
+                                            _unitOfWork.DbContext.BaseJpCabinetPolicemanMultiples
+                                                .Where(x => x.CabinetRealId == oldCabinetRealNum)
+                                                .UpdateFromQuery(x => new BaseJpCabinetPolicemanMultiple { CabinetRealId = replaceCabinetNum });
+                                        }
                                     }
                                     transaction.Commit();
                                     return JsonManager.SimpleStatusResponse(ResultCode.OPERATE_SUCCESS);
@@ -3872,6 +3878,58 @@ namespace JunmpPoliceStation.Controllers
         }
 
         /// <summary>
+        /// 获取公共柜下绑定的警员信息 公共柜使用
+        /// </summary>
+        /// <remarks>
+        /// ## 例子
+        /// 
+        ///     {
+        ///          cabinetRealID：//单警柜号
+        ///     }
+        /// 
+        /// </remarks>
+        /// <param name="jdata"></param>
+        /// <returns></returns>
+        [HttpPost("GetCabinetPolicemanMultiple")]
+        [NoSignAttribute]
+        public async Task<HttpResponseMessage> GetCabinetPolicemanMultiple([FromBody] JObject jdata)
+        {
+            return await Task.Run(() =>
+            {
+                try
+                {
+                    if (jdata != null)
+                    {
+                        var entity = JsonManager.GetJsonEntity(jdata);
+
+                        string cabinetRealID = entity?.cabinetRealID ?? "";
+                        var res = _unitOfWork.CabinetPolicemanMultipleRepository
+                            .GetList(x => x.CabinetRealId == cabinetRealID, null, false)
+                            .ToList();
+                        var data = res.Select(x => new
+                        {
+                            x.CabinetRealId,
+                            x.BoxNo,
+                            x.UserId,
+                            x.UserName
+                        });
+                        return JsonManager.ReturnSuccessResponse(data);
+                    }
+                    else
+                    {
+                        return JsonManager.SimpleStatusResponse(ResultCode.OPERATE_FAILED);
+                    }
+                }
+                catch (Exception ex)
+                {
+
+                    //_logger.LogError("Login/SignIn 错误:" + ex.ToString());
+                    return JsonManager.SimpleStatusResponse(ResultCode.OPERATE_FAILED);
+                }
+            });
+        }
+
+        /// <summary>
         /// 绑定单警柜和警员信息
         /// </summary>
         /// <remarks>

JunmpPoliceStation/Controllers/InventoryController.cs

@@ -11909,10 +11909,10 @@ namespace JunmpPoliceStation.Controllers
                             {
                                 return JsonManager.SimpleCustResponse($"orgId is require");
                             }
-                            if (!bOutInState)
-                            {
-                                return JsonManager.SimpleCustResponse($"outInState is require");
-                            }
+                            //if (!bOutInState) //异常入库无outInState
+                            //{
+                            //    return JsonManager.SimpleCustResponse($"outInState is require");
+                            //}
                             if (!bState)
                             {
                                 return JsonManager.SimpleCustResponse($"state is require");