Skip to content

J
JPSMysql
Commit c434458c by zonevg
Options

1

parent c735d02b
正在显示 包含 101 行增加 和 103 行删除
JunmpPoliceStation/Controllers/CabinetController.cs
...@@ -3426,7 +3426,9 @@ namespace JunmpPoliceStation.Controllers ...@@ -3426,7 +3426,9 @@ namespace JunmpPoliceStation.Controllers
_unitOfWork.EquipmentInventoryRepository.Update(OutEpc, false);//更新被拿走的物资信息 _unitOfWork.EquipmentInventoryRepository.Update(OutEpc, false);//更新被拿走的物资信息
} }
if (_unitOfWork.SaveChanges() > 0) _unitOfWork.SaveChanges();
if (OutEpc.Count > 0)
{ {
//上报数据 //上报数据
var httpResult = _httpHelper.GetHtml(new HttpItem() var httpResult = _httpHelper.GetHtml(new HttpItem()
...@@ -3477,127 +3479,123 @@ namespace JunmpPoliceStation.Controllers ...@@ -3477,127 +3479,123 @@ namespace JunmpPoliceStation.Controllers
scope.Rollback(); scope.Rollback();
return JsonManager.SimpleCustResponse(obj.msg); return JsonManager.SimpleCustResponse(obj.msg);
} }
scope.Commit(); }
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);
var InsideEI = CurrentEI.Where(p => p.CurrentState.Equals(3)).ToList();//在单警柜中的物资 var CurrentEI = _unitOfWork.EquipmentInventoryRepository.GetList(p => p.InventoryState != "loss" && p.Cabinet.CabinetRealNum.Equals(cabinetID) && p.Cabinet.CabinetChildNum.Equals(Convert.ToInt32(cabinetChildID)), null, false, param);
var OutsideEI = CurrentEI.Where(p => p.CurrentState.Equals(7)).ToList();//在单警柜外的物资 var InsideEI = CurrentEI.Where(p => p.CurrentState.Equals(3)).ToList();//在单警柜中的物资
if (rebind.Equals("false") && ((InsertState.Where(p => p.ActionState.Equals(5) && p.OutInState.Equals(1)).ToList().Count > 0 && InsertState.Where(p => p.ActionState.Equals(5) var OutsideEI = CurrentEI.Where(p => p.CurrentState.Equals(7)).ToList();//在单警柜外的物资
&& p.OutInState.Equals(0)).ToList().Count > 0 && InsideEI.Count() > 0) || (InsertState.Where(p => p.ActionState.Equals(5) && p.OutInState.Equals(1)).ToList() if (rebind.Equals("false") && ((InsertState.Where(p => p.ActionState.Equals(5) && p.OutInState.Equals(1)).ToList().Count > 0 && InsertState.Where(p => p.ActionState.Equals(5)
.Count <= 0 && InsertState.Where(p => p.ActionState.Equals(5) && p.OutInState.Equals(0)).ToList().Count > 0 && InsideEI.Count() > 0) || (InsertState.Where(p => p.ActionState.Equals(5) && p.OutInState.Equals(1)).ToList()
&& p.OutInState.Equals(0)).ToList().Count <= 0 && OutsideEI.Count > 0 && InsideEI.Count > 0)))//有拿有还则选择拿的 .Count <= 0 && InsertState.Where(p => p.ActionState.Equals(5)
&& p.OutInState.Equals(0)).ToList().Count <= 0 && OutsideEI.Count > 0 && InsideEI.Count > 0)))//有拿有还则选择拿的
{
if (policeman != null)
{ {
if (policeman != null) SendMsg equipmentDic = new SendMsg();
equipmentDic.State = "error";
equipmentDic.Msg = "missTake";
equipmentDic.Time = time;
equipmentDic.BoxNum = cabinetChildID;
equipmentDic.UserName = policeman?.Name;
foreach (var item in InsideEI)
{ {
SendMsg equipmentDic = new SendMsg(); equipmentDic.EPC = string.IsNullOrEmpty(equipmentDic.EPC) ? item.Epc : equipmentDic.EPC + "," + item.Epc;
equipmentDic.State = "error"; equipmentDic.Name = string.IsNullOrEmpty(equipmentDic.Name) ? item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName : equipmentDic.Name + "," + item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName;
equipmentDic.Msg = "missTake";
equipmentDic.Time = time;
equipmentDic.BoxNum = cabinetChildID;
equipmentDic.UserName = policeman?.Name;
foreach (var item in InsideEI)
{
equipmentDic.EPC = string.IsNullOrEmpty(equipmentDic.EPC) ? item.Epc : equipmentDic.EPC + "," + item.Epc;
equipmentDic.Name = string.IsNullOrEmpty(equipmentDic.Name) ? item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName : equipmentDic.Name + "," + item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName;
}
InvStates.Add(equipmentDic);
} }
InvStates.Add(equipmentDic);
} }
else if (rebind.Equals("false") && (InsertState.Where(p => p.ActionState.Equals(5) && p.OutInState.Equals(1)).ToList().Count > 0 && InsertState.Where(p => p.ActionState.Equals(5) }
&& p.OutInState.Equals(0)).ToList().Count <= 0 && OutsideEI.Count() > 0))//放入了物资 少还了物资 else if (rebind.Equals("false") && (InsertState.Where(p => p.ActionState.Equals(5) && p.OutInState.Equals(1)).ToList().Count > 0 && InsertState.Where(p => p.ActionState.Equals(5)
&& p.OutInState.Equals(0)).ToList().Count <= 0 && OutsideEI.Count() > 0))//放入了物资 少还了物资
{
if (policeman != null)
{ {
if (policeman != null) SendMsg equipmentDic = new SendMsg();
equipmentDic.State = "error";
equipmentDic.Msg = "missReturn";
equipmentDic.Time = time;
equipmentDic.BoxNum = cabinetChildID;
equipmentDic.UserName = policeman?.Name;
foreach (var item in OutsideEI)
{ {
SendMsg equipmentDic = new SendMsg(); equipmentDic.EPC = string.IsNullOrEmpty(equipmentDic.EPC) ? item.Epc : equipmentDic.EPC + "," + item.Epc;
equipmentDic.State = "error"; equipmentDic.Name = string.IsNullOrEmpty(equipmentDic.Name) ? item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName : equipmentDic.Name + "," + item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName;
equipmentDic.Msg = "missReturn";
equipmentDic.Time = time;
equipmentDic.BoxNum = cabinetChildID;
equipmentDic.UserName = policeman?.Name;
foreach (var item in OutsideEI)
{
equipmentDic.EPC = string.IsNullOrEmpty(equipmentDic.EPC) ? item.Epc : equipmentDic.EPC + "," + item.Epc;
equipmentDic.Name = string.IsNullOrEmpty(equipmentDic.Name) ? item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName : equipmentDic.Name + "," + item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName;
}
InvStates.Add(equipmentDic);
} }
InvStates.Add(equipmentDic);
} }
else if (rebind.Equals("false") && (InsertState.Where(p => p.ActionState.Equals(5) && p.OutInState.Equals(1)).ToList().Count <= 0 && InsertState.Where(p => p.ActionState.Equals(5)
&& p.OutInState.Equals(0)).ToList().Count > 0 && InsideEI.Count() > 0))//拿出了物资 少拿了物资
}
else if (rebind.Equals("false") && (InsertState.Where(p => p.ActionState.Equals(5) && p.OutInState.Equals(1)).ToList().Count <= 0 && InsertState.Where(p => p.ActionState.Equals(5)
&& p.OutInState.Equals(0)).ToList().Count > 0 && InsideEI.Count() > 0))//拿出了物资 少拿了物资
{
if (policeman != null)
{ {
if (policeman != null) SendMsg equipmentDic = new SendMsg();
equipmentDic.State = "error";
equipmentDic.Msg = "missTake";
equipmentDic.Time = time;
equipmentDic.BoxNum = cabinetChildID;
equipmentDic.UserName = policeman?.Name;
foreach (var item in InsideEI)
{ {
SendMsg equipmentDic = new SendMsg(); equipmentDic.EPC = string.IsNullOrEmpty(equipmentDic.EPC) ? item.Epc : equipmentDic.EPC + "," + item.Epc;
equipmentDic.State = "error"; equipmentDic.Name = string.IsNullOrEmpty(equipmentDic.Name) ? item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName : equipmentDic.Name + "," + item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName;
equipmentDic.Msg = "missTake";
equipmentDic.Time = time;
equipmentDic.BoxNum = cabinetChildID;
equipmentDic.UserName = policeman?.Name;
foreach (var item in InsideEI)
{
equipmentDic.EPC = string.IsNullOrEmpty(equipmentDic.EPC) ? item.Epc : equipmentDic.EPC + "," + item.Epc;
equipmentDic.Name = string.IsNullOrEmpty(equipmentDic.Name) ? item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName : equipmentDic.Name + "," + item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName;
}
InvStates.Add(equipmentDic);
} }
InvStates.Add(equipmentDic);
} }
var InsideTimeEq = OutEpc.Where(p => p.WarrantyCycle != 0 && p.ProductTime != null).ToList();
InsideTimeEq = InsideTimeEq.Where(p => p.ProductTime.Value.AddMonths(Convert.ToInt32(p.WarrantyCycle)) <= DateTime.Now).ToList(); }
var InsideTimeEq = OutEpc.Where(p => p.WarrantyCycle != 0 && p.ProductTime != null).ToList();
InsideTimeEq = InsideTimeEq.Where(p => p.ProductTime.Value.AddMonths(Convert.ToInt32(p.WarrantyCycle)) <= DateTime.Now).ToList();
if (InsideTimeEq.Count > 0) if (InsideTimeEq.Count > 0)
{
foreach (var item in InsideTimeEq)
{ {
foreach (var item in InsideTimeEq) SendMsg outTimeEq = new SendMsg();//过期判断
{ outTimeEq.State = "exceed";
SendMsg outTimeEq = new SendMsg();//过期判断 outTimeEq.Time = time;
outTimeEq.State = "exceed"; outTimeEq.BoxNum = cabinetChildID;
outTimeEq.Time = time; outTimeEq.UserName = policeman?.Name;
outTimeEq.BoxNum = cabinetChildID; outTimeEq.EPC = string.Empty;
outTimeEq.UserName = policeman?.Name; outTimeEq.Name = item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName;
outTimeEq.EPC = string.Empty; outTimeEq.EPC = string.IsNullOrEmpty(outTimeEq.EPC) ? item.Epc : outTimeEq.EPC + "," + item.Epc;
outTimeEq.Name = item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName; outTimeEq.Msg = "物资:" + item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName + "已于" +
outTimeEq.EPC = string.IsNullOrEmpty(outTimeEq.EPC) ? item.Epc : outTimeEq.EPC + "," + item.Epc; item.ProductTime.Value.AddMonths(Convert.ToInt32(item.WarrantyCycle)).ToString() + "过期";
outTimeEq.Msg = "物资:" + item.EquipmentCodeNavigation.Name + "-" + item.EquipmentSizecodeNavigation.SizeName + "已于" +
item.ProductTime.Value.AddMonths(Convert.ToInt32(item.WarrantyCycle)).ToString() + "过期"; InvStates.Add(outTimeEq);
InvStates.Add(outTimeEq);
}
} }
}
//预警记录 记录 error：异常 exceed：过期 //预警记录 记录 error：异常 exceed：过期
_unitOfWork.DbContext.BaseJpCabinetInvErrorMsgs.AddRange(InvStates _unitOfWork.DbContext.BaseJpCabinetInvErrorMsgs.AddRange(InvStates
.Where(x => x.State == "error" || x.State == "exceed") .Where(x => x.State == "error" || x.State == "exceed")
.Select(x => new BaseJpCabinetInvErrorMsg .Select(x => new BaseJpCabinetInvErrorMsg
{ {
Id = Guid.NewGuid().ToString(), Id = Guid.NewGuid().ToString(),
CabinetRealNum = cabinet.CabinetRealNum, CabinetRealNum = cabinet.CabinetRealNum,
CabinetNum = cabinet.CabinetNum, CabinetNum = cabinet.CabinetNum,
CabinetChildNum = cabinet.CabinetChildNum, CabinetChildNum = cabinet.CabinetChildNum,
CabinetId = cabinet.Id, CabinetId = cabinet.Id,
OrganizationId = cabinet.OrganizationId, OrganizationId = cabinet.OrganizationId,
State = x.State, State = x.State,
Msg = x.Msg, Msg = x.Msg,
PushTime = DateTime.Now, PushTime = DateTime.Now,
UserName = x.UserName, UserName = x.UserName,
CurrentUserName = x.CurrentUserName, CurrentUserName = x.CurrentUserName,
Epc = x.EPC, Epc = x.EPC,
})); }));
_unitOfWork.SaveChanges(); _unitOfWork.SaveChanges();
_logger.LogDebug("Cabinet/UploadRFIDInner数据上报数据返回:" + JsonConvert.SerializeObject(InvStates).ToString());
return JsonManager.ReturnSuccessResponse(InvStates);
_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) catch (Exception e)
{ {
...@@ -4215,7 +4213,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -4215,7 +4213,7 @@ namespace JunmpPoliceStation.Controllers
if (jdata != null) if (jdata != null)
{ {
var entity = JsonManager.GetJsonEntity(jdata); var entity = JsonManager.GetJsonEntity(jdata);
_logger.LogDebug("DeletePoliceAndCabinet" + jdata.ToString());
string organizationId = entity?.organizationId ?? ""; string organizationId = entity?.organizationId ?? "";
...@@ -4346,7 +4344,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -4346,7 +4344,7 @@ namespace JunmpPoliceStation.Controllers
catch (Exception ex) catch (Exception ex)
{ {
//_logger.LogError("Login/SignIn 错误:" + ex.ToString()); _logger.LogError("Login/SignIn 错误:" + ex.ToString());
return JsonManager.SimpleStatusResponse(ResultCode.OPERATE_FAILED); return JsonManager.SimpleStatusResponse(ResultCode.OPERATE_FAILED);
} }
}); });
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论