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-07-11 15:36:23 +08:00
parent 95599c8fbf
commit 252ae13496
2 changed files with 296 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

557
BasicData/Tnb.BasicData/BasMbomService.cs
View File

@@ -237,280 +237,281 @@ namespace Tnb.BasicData
}) })
.ToListAsync(); .ToListAsync();
} }
/// <summary>
/// 保存生产bom
/// </summary>
/// <param name="mbomSaveDataInput"></param>
/// <returns></returns>
[HttpPost]
public async Task<string> SaveData(MbomSaveDataInput mbomSaveDataInput)
{
ErrorCode errorCode = ErrorCode.COM1008;
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
//新增
if (string.IsNullOrEmpty(mbomSaveDataInput.id))
{
string mbomId = SnowflakeIdHelper.NextId();
string orgId = _userManager.GetUserInfo().Result.organizeId;
BasMbom mbom = new BasMbom()
{
id = mbomId,
org_id = orgId,
material_id = mbomSaveDataInput.material_id,
num = mbomSaveDataInput.num,
unit_id = mbomSaveDataInput.unit_id,
version = mbomSaveDataInput.version,
start_time = mbomSaveDataInput.start_time,
end_time = mbomSaveDataInput.end_time,
ebom_id = mbomSaveDataInput.ebom_id,
route_id = mbomSaveDataInput.route_id,
is_first = mbomSaveDataInput.is_first,
remark = mbomSaveDataInput.remark,
create_id = _userManager.UserId,
create_time = DateTime.Now,
}; // /// <summary>
// /// 保存生产bom
if (await _repository.IsAnyAsync(x => // /// </summary>
x.material_id == mbomSaveDataInput.material_id && x.version == mbomSaveDataInput.version)) // /// <param name="mbomSaveDataInput"></param>
{ // /// <returns></returns>
errorCode = ErrorCode.COM1004; // [HttpPost]
throw Oops.Oh(ErrorCode.COM1004); // public async Task<string> SaveData(MbomSaveDataInput mbomSaveDataInput)
} // {
await _repository.InsertAsync(mbom); // ErrorCode errorCode = ErrorCode.COM1008;
List<BasMbomProcess> processes = new List<BasMbomProcess>(); // DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
List<BasMbomInput> inputs = new List<BasMbomInput>(); // {
List<BasMbomOutput> outputs = new List<BasMbomOutput>(); // //新增
// if (string.IsNullOrEmpty(mbomSaveDataInput.id))
if (mbomSaveDataInput != null && mbomSaveDataInput.processes != null) // {
{ // string mbomId = SnowflakeIdHelper.NextId();
int index = 0; // string orgId = _userManager.GetUserInfo().Result.organizeId;
foreach (var process in mbomSaveDataInput.processes) // BasMbom mbom = new BasMbom()
{ // {
string mbomProcessId = SnowflakeIdHelper.NextId(); // id = mbomId,
processes.Add(new BasMbomProcess() // org_id = orgId,
{ // material_id = mbomSaveDataInput.material_id,
id = mbomProcessId, // num = mbomSaveDataInput.num,
org_id = orgId, // unit_id = mbomSaveDataInput.unit_id,
mbom_id = mbomId, // version = mbomSaveDataInput.version,
process_id = process?.process_id ?? "", // start_time = mbomSaveDataInput.start_time,
preparation_time = process?.preparation_time ?? 0, // end_time = mbomSaveDataInput.end_time,
station = process?.station ?? "", // ebom_id = mbomSaveDataInput.ebom_id,
byproduct_status = process?.byproduct_status ?? 0, // route_id = mbomSaveDataInput.route_id,
production_method = process?.production_method, // is_first = mbomSaveDataInput.is_first,
route_detail_id = process?.route_detail_id ?? "", // remark = mbomSaveDataInput.remark,
ordinal = ++index, // create_id = _userManager.UserId,
is_last = index==mbomSaveDataInput.processes.Count ? 1 : 0, // create_time = DateTime.Now,
//
}); // };
//
if (process!.inputs != null) // if (await _repository.IsAnyAsync(x =>
{ // x.material_id == mbomSaveDataInput.material_id && x.version == mbomSaveDataInput.version))
foreach (var input in process.inputs) // {
{ // errorCode = ErrorCode.COM1004;
string inputId = SnowflakeIdHelper.NextId(); // throw Oops.Oh(ErrorCode.COM1004);
inputs.Add(new BasMbomInput() // }
{ // await _repository.InsertAsync(mbom);
id = inputId, // List<BasMbomProcess> processes = new List<BasMbomProcess>();
mbom_id = mbomId, // List<BasMbomInput> inputs = new List<BasMbomInput>();
mbom_process_id = mbomProcessId, // List<BasMbomOutput> outputs = new List<BasMbomOutput>();
process_id = process?.process_id ?? "", //
material_id = input.material_id, // if (mbomSaveDataInput != null && mbomSaveDataInput.processes != null)
num = input.num, // {
org_id = orgId, // int index = 0;
}); // foreach (var process in mbomSaveDataInput.processes)
} // {
} // string mbomProcessId = SnowflakeIdHelper.NextId();
// processes.Add(new BasMbomProcess()
if (process.outputs != null) // {
{ // id = mbomProcessId,
foreach (var output in process.outputs) // org_id = orgId,
{ // mbom_id = mbomId,
string outputId = SnowflakeIdHelper.NextId(); // process_id = process?.process_id ?? "",
outputs.Add(new BasMbomOutput() // preparation_time = process?.preparation_time ?? 0,
{ // station = process?.station ?? "",
id = outputId, // byproduct_status = process?.byproduct_status ?? 0,
mbom_id = mbomId, // production_method = process?.production_method,
mbom_process_id = mbomProcessId, // route_detail_id = process?.route_detail_id ?? "",
process_id = process?.process_id ?? "", // ordinal = ++index,
material_id = output.material_id, // is_last = index==mbomSaveDataInput.processes.Count ? 1 : 0,
num = output.num, //
org_id = orgId, // });
}); //
} // if (process!.inputs != null)
} // {
} // foreach (var input in process.inputs)
} // {
// string inputId = SnowflakeIdHelper.NextId();
if (processes.Count > 0) // inputs.Add(new BasMbomInput()
{ // {
await _repository.AsSugarClient().Insertable<BasMbomProcess>(processes).ExecuteCommandAsync(); // id = inputId,
} // mbom_id = mbomId,
// mbom_process_id = mbomProcessId,
if (inputs.Count > 0) // process_id = process?.process_id ?? "",
{ // material_id = input.material_id,
await _repository.AsSugarClient().Insertable<BasMbomInput>(inputs).ExecuteCommandAsync(); // num = input.num,
} // org_id = orgId,
// });
if (outputs.Count > 0) // }
{ // }
await _repository.AsSugarClient().Insertable<BasMbomOutput>(outputs).ExecuteCommandAsync(); //
} // if (process.outputs != null)
} // {
else//修改 // foreach (var output in process.outputs)
{ // {
if (await _repository.IsAnyAsync(x => // string outputId = SnowflakeIdHelper.NextId();
x.material_id == mbomSaveDataInput.material_id && x.version == mbomSaveDataInput.version && x.id != mbomSaveDataInput.id)) // outputs.Add(new BasMbomOutput()
{ // {
errorCode = ErrorCode.COM1004; // id = outputId,
throw Oops.Oh(ErrorCode.COM1004); // mbom_id = mbomId,
} // mbom_process_id = mbomProcessId,
// process_id = process?.process_id ?? "",
string orgId = _userManager.GetUserInfo().Result.organizeId; // material_id = output.material_id,
if (mbomSaveDataInput != null) // num = output.num,
{ // org_id = orgId,
await _repository.UpdateAsync(x => new BasMbom() // });
{ // }
// org_id = orgId, // }
material_id = mbomSaveDataInput.material_id, // }
num = mbomSaveDataInput.num, // }
unit_id = mbomSaveDataInput.unit_id, //
version = mbomSaveDataInput.version, // if (processes.Count > 0)
start_time = mbomSaveDataInput.start_time, // {
end_time = mbomSaveDataInput.end_time, // await _repository.AsSugarClient().Insertable<BasMbomProcess>(processes).ExecuteCommandAsync();
ebom_id = mbomSaveDataInput.ebom_id, // }
route_id = mbomSaveDataInput.route_id, //
is_first = mbomSaveDataInput.is_first, // if (inputs.Count > 0)
remark = mbomSaveDataInput.remark, // {
modify_id = _userManager.UserId, // await _repository.AsSugarClient().Insertable<BasMbomInput>(inputs).ExecuteCommandAsync();
modify_time = DateTime.Now, // }
//
}, x => x.id == mbomSaveDataInput.id); // if (outputs.Count > 0)
} // {
// List<BasMbomProcess> processes = new List<BasMbomProcess>(); // await _repository.AsSugarClient().Insertable<BasMbomOutput>(outputs).ExecuteCommandAsync();
List<BasMbomInput> inputs = new List<BasMbomInput>(); // }
List<BasMbomOutput> outputs = new List<BasMbomOutput>(); // }
// else//修改
if (mbomSaveDataInput != null && mbomSaveDataInput.processes != null) // {
{ // if (await _repository.IsAnyAsync(x =>
foreach (var process in mbomSaveDataInput.processes) // x.material_id == mbomSaveDataInput.material_id && x.version == mbomSaveDataInput.version && x.id != mbomSaveDataInput.id))
{ // {
string mbomProcessId = process.id; // errorCode = ErrorCode.COM1004;
// string mbomProcessId = SnowflakeIdHelper.NextId(); // throw Oops.Oh(ErrorCode.COM1004);
// processes.Add(new BasMbomProcess() // }
// { //
// id = mbomProcessId, // string orgId = _userManager.GetUserInfo().Result.organizeId;
// org_id = orgId ?? "", // if (mbomSaveDataInput != null)
// mbom_id = mbomSaveDataInput?.id ?? "", // {
// process_id = process?.process_id ?? "", // await _repository.UpdateAsync(x => new BasMbom()
// preparation_time = process?.preparation_time ?? 0, // {
// station = process.station, // // org_id = orgId,
// byproduct_status = process.byproduct_status, // material_id = mbomSaveDataInput.material_id,
// production_method = process.production_method, // num = mbomSaveDataInput.num,
// route_detail_id = process.route_detail_id, // unit_id = mbomSaveDataInput.unit_id,
// // version = mbomSaveDataInput.version,
// }); // start_time = mbomSaveDataInput.start_time,
// end_time = mbomSaveDataInput.end_time,
decimal preparation_time = process?.preparation_time ?? 0; // ebom_id = mbomSaveDataInput.ebom_id,
await _repository.AsSugarClient().Updateable<BasMbomProcess>() // route_id = mbomSaveDataInput.route_id,
.SetColumns(x => x.preparation_time == preparation_time) // is_first = mbomSaveDataInput.is_first,
.SetColumns(x => x.station == process!.station) // remark = mbomSaveDataInput.remark,
.SetColumns(x => x.byproduct_status == process!.byproduct_status) // modify_id = _userManager.UserId,
.SetColumns(x => x.production_method == process!.production_method) // modify_time = DateTime.Now,
.Where(x => x.id == process!.id).ExecuteCommandAsync(); //
// }, x => x.id == mbomSaveDataInput.id);
if (process!.inputs != null) // }
{ // // List<BasMbomProcess> processes = new List<BasMbomProcess>();
foreach (var input in process.inputs) // List<BasMbomInput> inputs = new List<BasMbomInput>();
{ // List<BasMbomOutput> outputs = new List<BasMbomOutput>();
string inputId = SnowflakeIdHelper.NextId(); //
inputs.Add(new BasMbomInput() // if (mbomSaveDataInput != null && mbomSaveDataInput.processes != null)
{ // {
id = inputId, // foreach (var process in mbomSaveDataInput.processes)
mbom_id = mbomSaveDataInput?.id ?? "", // {
mbom_process_id = mbomProcessId, // string mbomProcessId = process.id;
process_id = process?.process_id ?? "", // // string mbomProcessId = SnowflakeIdHelper.NextId();
material_id = input.material_id, // // processes.Add(new BasMbomProcess()
num = input.num, // // {
org_id = orgId, // // id = mbomProcessId,
}); // // org_id = orgId ?? "",
} // // mbom_id = mbomSaveDataInput?.id ?? "",
} // // process_id = process?.process_id ?? "",
// // preparation_time = process?.preparation_time ?? 0,
if (process.outputs != null) // // station = process.station,
{ // // byproduct_status = process.byproduct_status,
foreach (var output in process.outputs) // // production_method = process.production_method,
{ // // route_detail_id = process.route_detail_id,
string outputId = SnowflakeIdHelper.NextId(); // //
outputs.Add(new BasMbomOutput() // // });
{ //
id = outputId, // decimal preparation_time = process?.preparation_time ?? 0;
mbom_id = mbomSaveDataInput?.id ?? "", // await _repository.AsSugarClient().Updateable<BasMbomProcess>()
mbom_process_id = mbomProcessId, // .SetColumns(x => x.preparation_time == preparation_time)
process_id = process?.process_id ?? "", // .SetColumns(x => x.station == process!.station)
material_id = output.material_id, // .SetColumns(x => x.byproduct_status == process!.byproduct_status)
num = output.num, // .SetColumns(x => x.production_method == process!.production_method)
org_id = orgId, // .Where(x => x.id == process!.id).ExecuteCommandAsync();
}); //
} // if (process!.inputs != null)
} // {
// foreach (var input in process.inputs)
} // {
} // string inputId = SnowflakeIdHelper.NextId();
// inputs.Add(new BasMbomInput()
if (mbomSaveDataInput != null && !string.IsNullOrEmpty(mbomSaveDataInput.id)) // {
{ // id = inputId,
// await _repository.AsSugarClient().Deleteable<BasMbomProcess>().Where(x => x.mbom_id == mbomSaveDataInput.id).ExecuteCommandAsync(); // mbom_id = mbomSaveDataInput?.id ?? "",
await _repository.AsSugarClient().Deleteable<BasMbomInput>().Where(x => x.mbom_id == mbomSaveDataInput.id).ExecuteCommandAsync(); // mbom_process_id = mbomProcessId,
await _repository.AsSugarClient().Deleteable<BasMbomOutput>().Where(x => x.mbom_id == mbomSaveDataInput.id).ExecuteCommandAsync(); // process_id = process?.process_id ?? "",
} // material_id = input.material_id,
// if (processes.Count > 0) // num = input.num,
// { // org_id = orgId,
// await _repository.AsSugarClient().Insertable<BasMbomProcess>(processes).ExecuteCommandAsync(); // });
// } // }
// }
if (inputs.Count > 0) //
{ // if (process.outputs != null)
await _repository.AsSugarClient().Insertable<BasMbomInput>(inputs).ExecuteCommandAsync(); // {
} // foreach (var output in process.outputs)
// {
if (outputs.Count > 0) // string outputId = SnowflakeIdHelper.NextId();
{ // outputs.Add(new BasMbomOutput()
await _repository.AsSugarClient().Insertable<BasMbomOutput>(outputs).ExecuteCommandAsync(); // {
} // id = outputId,
} // mbom_id = mbomSaveDataInput?.id ?? "",
// mbom_process_id = mbomProcessId,
}); // process_id = process?.process_id ?? "",
// material_id = output.material_id,
if (!result.IsSuccess) // num = output.num,
{ // org_id = orgId,
if (!string.IsNullOrEmpty(mbomSaveDataInput.id)) // });
{ // }
if (errorCode != ErrorCode.COM1004) // }
{ //
throw Oops.Oh(ErrorCode.COM1001); // }
} // }
else //
{ // if (mbomSaveDataInput != null && !string.IsNullOrEmpty(mbomSaveDataInput.id))
throw Oops.Oh(errorCode); // {
} // // await _repository.AsSugarClient().Deleteable<BasMbomProcess>().Where(x => x.mbom_id == mbomSaveDataInput.id).ExecuteCommandAsync();
} // await _repository.AsSugarClient().Deleteable<BasMbomInput>().Where(x => x.mbom_id == mbomSaveDataInput.id).ExecuteCommandAsync();
else // await _repository.AsSugarClient().Deleteable<BasMbomOutput>().Where(x => x.mbom_id == mbomSaveDataInput.id).ExecuteCommandAsync();
{ // }
if (errorCode != ErrorCode.COM1004) // // if (processes.Count > 0)
{ // // {
throw Oops.Oh(ErrorCode.COM1000); // // await _repository.AsSugarClient().Insertable<BasMbomProcess>(processes).ExecuteCommandAsync();
} // // }
else //
{ // if (inputs.Count > 0)
throw Oops.Oh(errorCode); // {
} // await _repository.AsSugarClient().Insertable<BasMbomInput>(inputs).ExecuteCommandAsync();
} // }
//
} // if (outputs.Count > 0)
return result.IsSuccess ? "保存成功" : result.ErrorMessage; // {
} // await _repository.AsSugarClient().Insertable<BasMbomOutput>(outputs).ExecuteCommandAsync();
// }
// }
//
// });
//
// if (!result.IsSuccess)
// {
// if (!string.IsNullOrEmpty(mbomSaveDataInput.id))
// {
// if (errorCode != ErrorCode.COM1004)
// {
// throw Oops.Oh(ErrorCode.COM1001);
// }
// else
// {
// throw Oops.Oh(errorCode);
// }
// }
// else
// {
// if (errorCode != ErrorCode.COM1004)
// {
// throw Oops.Oh(ErrorCode.COM1000);
// }
// else
// {
// throw Oops.Oh(errorCode);
// }
// }
//
// }
// return result.IsSuccess ? "保存成功" : result.ErrorMessage;
// }
/// <summary> /// <summary>
/// 保存生产bom /// 保存生产bom
@@ -573,13 +574,13 @@ namespace Tnb.BasicData
preparation_time = process?.preparation_time ?? 0, preparation_time = process?.preparation_time ?? 0,
station = process?.station ?? "", station = process?.station ?? "",
byproduct_status = process!.byproduct_status, byproduct_status = process!.byproduct_status,
production_method = process!.production_method, production_method = process.production_method,
route_detail_id = process!.route_detail_id, route_detail_id = process.route_detail_id,
ordinal = ++index, ordinal = ++index,
is_last = index==mbomSaveDataInput.processes.Count ? 1 : 0, is_last = string.IsNullOrEmpty(process.next_process_no) ? 1 : 0,
no = process!.no, no = process!.no,
last_process_no = process!.last_process_no, last_process_no = process.last_process_no,
next_process_no = process!.next_process_no, next_process_no = process.next_process_no,
}); });

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

@@ -1278,20 +1278,24 @@ namespace Tnb.ProductionMgr
.SetColumns(x => x.reported_work_qty == x.reported_work_qty + input.reported_qty) .SetColumns(x => x.reported_work_qty == x.reported_work_qty + input.reported_qty)
.Where(x => x.id == input.mo_task_id).ExecuteCommandAsync(); .Where(x => x.id == input.mo_task_id).ExecuteCommandAsync();
} }
var mbomProcess = await db.Queryable<BasMbomProcess>().SingleAsync(x => x.id == prdMoTask.mbom_process_id);
if (mbomProcess.is_last==1 && prdMoTask != null && !string.IsNullOrEmpty(prdMoTask.parent_id)) if (prdMoTask.schedule_type == 2 && !string.IsNullOrEmpty(prdMoTask.mbom_process_id))
{ {
var parentMoTask = await db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdMoTask.parent_id); var mbomProcess = await db.Queryable<BasMbomProcess>().SingleAsync(x => x.id == prdMoTask.mbom_process_id);
if (parentMoTask?.last_process_complete_qty == null) if (mbomProcess.is_last==1 && prdMoTask != null && !string.IsNullOrEmpty(prdMoTask.parent_id))
{ {
await db.Updateable<PrdMoTask>() var parentMoTask = await db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdMoTask.parent_id);
.SetColumns(x => x.last_process_complete_qty == input.reported_qty) if (parentMoTask?.last_process_complete_qty == null)
.Where(x => x.id == prdMoTask.parent_id).ExecuteCommandAsync(); {
}else if (parentMoTask?.last_process_complete_qty != null) await db.Updateable<PrdMoTask>()
{ .SetColumns(x => x.last_process_complete_qty == input.reported_qty)
await db.Updateable<PrdMoTask>() .Where(x => x.id == prdMoTask.parent_id).ExecuteCommandAsync();
.SetColumns(x => x.last_process_complete_qty == x.last_process_complete_qty + input.reported_qty) }else if (parentMoTask?.last_process_complete_qty != null)
.Where(x => x.id == prdMoTask.parent_id).ExecuteCommandAsync(); {
await db.Updateable<PrdMoTask>()
.SetColumns(x => x.last_process_complete_qty == x.last_process_complete_qty + input.reported_qty)
.Where(x => x.id == prdMoTask.parent_id).ExecuteCommandAsync();
}
} }
} }