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

合并

Browse Source
This commit is contained in:
马健
2024-04-11 17:31:32 +08:00
parent f6eaa2f481
commit 4fbc6c0267
200 changed files with 1252 additions and 1860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

327
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -21,15 +21,14 @@ using Tnb.BasicData;
using Tnb.BasicData.Entities;
using Tnb.BasicData.Entities.Dto;
using Tnb.EquipMgr.Entities;
using Tnb.PerMgr.Entities;
using Tnb.ProductionMgr.Entities;
using Tnb.ProductionMgr.Entities.Dto;
using Tnb.ProductionMgr.Entities.Dto.PrdManage;
using Tnb.ProductionMgr.Entities.Enums;
using Tnb.ProductionMgr.Interfaces;
using Tnb.QcMgr.Entities;
using Tnb.QcMgr.Entities.Enums;
using Tnb.QcMgr.Interfaces;
// using Tnb.QcMgr.Entities;
// using Tnb.QcMgr.Entities.Enums;
// using Tnb.QcMgr.Interfaces;
// using Tnb.PerMgr.Entities;
@@ -54,7 +53,7 @@ namespace Tnb.ProductionMgr
private readonly ISqlSugarClient _db;
private readonly IBillRullService _billRuleService;
private readonly IPrdInstockService _prdInstockService;
private readonly IQcCheckPlanService _qcCheckPlanService;
// private readonly IQcCheckPlanService _qcCheckPlanService;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public PrdMoTaskService(
@@ -64,8 +63,8 @@ namespace Tnb.ProductionMgr
IRunService runService,
IBillRullService billRullService,
IPrdInstockService prdInstockService,
IVisualDevService visualDevService,
IQcCheckPlanService qcCheckPlanService
// IQcCheckPlanService qcCheckPlanService,
IVisualDevService visualDevService
)
{
_repository = repository;
@@ -78,7 +77,7 @@ namespace Tnb.ProductionMgr
OverideFuncs.GetListAsync = GetList;
_billRuleService = billRullService;
_prdInstockService = prdInstockService;
_qcCheckPlanService = qcCheckPlanService;
// _qcCheckPlanService = qcCheckPlanService;
}
#region Get
@@ -384,7 +383,7 @@ namespace Tnb.ProductionMgr
estimated_end_date = a.estimated_end_date == null ? null : a.estimated_end_date.Value.ToString(DbTimeFormat.SS),
bom_id = d.id,
bom_version = d.version,
create_time = a.create_time==null ? "" : a.create_time.Value.ToString(DbTimeFormat.SS)
create_time = a.create_time == null ? "" : a.create_time.Value.ToString(DbTimeFormat.SS)
})
.Mapper(it => it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString()! : "")
.ToListAsync();
@@ -702,14 +701,14 @@ namespace Tnb.ProductionMgr
row = await db.Insertable(moTask).ExecuteCommandAsync();
#region 质检模块
//质检
TriggerPlanEntity entity = new()
{
materialid = moTask.material_id,
processid = moTask.process_id,
workid = moTask.workstation_id,
triggerevent = EnumTriggerEvent.首件检新的生产任务
};
await _qcCheckPlanService.CreateTask(entity);
// TriggerPlanEntity entity = new()
// {
// materialid = moTask.material_id,
// processid = moTask.process_id,
// workid = moTask.workstation_id,
// triggerevent = EnumTriggerEvent.首件检新的生产任务
// };
// await _qcCheckPlanService.CreateTask(entity);
#endregion
//根据工单号获取当前工单包含的已排产数
int? schedQty = db.Queryable<PrdMoTask>().Where(it => it.mo_id == input.mo_id)?.Sum(d => d.scheduled_qty);
@@ -843,14 +842,14 @@ namespace Tnb.ProductionMgr
row = await _db.Insertable(moTask).ExecuteCommandAsync();
#region 质检模块
//质检
TriggerPlanEntity entity = new()
{
materialid = moTask.material_id,
processid = moTask.process_id,
workid = moTask.workstation_id,
triggerevent = EnumTriggerEvent.首件检新的生产任务
};
await _qcCheckPlanService.CreateTask(entity);
// TriggerPlanEntity entity = new()
// {
// materialid = moTask.material_id,
// processid = moTask.process_id,
// workid = moTask.workstation_id,
// triggerevent = EnumTriggerEvent.首件检新的生产任务
// };
// await _qcCheckPlanService.CreateTask(entity);
#endregion
@@ -1087,20 +1086,20 @@ namespace Tnb.ProductionMgr
{
#region 质检模块
//质检
if (prdTaskList.Where(p => p.mo_task_status == "Pause").Count() > 0 && status == "InProgress")
{
foreach (PrdMoTask? task in prdTaskList.Where(p => p.mo_task_status == "Pause").ToList())
{
TriggerPlanEntity entity = new()
{
materialid = task.material_id,
processid = task.process_id,
workid = task.workstation_id,
triggerevent = EnumTriggerEvent.首件检生产任务暂停
};
await _qcCheckPlanService.CreateTask(entity);
}
}
// if (prdTaskList.Where(p => p.mo_task_status == "Pause").Count() > 0 && status == "InProgress")
// {
// foreach (PrdMoTask? task in prdTaskList.Where(p => p.mo_task_status == "Pause").ToList())
// {
// TriggerPlanEntity entity = new()
// {
// materialid = task.material_id,
// processid = task.process_id,
// workid = task.workstation_id,
// triggerevent = EnumTriggerEvent.首件检生产任务暂停
// };
// await _qcCheckPlanService.CreateTask(entity);
// }
// }
#endregion
foreach (PrdMoTask item in prdTaskList)
@@ -1503,13 +1502,13 @@ namespace Tnb.ProductionMgr
{
throw Oops.Bah("载具不能为空");
}
if (string.IsNullOrEmpty((input.location_code)))
{
throw Oops.Bah("入库库位不能为空");
}
if (input.reported_qty<=0)
if (input.reported_qty <= 0)
{
throw Oops.Bah("提报数量为正数");
}
@@ -1536,18 +1535,18 @@ namespace Tnb.ProductionMgr
#region 质检模块
//质检模块
TriggerPlanEntity entity = new()
{
materialid = prdMoTask.material_id,
processid = prdMoTask.process_id,
workid = prdMoTask.workstation_id
};
int? reported = prdMoTask.reported_work_qty == null ? 0 : prdMoTask.reported_work_qty;
int? scrap = prdMoTask.scrap_qty == null ? 0 : prdMoTask.scrap_qty;
entity.oldpronum = reported + scrap;
entity.newpronum = input.reported_qty;
entity.triggerevent = EnumTriggerEvent.生产检定量;
await _qcCheckPlanService.CreateTask(entity);
// TriggerPlanEntity entity = new()
// {
// materialid = prdMoTask.material_id,
// processid = prdMoTask.process_id,
// workid = prdMoTask.workstation_id
// };
// int? reported = prdMoTask.reported_work_qty == null ? 0 : prdMoTask.reported_work_qty;
// int? scrap = prdMoTask.scrap_qty == null ? 0 : prdMoTask.scrap_qty;
// entity.oldpronum = reported + scrap;
// entity.newpronum = input.reported_qty;
// entity.triggerevent = EnumTriggerEvent.生产检定量;
// await _qcCheckPlanService.CreateTask(entity);
#endregion
_ = prdMoTask.reported_work_qty == null
? await db.Updateable<PrdMoTask>()
@@ -1579,24 +1578,24 @@ namespace Tnb.ProductionMgr
.SetColumns(x => x.complete_qty == x.complete_qty + input.reported_qty)
.Where(x => x.id == prdMo.id).ExecuteCommandAsync();
PerProcessStandardsH processStandardsH = await db.Queryable<PerProcessStandardsH>()
.Where(x => x.equip_id == prdMoTask.eqp_id && x.molds_id == prdMoTask.mold_id &&
x.output_material_id == prdMoTask.material_id && x.enabled == 1)
.OrderByDescending(x => x.create_time).FirstAsync();
// PerProcessStandardsH processStandardsH = await db.Queryable<PerProcessStandardsH>()
// .Where(x => x.equip_id == prdMoTask.eqp_id && x.molds_id == prdMoTask.mold_id &&
// x.output_material_id == prdMoTask.material_id && x.enabled == 1)
// .OrderByDescending(x => x.create_time).FirstAsync();
ToolMolds toolMolds = await db.Queryable<ToolMolds>().SingleAsync(x => x.id == prdMoTask.mold_id);
if (toolMolds != null && toolMolds?.mold_cavity > 0 && processStandardsH != null &&
processStandardsH?.moulding_cycle > 0)
{
decimal? addTime = ((((prdMoTask.scheduled_qty - input.reported_qty - (prdMoTask.scrap_qty ?? 0)) * processStandardsH?.moulding_cycle) - 1) / toolMolds.mold_cavity) + 1;
if (prdMoTask.act_start_date != null && addTime != null && addTime > 0)
{
DateTime cal_plan_end_date = prdMoTask.act_start_date.Value.AddSeconds((double)addTime);
_ = await db.Updateable<PrdMoTask>()
.SetColumns(x => x.plan_end_date == cal_plan_end_date)
.Where(x => x.id == input.mo_task_id).ExecuteCommandAsync();
}
}
// ToolMolds toolMolds = await db.Queryable<ToolMolds>().SingleAsync(x => x.id == prdMoTask.mold_id);
// if (toolMolds != null && toolMolds?.mold_cavity > 0 && processStandardsH != null &&
// processStandardsH?.moulding_cycle > 0)
// {
// decimal? addTime = ((((prdMoTask.scheduled_qty - input.reported_qty - (prdMoTask.scrap_qty ?? 0)) * processStandardsH?.moulding_cycle) - 1) / toolMolds.mold_cavity) + 1;
// if (prdMoTask.act_start_date != null && addTime != null && addTime > 0)
// {
// DateTime cal_plan_end_date = prdMoTask.act_start_date.Value.AddSeconds((double)addTime);
// _ = await db.Updateable<PrdMoTask>()
// .SetColumns(x => x.plan_end_date == cal_plan_end_date)
// .Where(x => x.id == input.mo_task_id).ExecuteCommandAsync();
// }
// }
}
if (prdMoTask.schedule_type == 2 && !string.IsNullOrEmpty(prdMoTask.mbom_process_id))
@@ -1752,7 +1751,7 @@ namespace Tnb.ProductionMgr
// return resultMsg == "true" ? (dynamic)true : throw Oops.Bah(resultMsg);
return true;
}
if (arr.Length > 0 && arr.Contains("CGJCJ"))//短管挤出件入库申请
{
string resultMsg = await _prdInstockService.InstockTubeThree(report);
@@ -1831,18 +1830,18 @@ namespace Tnb.ProductionMgr
#region 质检模块
//质检模块
TriggerPlanEntity entity = new()
{
materialid = prdMoTask.material_id,
processid = prdMoTask.process_id,
workid = prdMoTask.workstation_id
};
int? reported = prdMoTask.reported_work_qty == null ? 0 : prdMoTask.reported_work_qty;
int? scrap = prdMoTask.scrap_qty == null ? 0 : prdMoTask.scrap_qty;
entity.oldpronum = reported + scrap;
entity.newpronum = input.scrap_qty;
entity.triggerevent = EnumTriggerEvent.生产检定量;
await _qcCheckPlanService.CreateTask(entity);
// TriggerPlanEntity entity = new()
// {
// materialid = prdMoTask.material_id,
// processid = prdMoTask.process_id,
// workid = prdMoTask.workstation_id
// };
// int? reported = prdMoTask.reported_work_qty == null ? 0 : prdMoTask.reported_work_qty;
// int? scrap = prdMoTask.scrap_qty == null ? 0 : prdMoTask.scrap_qty;
// entity.oldpronum = reported + scrap;
// entity.newpronum = input.scrap_qty;
// entity.triggerevent = EnumTriggerEvent.生产检定量;
// await _qcCheckPlanService.CreateTask(entity);
#endregion
_ = await db.Updateable<PrdMoTask>().SetColumns(it => new PrdMoTask { scrap_qty = scrapQty.Value }).Where(it => it.id == input.mo_task_id).ExecuteCommandAsync();
}
@@ -1879,24 +1878,24 @@ namespace Tnb.ProductionMgr
if (prdMoTask.schedule_type == 1)
{
PerProcessStandardsH processStandardsH = await db.Queryable<PerProcessStandardsH>()
.Where(x => x.equip_id == prdMoTask.eqp_id && x.molds_id == prdMoTask.mold_id &&
x.output_material_id == prdMoTask.material_id && x.enabled == 1)
.OrderByDescending(x => x.create_time).FirstAsync();
ToolMolds toolMolds = await db.Queryable<ToolMolds>().SingleAsync(x => x.id == prdMoTask.mold_id);
if (toolMolds != null && toolMolds?.mold_cavity > 0 && processStandardsH != null &&
processStandardsH?.moulding_cycle > 0)
{
decimal? addTime = ((((prdMoTask.scheduled_qty - prdMoTask.reported_work_qty - input.scrap_qty) * processStandardsH?.moulding_cycle) - 1) / toolMolds.mold_cavity) + 1;
if (prdMoTask.act_start_date != null && addTime != null && addTime > 0)
{
DateTime cal_plan_end_date = prdMoTask.act_start_date.Value.AddSeconds((double)addTime);
_ = await db.Updateable<PrdMoTask>()
.SetColumns(x => x.plan_end_date == cal_plan_end_date)
.Where(x => x.id == input.mo_task_id).ExecuteCommandAsync();
}
}
// PerProcessStandardsH processStandardsH = await db.Queryable<PerProcessStandardsH>()
// .Where(x => x.equip_id == prdMoTask.eqp_id && x.molds_id == prdMoTask.mold_id &&
// x.output_material_id == prdMoTask.material_id && x.enabled == 1)
// .OrderByDescending(x => x.create_time).FirstAsync();
//
// ToolMolds toolMolds = await db.Queryable<ToolMolds>().SingleAsync(x => x.id == prdMoTask.mold_id);
// if (toolMolds != null && toolMolds?.mold_cavity > 0 && processStandardsH != null &&
// processStandardsH?.moulding_cycle > 0)
// {
// decimal? addTime = ((((prdMoTask.scheduled_qty - prdMoTask.reported_work_qty - input.scrap_qty) * processStandardsH?.moulding_cycle) - 1) / toolMolds.mold_cavity) + 1;
// if (prdMoTask.act_start_date != null && addTime != null && addTime > 0)
// {
// DateTime cal_plan_end_date = prdMoTask.act_start_date.Value.AddSeconds((double)addTime);
// _ = await db.Updateable<PrdMoTask>()
// .SetColumns(x => x.plan_end_date == cal_plan_end_date)
// .Where(x => x.id == input.mo_task_id).ExecuteCommandAsync();
// }
// }
}
else
{
@@ -2179,53 +2178,53 @@ namespace Tnb.ProductionMgr
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="AppFriendlyException"></exception>
[HttpPost]
public async Task<dynamic> GetEstimatedEndTime(CountEstimatedEndTimeInput input)
{
ISqlSugarClient db = _repository.AsSugarClient();
if (input.type == 1)
{
PerProcessStandardsH processStandardsH = await db.Queryable<PerProcessStandardsH>()
.Where(x => x.equip_id == input.equip_id && x.molds_id == input.molds_id &&
x.output_material_id == input.material_id && x.enabled == 1)
.OrderByDescending(x => x.create_time).FirstAsync();
ToolMolds toolMolds = await db.Queryable<ToolMolds>().SingleAsync(x => x.id == input.molds_id);
if (toolMolds == null)
{
throw Oops.Bah("没找到模具");
}
if (toolMolds?.mold_cavity <= 0)
{
throw Oops.Bah("模穴数错误");
}
if (processStandardsH == null)
{
throw Oops.Bah("工艺标准成型周期错误");
}
if (processStandardsH?.moulding_cycle <= 0)
{
throw Oops.Bah("工艺标准成型周期错误");
}
decimal? addTime = (((input.scheduled_qty * processStandardsH?.moulding_cycle) - 1) / toolMolds.mold_cavity) + 1;
return input.estimated_start_date.AddSeconds((double)addTime.Value).ToString("yyyy-MM-dd HH:mm:ss");
}
else
{
List<BasStandardTime> list = await db.Queryable<BasMbomProcess>()
.LeftJoin<BasStandardTime>((a, b) => a.process_id == b.process_id && b.enabled == 1)
.Where((a, b) => a.mbom_id == input.mbom_id).Select((a, b) => b).ToListAsync();
decimal max = list.Select(x => Convert.ToDecimal(x.standard_time)).Max(x => x);
decimal? addTime = input.scheduled_qty * max;
return input.estimated_start_date.AddSeconds((double)addTime.Value).ToString("yyyy-MM-dd HH:mm:ss");
}
}
// [HttpPost]
// public async Task<dynamic> GetEstimatedEndTime(CountEstimatedEndTimeInput input)
// {
// ISqlSugarClient db = _repository.AsSugarClient();
// if (input.type == 1)
// {
// PerProcessStandardsH processStandardsH = await db.Queryable<PerProcessStandardsH>()
// .Where(x => x.equip_id == input.equip_id && x.molds_id == input.molds_id &&
// x.output_material_id == input.material_id && x.enabled == 1)
// .OrderByDescending(x => x.create_time).FirstAsync();
//
// ToolMolds toolMolds = await db.Queryable<ToolMolds>().SingleAsync(x => x.id == input.molds_id);
// if (toolMolds == null)
// {
// throw Oops.Bah("没找到模具");
// }
//
// if (toolMolds?.mold_cavity <= 0)
// {
// throw Oops.Bah("模穴数错误");
// }
//
// if (processStandardsH == null)
// {
// throw Oops.Bah("工艺标准成型周期错误");
// }
//
// if (processStandardsH?.moulding_cycle <= 0)
// {
// throw Oops.Bah("工艺标准成型周期错误");
// }
//
// decimal? addTime = (((input.scheduled_qty * processStandardsH?.moulding_cycle) - 1) / toolMolds.mold_cavity) + 1;
// return input.estimated_start_date.AddSeconds((double)addTime.Value).ToString("yyyy-MM-dd HH:mm:ss");
// }
// else
// {
// List<BasStandardTime> list = await db.Queryable<BasMbomProcess>()
// .LeftJoin<BasStandardTime>((a, b) => a.process_id == b.process_id && b.enabled == 1)
// .Where((a, b) => a.mbom_id == input.mbom_id).Select((a, b) => b).ToListAsync();
//
// decimal max = list.Select(x => Convert.ToDecimal(x.standard_time)).Max(x => x);
// decimal? addTime = input.scheduled_qty * max;
// return input.estimated_start_date.AddSeconds((double)addTime.Value).ToString("yyyy-MM-dd HH:mm:ss");
// }
//
// }
/// <summary>
@@ -2766,7 +2765,7 @@ namespace Tnb.ProductionMgr
return prdMoTask;
}
/// <summary>
/// 根据工位获取进行中待开工暂停的任务单信息
/// </summary>
@@ -2781,8 +2780,8 @@ namespace Tnb.ProductionMgr
throw Oops.Bah("工位错误");
}
List<PrdMoTask> list = await _db.Queryable<PrdMoTask>().Where(x => x.workstation_id == station_id && x.parent_id != null && (x.mo_task_status == DictConst.InProgressEnCode || x.mo_task_status == DictConst.ToBeStartedEnCode || x.mo_task_status == DictConst.MoStatusPauseCode )).ToListAsync();
if (list != null && list.Count>0)
List<PrdMoTask> list = await _db.Queryable<PrdMoTask>().Where(x => x.workstation_id == station_id && x.parent_id != null && (x.mo_task_status == DictConst.InProgressEnCode || x.mo_task_status == DictConst.ToBeStartedEnCode || x.mo_task_status == DictConst.MoStatusPauseCode)).ToListAsync();
if (list != null && list.Count > 0)
{
foreach (var prdMoTask in list)
{
@@ -2793,7 +2792,7 @@ namespace Tnb.ProductionMgr
return list;
}
/// <summary>
/// 外包装根据工位id获取喷码数据
/// </summary>
@@ -2809,7 +2808,7 @@ namespace Tnb.ProductionMgr
if (prdMoTask == null) throw Oops.Bah("没找到对应任务单");
if (await _db.Queryable<PrdOutPackMarkLabel>().Where(x =>
x.mo_task_code == prdMoTask.mo_task_code && x.status == "0" && x.is_label == 0 && x.is_mark==null).AnyAsync())
x.mo_task_code == prdMoTask.mo_task_code && x.status == "0" && x.is_label == 0 && x.is_mark == null).AnyAsync())
{
await _db.Updateable<PrdOutPackMarkLabel>()
.SetColumns(x => x.is_mark == 0)
@@ -2832,10 +2831,10 @@ namespace Tnb.ProductionMgr
}
PrdMoTask parent = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdMoTask.parent_id);
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x=>x.id==parent.material_id);
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x => x.id == parent.material_id);
string code = $"(01){basMaterial.di ?? ""}\\n(11){DateTime.Now.ToString("yyMMdd")}\\n(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}\\n(10){parent.batch ?? ""}";
string code = $"(01){basMaterial.di ?? ""}\\n(11){DateTime.Now.ToString("yyMMdd")}\\n(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}\\n(10){parent.batch??""}";
return code;
}
@@ -2852,9 +2851,9 @@ namespace Tnb.ProductionMgr
{ "station_id", input.station_id }
});
if (prdMoTask == null) throw Oops.Bah("没找到对应任务单");
if (await _db.Queryable<PrdOutPackMarkLabel>().Where(x =>
x.mo_task_code == prdMoTask.mo_task_code && x.status == "0" && x.is_label == null && x.is_mark==0).AnyAsync())
x.mo_task_code == prdMoTask.mo_task_code && x.status == "0" && x.is_label == null && x.is_mark == 0).AnyAsync())
{
await _db.Updateable<PrdOutPackMarkLabel>()
.SetColumns(x => x.is_label == 0)
@@ -2875,12 +2874,12 @@ namespace Tnb.ProductionMgr
await _db.Insertable<PrdOutPackMarkLabel>(prdOutPackMarkLabel).ExecuteCommandAsync();
}
PrdMoTask parent = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdMoTask.parent_id);
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x=>x.id==parent.material_id);
string code = $"(01){basMaterial.di ?? ""}\\n(11){DateTime.Now.ToString("yyMMdd")}\\n(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}\\n(10){parent.batch??""}";
PrdMoTask parent = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdMoTask.parent_id);
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x => x.id == parent.material_id);
string code = $"(01){basMaterial.di ?? ""}\\n(11){DateTime.Now.ToString("yyMMdd")}\\n(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}\\n(10){parent.batch ?? ""}";
return code;
}
}