Skip to content

J
JunmpPoliceStation
Commit 5c072baa by zxw
Options

采购维修报废调整getbyid

parent 66f2a021
正在显示 包含 59 行增加 和 47 行删除
JunmpPoliceStation/Controllers/FixReceiveApplyController.cs
......@@ -64,24 +64,31 @@ namespace JunmpPoliceStation.Controllers
var param = new string[] {
"CommonJpProcessHistories",
"CommonJpFixReceiveApplies",
"CommonJpFixReceiveApplies.Warehouse" ,
"CommonJpFixReceiveApplies.CommonJpFixReceiveApplyDetails" ,
"CommonJpFixReceiveApplies.CommonJpFixReceiveApplyDetails.Equipment" ,
"CommonJpFixReceiveApplies.CommonJpFixReceiveApplyDetails.Size" ,
"CommonJpFixReceiveApplies.CommonJpFixReceiveApplyDetails.Supplier" ,
};
Expression<Func<CommonJpProcessCurrent, bool>> expression = p => p.OrderId.Equals(id) || p.CommonJpFixReceiveApplies.Where(c => c.OrderCode.Equals(id)).Count() > 0;
var fix = _unitOfWork.CommonJpProcessCurrentRepository.GetList(expression, null, false, param).ToList();
var param2 = new string[] {
"Warehouse" ,
"CommonJpFixReceiveApplyDetails" ,
"CommonJpFixReceiveApplyDetails.Equipment" ,
"CommonJpFixReceiveApplyDetails.Size" ,
"CommonJpFixReceiveApplyDetails.Supplier" ,
};
Expression<Func<CommonJpFixReceiveApply, bool>> expression = p => p.Id.Equals(id) || p.OrderCode.Equals(id);
var fix = _unitOfWork.FixReceiveApplyRepository.GetList(expression, null, false, param2).ToList();
if (fix.Count > 0)
{
var first = fix[0];
var process = _unitOfWork.CommonJpProcessCurrentRepository
.GetList(x => x.OrderId == first.Id, null, false, param).ToList();
var fixData = fix.Select(t => new
var fixData = process.Select(t => new
{
type = t.CommonJpFixReceiveApplies.First().Action.Equals(0) ? 5 : 6,
type = first.Action.Equals(0) ? 5 : 6,
t.NextStepId,
t.FlowType,
flowState = Convert.ToBoolean(t.FlowState),
......@@ -89,24 +96,24 @@ namespace JunmpPoliceStation.Controllers
t.UserType,
t.DataScope,
processActionType = t.ActionType == null ? "" : t.ActionType,
OrgId = t.CommonJpFixReceiveApplies?.FirstOrDefault()?.OrgId,
OrgId = first.OrgId,
t.UpdateTime,
t.CurrentStepName,
ActionType = t.CommonJpFixReceiveApplies?.FirstOrDefault()?.Action,
id = t.CommonJpFixReceiveApplies?.FirstOrDefault()?.Id,
warehouseId = t.CommonJpFixReceiveApplies?.FirstOrDefault()?.WarehouseId,
applyId = t.CommonJpFixReceiveApplies?.FirstOrDefault()?.ApplyId,
applyName = t.CommonJpFixReceiveApplies?.FirstOrDefault()?.ApplyName,
applyTime = t.CommonJpFixReceiveApplies?.FirstOrDefault()?.ApplyTime,
note = t.CommonJpFixReceiveApplies?.FirstOrDefault()?.ApprovalName,
createTime = t.CommonJpFixReceiveApplies?.FirstOrDefault()?.CreateTime,
warehouseName = t.CommonJpFixReceiveApplies?.FirstOrDefault()?.Warehouse?.Name,
t.CommonJpFixReceiveApplies?.FirstOrDefault()?.OrderCode,
ActionType = first.Action,
id = first.Id,
warehouseId = first.WarehouseId,
applyId = first.ApplyId,
applyName = first.ApplyName,
applyTime = first.ApplyTime,
note = first.ApprovalName,
createTime = first.CreateTime,
warehouseName = first.Warehouse?.Name,
first.OrderCode,
actionResult = t.CommonJpProcessHistories?
.OrderBy(p => p.UpdateTime)
.FirstOrDefault()?
.AuditUserId.Equals(t.CommonJpFixReceiveApplies?.FirstOrDefault()?.ApplyId) == true ? "0" : "1",
.AuditUserId.Equals(first.ApplyId) == true ? "0" : "1",
historyList = t.CommonJpProcessHistories?.Select(x => new
......@@ -119,7 +126,7 @@ namespace JunmpPoliceStation.Controllers
AuditMind = x.AuditMind == null ? "" : x.AuditMind,
x.AuditUserName
}).OrderByDescending(c => c.UpdateTime),
detailList = t.CommonJpFixReceiveApplies?.FirstOrDefault()?.CommonJpFixReceiveApplyDetails?.Select(x => new
detailList = first.CommonJpFixReceiveApplyDetails?.Select(x => new
{
realityId = x.OrderId,
equipmentId = x.Equipment?.Id,
......
JunmpPoliceStation/Controllers/PuchaseOrderController.cs
......@@ -318,23 +318,28 @@ namespace JunmpPoliceStation.Controllers
var param = new string[] {
"CommonJpProcessHistories",
"CommonJpPurchaseOrders",
"CommonJpPurchaseOrders.Warehouse" ,
"CommonJpPurchaseOrders.CommonJpPurchaseDetails" ,
"CommonJpPurchaseOrders.CommonJpPurchaseDetails.Equipment" ,
"CommonJpPurchaseOrders.CommonJpPurchaseDetails.Size" ,
"CommonJpPurchaseOrders.CommonJpPurchaseDetails.Supplier" ,
"CommonJpPurchaseOrders.CommonJpPurchaseDetails.CommonJpPurchaseEpcs" ,
};
Expression<Func<CommonJpProcessCurrent, bool>> expression = p => p.OrderId.Equals(id) || p.CommonJpPurchaseOrders.Where(c => c.OrderCode.Equals(id)).Count() > 0;
var param2 = new string[] {
"Warehouse" ,
"CommonJpPurchaseDetails" ,
"CommonJpPurchaseDetails.Equipment" ,
"CommonJpPurchaseDetails.Size" ,
"CommonJpPurchaseDetails.Supplier" ,
"CommonJpPurchaseDetails.CommonJpPurchaseEpcs" ,
};
Expression<Func<CommonJpPurchaseOrder, bool>> expression = p => p.Id.Equals(id) || p.OrderCode.Equals(id);
var purchase = _unitOfWork.CommonJpProcessCurrentRepository.GetList(expression, null, false, param).ToList();
var purchase = _unitOfWork.PurchaseOrderyRepository.GetList(expression, null, false, param2).ToList();
if (purchase.Count > 0)
{
var first = purchase[0];
var process = _unitOfWork.CommonJpProcessCurrentRepository
.GetList(x => x.OrderId == first.Id, null, false, param).ToList();
var purchaseData = purchase.Select(t => new
var purchaseData = process.Select(t => new
{
type = 1,
......@@ -353,18 +358,18 @@ namespace JunmpPoliceStation.Controllers
actionResult = t.CommonJpProcessHistories?
.OrderBy(p => p.UpdateTime)
.FirstOrDefault()?
.AuditUserId.Equals(t.CommonJpPurchaseOrders?.FirstOrDefault()?.ApplyId) == true ? "0" : "1",
id = t.CommonJpPurchaseOrders?.FirstOrDefault()?.Id,
warehouseId = t.CommonJpPurchaseOrders?.FirstOrDefault()?.WarehouseId,
applyId = t.CommonJpPurchaseOrders?.FirstOrDefault()?.ApplyId,
applyName = t.CommonJpPurchaseOrders?.FirstOrDefault()?.ApplyName,
applyTime = t.CommonJpPurchaseOrders?.FirstOrDefault()?.ApplyTime,
createTime = t.CommonJpPurchaseOrders?.FirstOrDefault()?.CreateTime,
note = t.CommonJpPurchaseOrders?.FirstOrDefault()?.ApplyReason,
warehouseName = t.CommonJpPurchaseOrders?.FirstOrDefault()?.Warehouse?.Name,
t.CommonJpPurchaseOrders?.FirstOrDefault()?.OrderCode,
t.CommonJpPurchaseOrders?.FirstOrDefault()?.IssuingOrg,
.AuditUserId.Equals(first.ApplyId) == true ? "0" : "1",
id = first.Id,
warehouseId = first.WarehouseId,
applyId = first.ApplyId,
applyName = first.ApplyName,
applyTime = first.ApplyTime,
createTime = first.CreateTime,
note = first.ApplyReason,
warehouseName = first.Warehouse?.Name,
first.OrderCode,
first.IssuingOrg,
historyList = t.CommonJpProcessHistories?.Select(x => new
{
x.Id,
......@@ -375,7 +380,7 @@ namespace JunmpPoliceStation.Controllers
x.AuditUserName,
x.AuditMind
}).OrderByDescending(c => c.UpdateTime),
detailList = t.CommonJpPurchaseOrders?.FirstOrDefault()?.CommonJpPurchaseDetails.Select(x => new
detailList = first.CommonJpPurchaseDetails.Select(x => new
{
realityId = x.Id,
equipmentId = x.EquipmentId,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论