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

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

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