wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
周科达
2023-06-14 16:52:20 +08:00
parent edf3f135b1
commit 030d375871
7 changed files with 350 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

295
ProductionMgr/Tnb.ProductionMgr/PrdTaskManageService.cs
View File

@@ -22,9 +22,12 @@ using Aspose.Cells.Drawing;
using Microsoft.AspNetCore.Mvc;
using DbModels;
using JNPF.Common.Extension;
using JNPF.Common.Filter;
using Tnb.ProductionMgr.Entities.Dto.PrdManage;
using NPOI.OpenXmlFormats;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using Newtonsoft.Json;
using Tnb.BasicData;
namespace Tnb.ProductionMgr
@@ -58,57 +61,179 @@ namespace Tnb.ProductionMgr
}
// private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
// {
// var db = _repository.AsSugarClient();
// VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
// var data = await _runService.GetListResult(templateEntity, input);
// if (data?.list?.Count > 0)
// {
// var statusField = "mo_task_status";
// var scheduledTypeField = nameof(PrdMoTask.schedule_type);
// data.list = data.list.Where(it => it.ContainsKey(statusField) &&
// it[statusField].IsNotEmptyOrNull() && it[statusField].ToString() != "待下发" &&
// it[scheduledTypeField].IsNotEmptyOrNull() && it[scheduledTypeField].ParseToInt() == 1
// ).ToList();
// foreach (var row in data.list)
// {
// var dic = row.ToDictionary(x => x.Key, x => x.Value);
// var pkName = "material_id";
// if (dic.ContainsKey(pkName))
// {
// var materialId = dic[pkName]?.ToString();
// var material = await db.Queryable<BasMaterial>().FirstAsync(it => it.id == materialId);
// if (material != null)
// {
// row[pkName] = $"{material.code}/{material.name}";
// }
// }
// //模具
// if (dic.ContainsKey("mold_id"))
// {
// var moldId = dic["mold_id"]?.ToString();
// var mold = await db.Queryable<ToolMolds>().FirstAsync(it => it.id == moldId);
// if (mold != null)
// {
// row["mold_id"] = $"{mold.mold_code}/{mold.mold_name}";
// }
// }
// //设备
// if (dic.ContainsKey("eqp_id"))
// {
// var eqpId = dic["eqp_id"]?.ToString();
// var eqp = await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == eqpId);
// if (eqp != null)
// {
// row["eqp_id"] = $"{eqp.code}/{eqp.name}";
// }
// }
//
// }
// }
// return data!;
// }
private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
{
var db = _repository.AsSugarClient();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
var data = await _runService.GetListResult(templateEntity, input);
if (data?.list?.Count > 0)
Dictionary<string, object> queryJson = input.queryJson!=null ? JsonConvert.DeserializeObject<Dictionary<string, object>>(input.queryJson) : null;
string moTaskCode = queryJson!=null && queryJson.ContainsKey("mo_task_code") ? queryJson["mo_task_code"].ToString() : "";
Dictionary<string, string> dic = new Dictionary<string, string>()
{
var statusField = "mo_task_status";
var scheduledTypeField = nameof(PrdMoTask.schedule_type);
data.list = data.list.Where(it => it.ContainsKey(statusField) &&
it[statusField].IsNotEmptyOrNull() && it[statusField].ToString() != "待下发" &&
it[scheduledTypeField].IsNotEmptyOrNull() && it[scheduledTypeField].ParseToInt() == 1
).ToList();
foreach (var row in data.list)
[DictConst.ToBeStartedEnCode] = "待开工",
[DictConst.InProgressEnCode] = "进行中",
[DictConst.ClosedEnCode] = "关闭",
[DictConst.ComplatedEnCode] = "完工",
[DictConst.ToBeScheduledEncode] = "待排产",
[DictConst.MoStatusPauseCode] = "暂停",
[DictConst.MoStatusExceptionCode] = "异常",
[DictConst.MoStatusRevokeCode] = "撤销",
};
var result = await db.Queryable<PrdMoTask>()
.LeftJoin<EqpEquipment>((a, b) => a.eqp_id == b.id)
.LeftJoin<BasMaterial>((a, b, c) => a.material_id == c.id)
.LeftJoin<ToolMolds>((a, b, c, d) => a.mold_id == d.id)
//.Where((a,b,c,d)=>(a.mo_task_status==DictConst.ToBeStartedEnCode || a.mo_task_status==DictConst.InProgressEnCode || a.mo_task_status==DictConst.MoStatusExceptionCode))
.Where((a,b,c,d)=>a.schedule_type==1)
.WhereIF(!string.IsNullOrEmpty(moTaskCode),(a,b,c,d)=>a.mo_task_code.Contains(moTaskCode))
.OrderByDescending((a, b, c, d) => a.create_time)
.Select((a, b, c, d) => new PrdTaskManageListOutput()
{
var dic = row.ToDictionary(x => x.Key, x => x.Value);
var pkName = "material_id";
if (dic.ContainsKey(pkName))
{
var materialId = dic[pkName]?.ToString();
var material = await db.Queryable<BasMaterial>().FirstAsync(it => it.id == materialId);
if (material != null)
{
row[pkName] = $"{material.code}/{material.name}";
}
}
//模具
if (dic.ContainsKey("mold_id"))
{
var moldId = dic["mold_id"]?.ToString();
var mold = await db.Queryable<ToolMolds>().FirstAsync(it => it.id == moldId);
if (mold != null)
{
row["mold_id"] = $"{mold.mold_code}/{mold.mold_name}";
}
}
//设备
if (dic.ContainsKey("eqp_id"))
{
var eqpId = dic["eqp_id"]?.ToString();
var eqp = await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == eqpId);
if (eqp != null)
{
row["eqp_id"] = $"{eqp.code}/{eqp.name}";
}
}
}
}
return data!;
id = a.id,
mo_task_code = a.mo_task_code,
material_id = c.code+"/"+c.name,
mold_id = d.mold_code+"/"+d.mold_name,
eqp_id = b.code+"/"+b.name,
plan_start_date = a.plan_start_date.Value.ToString("yyyy-MM-dd"),
plan_end_date = a.plan_end_date.Value.ToString("yyyy-MM-dd"),
plan_qty = a.scheduled_qty,
complete_qty = a.complete_qty,
mo_task_status = a.mo_task_status,
schedule_type = a.schedule_type.ToString()
})
.Mapper(x=>x.mo_task_status=dic[x.mo_task_status])
.ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<PrdTaskManageListOutput>.SqlSugarPageResult(result);
}
// /// <summary>
// /// 根据任务单号获取提报记录明细
// /// </summary>
// /// <param name="icmoCode">任务单号</param>
// /// <remarks>
// /// returns:
// ///<br/> {
// ///<br/> icmo_qty:任务计划数量
// ///<br/> reported_work_qty:已报工数量
// ///<br/> reported_qty:报工数量
// ///<br/> prd_qty:生产数量
// ///<br/> }
// /// </remarks>
// [HttpGet]
// public async Task<dynamic> GetPrdReportByIcmoCode([FromRoute] string mo_task_code)
// {
// var db = _repository.AsSugarClient();
// var prdTask = await db.Queryable<PrdMoTask>().FirstAsync(it => it.mo_task_code == mo_task_code);
// var eqpCode = "";
// var moldCode = "";
// var materialCode = "";
// var materialName = "";
// var materialProp = "";
// if (prdTask != null)
// {
// var dic = await _dictionaryDataService.GetDicByTypeId(DictConst.PrdTaskStatusTypeId);
// var eqp = await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == prdTask.eqp_id);
// var mold = await db.Queryable<ToolMolds>().FirstAsync(it => it.id == prdTask.mold_id);
// var material = await db.Queryable<BasMaterial>().FirstAsync(it => it.id == prdTask.material_id);
// eqpCode = eqp != null ? eqp.code : "";
// moldCode = mold != null ? mold.mold_code : "";
// materialCode = material != null ? material.code : "";
// materialName = material != null ? material.name : "";
// materialProp = material != null ? material.material_property : "";
// prdTask.workline_code = (await db.Queryable<OrganizeEntity>().Where(it => it.Id == prdTask.workline_id && it.Category == "workline").FirstAsync())?.EnCode;
// prdTask.process_code = (await db.Queryable<BasProcess>().Where(it => it.id == prdTask.process_id).FirstAsync())?.process_code;
// if (dic.ContainsKey(prdTask.mo_task_status))
// {
// prdTask.mo_task_status = dic[prdTask.mo_task_status]?.ToString();
// }
//
// }
// var res = await db.Queryable<PrdReport>().Where(it => it.mo_task_code == mo_task_code)
// .Select(it => new PrdReportOutput
// {
// icmo_qty = it.icmo_qty,
// reported_work_qty = it.reported_work_qty,
// reported_qty = it.reported_qty,
// prd_qty = it.prd_qty,
// scrap_qty = SqlFunc.Subqueryable<PrdMoTaskDefect>().Where(pmtd => pmtd.mo_task_id == it.mo_task_id).Select(pmtd => pmtd.scrap_qty),
// })
// .Mapper(it =>
// {
// it.icmo_qty = it.icmo_qty ?? (
// db.Queryable<PrdMoTask>().First(it => it.mo_task_code == mo_task_code)?.scheduled_qty < 1 ? 0 :
// (it.icmo_qty ?? db.Queryable<PrdMoTask>().First(it => it.mo_task_code == mo_task_code)?.scheduled_qty ?? 0));
// it.reported_work_qty = it.reported_work_qty ?? 0;
// it.reported_qty = it.reported_qty ?? 0;
// it.prd_qty = it.prd_qty ?? 0;
// it.scrap_qty = it.scrap_qty ?? 0;
// })
// .FirstAsync();
// prdTask.eqp_code = eqpCode;
// prdTask.mold_code = moldCode;
// prdTask.material_code = materialCode;
// prdTask.material_name = materialName;
// prdTask.icmo_qty = res?.icmo_qty;
// prdTask.reported_work_qty = res?.reported_work_qty ?? 0;
// prdTask.reported_qty = res?.reported_qty ?? 0;
// prdTask.prd_qty = res?.prd_qty ?? 0;
// prdTask.scrap_qty = res?.scrap_qty ?? 0;
//
// return prdTask;
// }
/// <summary>
/// 根据任务单号获取提报记录明细
/// </summary>
@@ -126,60 +251,34 @@ namespace Tnb.ProductionMgr
public async Task<dynamic> GetPrdReportByIcmoCode([FromRoute] string mo_task_code)
{
var db = _repository.AsSugarClient();
var prdTask = await db.Queryable<PrdMoTask>().FirstAsync(it => it.mo_task_code == mo_task_code);
var eqpCode = "";
var moldCode = "";
var materialCode = "";
var materialName = "";
var materialProp = "";
if (prdTask != null)
{
var dic = await _dictionaryDataService.GetDicByTypeId(DictConst.PrdTaskStatusTypeId);
var eqp = await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == prdTask.eqp_id);
var mold = await db.Queryable<ToolMolds>().FirstAsync(it => it.id == prdTask.mold_id);
var material = await db.Queryable<BasMaterial>().FirstAsync(it => it.id == prdTask.material_id);
eqpCode = eqp != null ? eqp.code : "";
moldCode = mold != null ? mold.mold_code : "";
materialCode = material != null ? material.code : "";
materialName = material != null ? material.name : "";
materialProp = material != null ? material.material_property : "";
prdTask.workline_code = (await db.Queryable<OrganizeEntity>().Where(it => it.Id == prdTask.workline_id && it.Category == "workline").FirstAsync())?.EnCode;
prdTask.process_code = (await db.Queryable<BasProcess>().Where(it => it.id == prdTask.process_id).FirstAsync())?.process_code;
if (dic.ContainsKey(prdTask.mo_task_status))
var dic = await _dictionaryDataService.GetDicByTypeId(DictConst.PrdTaskStatusTypeId);
var prdTask = await db.Queryable<PrdMoTask>()
.LeftJoin<BasMaterial>((a,b)=>a.material_id==b.id)
.LeftJoin<ToolMolds>((a,b,c)=>a.mold_id==c.id)
.LeftJoin<EqpEquipment>((a,b,c,d)=>a.eqp_id==d.id)
.LeftJoin<DictionaryDataEntity>((a,b,c,d,e)=>e.DictionaryTypeId==DictConst.PrdTaskStatusTypeId && a.mo_task_status==e.EnCode)
.Where((a,b) => a.mo_task_code == mo_task_code)
.Select((a,b,c,d,e) => new
{
prdTask.mo_task_status = dic[prdTask.mo_task_status]?.ToString();
}
}
var res = await db.Queryable<PrdReport>().Where(it => it.mo_task_code == mo_task_code)
.Select(it => new PrdReportOutput
{
icmo_qty = it.icmo_qty,
reported_work_qty = it.reported_work_qty,
reported_qty = it.reported_qty,
prd_qty = it.prd_qty,
scrap_qty = SqlFunc.Subqueryable<PrdMoTaskDefect>().Where(pmtd => pmtd.mo_task_id == it.mo_task_id).Select(pmtd => pmtd.scrap_qty),
})
.Mapper(it =>
{
it.icmo_qty = it.icmo_qty ?? (
db.Queryable<PrdMoTask>().First(it => it.mo_task_code == mo_task_code)?.scheduled_qty < 1 ? 0 :
(it.icmo_qty ?? db.Queryable<PrdMoTask>().First(it => it.mo_task_code == mo_task_code)?.scheduled_qty ?? 0));
it.reported_work_qty = it.reported_work_qty ?? 0;
it.reported_qty = it.reported_qty ?? 0;
it.prd_qty = it.prd_qty ?? 0;
it.scrap_qty = it.scrap_qty ?? 0;
})
.FirstAsync();
prdTask.eqp_code = eqpCode;
prdTask.mold_code = moldCode;
prdTask.material_code = materialCode;
prdTask.material_name = materialName;
prdTask.icmo_qty = res?.icmo_qty;
prdTask.reported_work_qty = res?.reported_work_qty ?? 0;
prdTask.reported_qty = res?.reported_qty ?? 0;
prdTask.prd_qty = res?.prd_qty ?? 0;
prdTask.scrap_qty = res?.scrap_qty ?? 0;
id = a.id,
mo_task_code = a.mo_task_code,
mo_id = a.mo_id,
material_id = a.material_id,
material_code = b.code,
material_name = b.name,
material_property = b.material_property,
mo_task_status = e.FullName,
plan_qty = a.plan_qty,
scheduled_qty = a.scheduled_qty,
complete_qty = a.reported_work_qty + a.scrap_qty,
scrap_qty = a.scrap_qty,
mold_code = c.mold_code,
// icmo_qty = a.icmo_qty,
reported_work_qty = a.reported_work_qty,
// reported_qty = a.reported_qty,
// prd_qty = a.prd_qty,
eqp_code = d.code,
}).FirstAsync();
return prdTask;
}