1

JunmpPoliceStation/Controllers/CabinetController.cs

@@ -3426,7 +3426,9 @@ namespace JunmpPoliceStation.Controllers
                                     _unitOfWork.EquipmentInventoryRepository.Update(OutEpc, false);//更新被拿走的物资信息
                                 }
 
-                                if (_unitOfWork.SaveChanges() > 0)
+                                _unitOfWork.SaveChanges();
+
+                                if (OutEpc.Count > 0)
                                 {
                                     //上报数据
                                     var httpResult = _httpHelper.GetHtml(new HttpItem()
@@ -3477,6 +3479,7 @@ namespace JunmpPoliceStation.Controllers
                                         scope.Rollback();
                                         return JsonManager.SimpleCustResponse(obj.msg);
                                     }
+                                }
                                 scope.Commit();
 
                                 var CurrentEI = _unitOfWork.EquipmentInventoryRepository.GetList(p => p.InventoryState != "loss" && p.Cabinet.CabinetRealNum.Equals(cabinetID) && p.Cabinet.CabinetChildNum.Equals(Convert.ToInt32(cabinetChildID)), null, false, param);
@@ -3592,12 +3595,7 @@ namespace JunmpPoliceStation.Controllers
 
                                 _logger.LogDebug("Cabinet/UploadRFIDInner数据上报数据返回:" + JsonConvert.SerializeObject(InvStates).ToString());
                                 return JsonManager.ReturnSuccessResponse(InvStates);
-                                }
-                                else
-                                {
-                                    scope.Rollback();
-                                    return JsonManager.SimpleStatusResponse(ResultCode.REQUEST_DATA_ERROR);
-                                }
+
                             }
                             catch (Exception e)
                             {
@@ -4215,7 +4213,7 @@ namespace JunmpPoliceStation.Controllers
                     if (jdata != null)
                     {
                         var entity = JsonManager.GetJsonEntity(jdata);
-
+                        _logger.LogDebug("DeletePoliceAndCabinet" + jdata.ToString());
 
                         string organizationId = entity?.organizationId ?? "";
 
@@ -4346,7 +4344,7 @@ namespace JunmpPoliceStation.Controllers
                 catch (Exception ex)
                 {
 
-                    //_logger.LogError("Login/SignIn 错误:" + ex.ToString());
+                    _logger.LogError("Login/SignIn 错误:" + ex.ToString());
                     return JsonManager.SimpleStatusResponse(ResultCode.OPERATE_FAILED);
                 }
             });