Skip to content

J
JunmpPoliceStation
Commit 88d3a752 by zxw
Options

1214部署

parent 62993ca6
正在显示 包含 81 行增加 和 38 行删除
JmpModel/Model/BaseJpCabinetWorklog.cs
...@@ -27,7 +27,7 @@ namespace JmpModel.Model ...@@ -27,7 +27,7 @@ namespace JmpModel.Model
[StringLength(50)] [StringLength(50)]
public string Date { get; set; } public string Date { get; set; }
[Column("photo")] [Column("photo")]
[StringLength(50)] [StringLength(255)]
public string Photo { get; set; } public string Photo { get; set; }
[Column("isDeal")] [Column("isDeal")]
[StringLength(50)] [StringLength(50)]
......
JmpModel/Model/DataContext/JunmppolicesqlContext.cs
...@@ -3754,6 +3754,8 @@ Warehouse：仓库"); ...@@ -3754,6 +3754,8 @@ Warehouse：仓库");
entity.Property(e => e.Order).IsUnicode(false); entity.Property(e => e.Order).IsUnicode(false);
entity.Property(e => e.PrintOrderCode).IsUnicode(false);
entity.Property(e => e.WarehouseId).IsUnicode(false); entity.Property(e => e.WarehouseId).IsUnicode(false);
entity.Property(e => e.WarehouseName).IsUnicode(false); entity.Property(e => e.WarehouseName).IsUnicode(false);
......
JmpModel/Model/ViewOutInOrder.cs
...@@ -27,5 +27,10 @@ namespace JmpModel.Model ...@@ -27,5 +27,10 @@ namespace JmpModel.Model
public DateTime? CreateTime { get; set; } public DateTime? CreateTime { get; set; }
[Column("type")] [Column("type")]
public int Type { get; set; } public int Type { get; set; }
[Column("print_order_code")]
[StringLength(255)]
public string PrintOrderCode { get; set; }
[Column("print_order_time", TypeName = "datetime")]
public DateTime? PrintOrderTime { get; set; }
} }
} }
\ No newline at end of file
JunmpPoliceStation/Controllers/InventoryController.cs
...@@ -3145,6 +3145,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -3145,6 +3145,7 @@ namespace JunmpPoliceStation.Controllers
/// "size":10, /// "size":10,
/// "page":0, /// "page":0,
/// "wareHouseId":"当前仓库Id", /// "wareHouseId":"当前仓库Id",
/// "orgId":"组织机构id",
/// "outInState" : 0:出库,1入库 /// "outInState" : 0:出库,1入库
/// "type":1 1采购，2借用，3领用，4调拨,5,维修,6报废,7跨库借用，9跨库归还 10跨库归还入库 12销毁 /// "type":1 1采购，2借用，3领用，4调拨,5,维修,6报废,7跨库借用，9跨库归还 10跨库归还入库 12销毁
/// "currentState":""0 已完成，1未完成 /// "currentState":""0 已完成，1未完成
...@@ -3177,6 +3178,15 @@ namespace JunmpPoliceStation.Controllers ...@@ -3177,6 +3178,15 @@ namespace JunmpPoliceStation.Controllers
string currentState = entity.currentState; string currentState = entity.currentState;
//var warehouse = _unitOfWork.WarehouseRepository.Get(p => p.Id.Equals(warehouseID)).Orgization;//当前仓库信息 //var warehouse = _unitOfWork.WarehouseRepository.Get(p => p.Id.Equals(warehouseID)).Orgization;//当前仓库信息
Expression<Func<ViewOutInOrder, bool>> expression = t => t.Id != null;//0,调拨出库 1采购，2借用，3领用，4调拨入库,5,维修,12报废 Expression<Func<ViewOutInOrder, bool>> expression = t => t.Id != null;//0,调拨出库 1采购，2借用，3领用，4调拨入库,5,维修,12报废
if (!string.IsNullOrEmpty(entity.orgId))
{
string orgId = entity.orgId;
var warehouseList = _unitOfWork.WarehouseRepository
.GetList(x => x.OrgizationId == orgId)
.Select(x => x.Id)
.ToList();
expression = LambdaExtensions.AndAlso(expression, t => warehouseList.Contains(t.WarehouseId));
}
if (!String.IsNullOrEmpty(entity.wareHouseId)) if (!String.IsNullOrEmpty(entity.wareHouseId))
{ {
warehouseID = entity.wareHouseId; warehouseID = entity.wareHouseId;
...@@ -3247,38 +3257,35 @@ namespace JunmpPoliceStation.Controllers ...@@ -3247,38 +3257,35 @@ namespace JunmpPoliceStation.Controllers
} }
} }
if (string.IsNullOrEmpty(warehouseID))
{ var outInOrders = _unitOfWork.ViewOutInOrderRepository.GetList(expression).ToList().GroupBy(t => t.Id);
var content = new var res = outInOrders
{ .Select(t => new
totalElements = 0, {
content = new List<string> { }, t.FirstOrDefault().Id,
}; t.FirstOrDefault().Order,
return JsonManager.ReturnSuccessResponse(content); t.FirstOrDefault().Type,
} t.FirstOrDefault().WarehouseId,
else WarehouseName = t.Count() > 1 ? t.FirstOrDefault().WarehouseName + "等" : t.FirstOrDefault().WarehouseName,
WarehouseNameDetail = t.Select(y => y.WarehouseName),
t.FirstOrDefault().CurrentState,
t.FirstOrDefault().CreateTime,
t.FirstOrDefault().PrintOrderCode,
PrintOrderTime = t.FirstOrDefault().PrintOrderTime?.ToString("yyyy年MM月dd日"),
StateType = (t.FirstOrDefault().CurrentState.Equals(2) || t.FirstOrDefault().CurrentState.Equals(11) || t.FirstOrDefault().CurrentState.Equals(3) || (t.FirstOrDefault().CurrentState.Equals(1) && (t.FirstOrDefault().Type.Equals(1) || t.FirstOrDefault().Type.Equals(3) || t.FirstOrDefault().Type.Equals(6) || t.FirstOrDefault().Type.Equals(12)))) ? "0" :
t.FirstOrDefault().CurrentState.Equals(0) || (t.FirstOrDefault().CurrentState == null && t.FirstOrDefault().Type.Equals(1)) || (t.FirstOrDefault().CurrentState.Equals(1) && (t.FirstOrDefault().Type.Equals(0) || t.FirstOrDefault().Type.Equals(2) || t.FirstOrDefault().Type.Equals(11) || t.FirstOrDefault().Type.Equals(4) || t.FirstOrDefault().Type.Equals(5) || t.FirstOrDefault().Type.Equals(7) || t.FirstOrDefault().Type.Equals(8) || t.FirstOrDefault().Type.Equals(9) || t.FirstOrDefault().Type.Equals(10)))
? "1" : null
})
.OrderByDescending(t => t.CreateTime)
.ToList();
//var orderList= outInOrders.totalElements
var content = new
{ {
var outInOrders = _unitOfWork.ViewOutInOrderRepository.GetPage(expression, "-CreateTime", page, size, false); totalElements = outInOrders.Count(),
//var orderList= outInOrders.totalElements content = res.Skip(page * size).Take(size).ToList()
var content = new };
{ return JsonManager.ReturnSuccessResponse(content);
outInOrders?.totalElements,
content = outInOrders.content.Select(t => new
{
t.Id,
t.Order,
t.Type,
t.WarehouseId,
t.WarehouseName,
t.CurrentState,
t.CreateTime,
StateType = (t.CurrentState.Equals(2) || t.CurrentState.Equals(11) || t.CurrentState.Equals(3) || (t.CurrentState.Equals(1) && (t.Type.Equals(1) || t.Type.Equals(3) || t.Type.Equals(6) || t.Type.Equals(12)))) ? "0" :
t.CurrentState.Equals(0) || (t.CurrentState == null && t.Type.Equals(1)) || (t.CurrentState.Equals(1) && (t.Type.Equals(0) || t.Type.Equals(2) || t.Type.Equals(11) || t.Type.Equals(4) || t.Type.Equals(5) || t.Type.Equals(7) || t.Type.Equals(8) || t.Type.Equals(9) || t.Type.Equals(10)))
? "1" : null
})
};
return JsonManager.ReturnSuccessResponse(content);
}
} }
else else
{ {
......
JunmpPoliceStation/Controllers/OrganizationController.cs
...@@ -1247,7 +1247,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -1247,7 +1247,7 @@ namespace JunmpPoliceStation.Controllers
/// { /// {
/// "orgId":"id", /// "orgId":"id",
/// "orderCode":"单号", /// "orderCode":"单号",
/// "orderType":"单据类型 借:借用 领:领用 支:调拨 价:调拨 废:报废 销：销毁" /// "orderType":"单据类型 借:借用 领:领用 支:调拨 价:调拨 废:报废 销：销毁 入：采购"
/// ///
/// } /// }
/// ///
...@@ -1379,6 +1379,27 @@ namespace JunmpPoliceStation.Controllers ...@@ -1379,6 +1379,27 @@ namespace JunmpPoliceStation.Controllers
printOrderTime = order.PrintOrderTime?.ToString("yyyy年MM月dd日"), printOrderTime = order.PrintOrderTime?.ToString("yyyy年MM月dd日"),
}); });
} }
case "入":
{
order = _unitOfWork.PurchaseOrderyRepository.Get(x => x.OrderCode == orderCode);
if (order == null)
{
return JsonManager.SimpleStatusResponse(ResultCode.REQUEST_DATA_ERROR);
}
if (string.IsNullOrEmpty(order.PrintOrderCode))
{
CreateNewOrderCount(ref order, org, orderType, out string printOrderCode);
order.PrintOrderCode = printOrderCode;
order.PrintOrderTime = DateTime.Now;
_unitOfWork.PurchaseOrderyRepository.Update(order);
}
return JsonManager.ReturnSuccessResponse(new
{
printOrderCode = order.PrintOrderCode,
printOrderTime = order.PrintOrderTime?.ToString("yyyy年MM月dd日"),
});
}
default: default:
{ {
return JsonManager.SimpleStatusResponse(ResultCode.REQUEST_DATA_ERROR); return JsonManager.SimpleStatusResponse(ResultCode.REQUEST_DATA_ERROR);
......
JunmpPoliceStation/Controllers/TjController.cs
...@@ -997,8 +997,15 @@ namespace JunmpPoliceStation.Controllers ...@@ -997,8 +997,15 @@ namespace JunmpPoliceStation.Controllers
} }
string OrgId = Guid.Empty.ToString(); string OrgId = Guid.Empty.ToString();
string startTime = entity.startTime;
string endTime = entity.endTime; if (!DateTime.TryParse(entity.startTime, out DateTime startTime))
{
return JsonManager.SimpleCustResponse("startTime is require");
}
if (!DateTime.TryParse(entity.endTime, out DateTime endTime))
{
return JsonManager.SimpleCustResponse("endTime is require");
}
string equipmentCode = entity.equipmentCode; string equipmentCode = entity.equipmentCode;
if (!String.IsNullOrEmpty(entity.orgId)) if (!String.IsNullOrEmpty(entity.orgId))
...@@ -1007,8 +1014,8 @@ namespace JunmpPoliceStation.Controllers ...@@ -1007,8 +1014,8 @@ namespace JunmpPoliceStation.Controllers
} }
int newpage = page * size; int newpage = page * size;
int newsize = size; int newsize = size;
List<useCountResult> data = _unitOfWork.ViewEquipmentRepository.Exec_UseCount(" EXEC useCount @orgid ='" + OrgId + "',@startTime ='" + startTime + "'" + List<useCountResult> data = _unitOfWork.ViewEquipmentRepository.Exec_UseCount(" EXEC useCount @orgid ='" + OrgId + "',@startTime ='" + startTime.ToString("yyyy-MM-dd") + "'" +
",@endTime ='" + endTime + "'" + ",@eqcode ='" + equipmentCode + "'" + ",@newspage ='" + newpage + "'" + ",@pageSize ='" + newsize + "'").ToList(); ",@endTime ='" + endTime.AddDays(1).ToString("yyyy-MM-dd") + "'" + ",@eqcode ='" + equipmentCode + "'" + ",@newspage ='" + newpage + "'" + ",@pageSize ='" + newsize + "'").ToList();
//var x= data[0].result.ToString(); //var x= data[0].result.ToString();
//JsonData requestData = JsonMapper.ToObject(x); //JsonData requestData = JsonMapper.ToObject(x);
var res = JsonConvert.DeserializeObject(data[0]?.result?.ToString() ?? string.Empty); var res = JsonConvert.DeserializeObject(data[0]?.result?.ToString() ?? string.Empty);
...@@ -1460,7 +1467,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -1460,7 +1467,7 @@ namespace JunmpPoliceStation.Controllers
string level = entity.level; string level = entity.level;
if (level == "本级") if (level == "本级")
{ {
expressionPoliceman = t => t.OrgId.Equals(orgizationCode) && t.CurrentState != null && t.CurrentState != 5 && t.CurrentState != 6; expressionPoliceman = t => t.OrgId.Equals(orgizationCode) && t.CurrentState != null && t.CurrentState != 5 && t.CurrentState != 6;
} }
else else
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论