调整生产管理代吗
This commit is contained in:
DEVICE8\12494
@@ -17,6 +17,7 @@ using SqlSugar;
|
||||
using Tnb.ProductionMgr.Entitys.Dto.PrdManage;
|
||||
using Tnb.ProductionMgr.Entitys.Dto.WorkOrder;
|
||||
using Tnb.ProductionMgr.Entitys.Entity;
|
||||
using Tnb.ProductionMgr.Entitys.新文件夹;
|
||||
using Tnb.ProductionPlanMgr.Entitys.Dto.WorkOrder;
|
||||
using Tnb.ProductionPlanMgr.Interfaces;
|
||||
|
||||
@@ -132,11 +133,12 @@ namespace Tnb.ProductionPlanMgr
|
||||
entity.status = "ToBeScheduled"; //任务单状态默认，待排产
|
||||
entity.create_id = _userManager.UserId;
|
||||
entity.create_time = DateTime.Now;
|
||||
|
||||
entity.prd_task_id = input.id;
|
||||
var db = _repository.AsSugarClient();
|
||||
try
|
||||
{
|
||||
await db.Ado.BeginTranAsync();
|
||||
|
||||
|
||||
row = await db.Storageable(entity).ExecuteCommandAsync();
|
||||
var taskLogEntity = input.Adapt<PrdTaskLog>();
|
||||
@@ -156,17 +158,17 @@ namespace Tnb.ProductionPlanMgr
|
||||
if (row > 0)
|
||||
{
|
||||
var obj = (await db.Queryable<PrdMo>().FirstAsync(it => it.id == input.mo_id));
|
||||
obj.input_qty += entity.scheduled_num;
|
||||
obj.input_qty += entity.scheduled_qty;
|
||||
var moStatus = "";
|
||||
//判断，已排产数量>=计划数量时将状态改为 已排产
|
||||
if (obj.input_qty >= obj.plan_qty)
|
||||
{
|
||||
moStatus = "25019252113685";
|
||||
moStatus = MoStatus.AlreadyId;
|
||||
}
|
||||
else
|
||||
{
|
||||
//修改工单状态为待排产，同事修改已排产数量
|
||||
moStatus = "25019244276501";
|
||||
moStatus = MoStatus.WaitProductId;
|
||||
}
|
||||
row = await db.Updateable<PrdMo>().SetColumns(it => new PrdMo
|
||||
{
|
||||
@@ -197,7 +199,7 @@ namespace Tnb.ProductionPlanMgr
|
||||
{
|
||||
throw new ArgumentNullException(nameof(input));
|
||||
}
|
||||
var db = _repository.AsSugarClient(); ;
|
||||
var db = _repository.AsSugarClient();
|
||||
var row = await db.Updateable<PrdTask>()
|
||||
.SetColumns(it => new PrdTask { status = "ToBeStarted" })
|
||||
.Where(it => input.TaskIds.Contains(it.id))
|
||||
@@ -205,9 +207,6 @@ namespace Tnb.ProductionPlanMgr
|
||||
return (row > 0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 根据产品ID获取模具列表
|
||||
/// </summary>
|
||||
@@ -221,7 +220,7 @@ namespace Tnb.ProductionPlanMgr
|
||||
/// <br/> mold_name:模具名称
|
||||
/// <br/> item_name:产品名称
|
||||
/// <br/> item_code:产品编号
|
||||
/// <br/> cavity_num:模穴数
|
||||
/// <br/> cavity_qty:模穴数
|
||||
/// <br/> }
|
||||
/// <br/>]
|
||||
/// </remarks>
|
||||
@@ -238,12 +237,63 @@ namespace Tnb.ProductionPlanMgr
|
||||
mold_name = a.mold_name,
|
||||
item_name = b.item_name,
|
||||
item_code = b.item_code,
|
||||
cavity_num = a.cavity_num,
|
||||
cavity_qty = a.cavity_qty,
|
||||
})
|
||||
.ToListAsync();
|
||||
return list;
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 工单调整-生产任务重新排序
|
||||
/// </summary>
|
||||
/// <param name="eqpId">设备ID</param>
|
||||
/// <returns>排序后生产任务列表</returns>
|
||||
/// <remarks>
|
||||
/// returns:
|
||||
/// <br/>[
|
||||
/// <br/> {
|
||||
/// <br/> no:生产序号
|
||||
/// <br/> mo_id：工单编号
|
||||
/// <br/> group_flag：同组标识
|
||||
/// <br/> plan_qty:计划生产数量
|
||||
/// <br/> comple_qty:完成数量
|
||||
/// <br/> item_name:产品名称
|
||||
/// <br/> mold_code:模具编号
|
||||
/// <br/> }
|
||||
/// <br/>]
|
||||
/// </remarks>
|
||||
[HttpGet("sort/{eqpId}")]
|
||||
public async Task<dynamic> PrdTaskSort(string eqpId)
|
||||
{
|
||||
var taskStatusDic = await _dictionaryDataService.GetDicByTypeId(DictionaryConstants.PrdTaskStatusTypeId);
|
||||
var list = await _repository.AsSugarClient().Queryable<PrdTask>()
|
||||
.Where(it => it.eqp_id == eqpId)
|
||||
.OrderBy(o => o.estimated_start_date)
|
||||
.ToListAsync();
|
||||
var data = list.Select((x, idx) => new PrdTaskSortOutput
|
||||
{
|
||||
no = idx + 1,
|
||||
mo_id = x.mo_id,
|
||||
status = taskStatusDic.ContainsKey(x.status) ? taskStatusDic[x.status].ToString() : "",
|
||||
group_flag = x.group_flag,
|
||||
plan_qty = x.plan_qty,
|
||||
comple_qty = x.comple_qty,
|
||||
item_name = x.item_name,
|
||||
mold_code = x.mold_code,
|
||||
}).ToList();
|
||||
return data;
|
||||
}
|
||||
/// <summary>
|
||||
/// 工单调整-转移机台
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost("tran-platform")]
|
||||
public async Task<dynamic?> TransferPlatform()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 查看工单操作记录
|
||||
/// </summary>
|
||||
@@ -252,17 +302,9 @@ namespace Tnb.ProductionPlanMgr
|
||||
[HttpGet("record/{taskId}")]
|
||||
public async Task<dynamic> GetMoOperRecord(string taskId)
|
||||
{
|
||||
//var list = await _repository.AsSugarClient().Queryable<PrdTask>().LeftJoin<PrdTaskLog>((a, b) => a.prd_task_id == b.id)
|
||||
// .WhereIF(!string.IsNullOrWhiteSpace(input.mo_no),b=>b.id == input.task_no)
|
||||
// .WhereIF(!string.IsNullOrWhiteSpace(input.task_no), b => b.prd_task_id == input.task_id)
|
||||
// .WhereIF(!string.IsNullOrWhiteSpace(input.item_code), a => a.item_code == input.item_code)
|
||||
// .WhereIF(!string.IsNullOrWhiteSpace(input.eqp_code), a => a.eqp_type_code == input.eqp_code)
|
||||
// .WhereIF(input.plan_start_date.HasValue, a => a.plan_start_date >= input.plan_start_date!.Value)
|
||||
// .WhereIF(input.plan_end_date.HasValue, a => a.plan_end_date <= input.plan_end_date!.Value)
|
||||
// .ToListAsync();
|
||||
var list = await _repository.AsSugarClient().Queryable<PrdTaskLog>().Where(it => it.id == taskId).ToListAsync();
|
||||
var data = list.Adapt<List<PrdTaskOperOutput>>();
|
||||
var dic = await _dictionaryDataService.GetDicByTypeId("25572555259157");
|
||||
var dic = await _dictionaryDataService.GetDicByTypeId(DictionaryConstants.PrdTaskStatusTypeId);
|
||||
_repository.AsSugarClient().ThenMapper(data, x => x.statusName = dic.ContainsKey(x.status) ? dic[x.status].ToString() : "");
|
||||
return data;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user