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

1

Browse Source
This commit is contained in:
DEVICE8\12494
2023-05-23 19:25:24 +08:00
parent f388692848 e202579a81
commit 45b7ac6e20
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,6 +229,13 @@ namespace Tnb.BasicData
create_time = DateTime.Now, create_time = DateTime.Now,
}; };
if (await _repository.IsAnyAsync(x =>
x.material_id == mbomSaveDataInput.material_id && x.version == mbomSaveDataInput.version))
{
errorCode = ErrorCode.COM1004;
throw Oops.Oh(ErrorCode.COM1004);
}
await _repository.InsertAsync(mbom); await _repository.InsertAsync(mbom);
List<BasMbomProcess> processes = new List<BasMbomProcess>(); List<BasMbomProcess> processes = new List<BasMbomProcess>();
List<BasMbomInput> inputs = new List<BasMbomInput>(); List<BasMbomInput> inputs = new List<BasMbomInput>();
@@ -304,8 +311,15 @@ namespace Tnb.BasicData
} }
else//修改 else//修改
{ {
string orgId = _userManager.GetUserInfo().Result.organizeId; if (await _repository.IsAnyAsync(x =>
await _repository.UpdateAsync(x => new BasMbom() x.material_id == mbomSaveDataInput.material_id && x.version == mbomSaveDataInput.version && x.id!=mbomSaveDataInput.id))
{
errorCode = ErrorCode.COM1004;
throw Oops.Oh(ErrorCode.COM1004);
}
string orgId = _userManager.GetUserInfo().Result.organizeId;
await _repository.UpdateAsync(x=>new BasMbom()
{ {
// org_id = orgId, // org_id = orgId,
material_id = mbomSaveDataInput.material_id, material_id = mbomSaveDataInput.material_id,
@@ -405,13 +419,27 @@ namespace Tnb.BasicData
{ {
if (!string.IsNullOrEmpty(mbomSaveDataInput.id)) if (!string.IsNullOrEmpty(mbomSaveDataInput.id))
{ {
throw Oops.Oh(ErrorCode.COM1001); if (errorCode != ErrorCode.COM1004)
{
throw Oops.Oh(ErrorCode.COM1001);
}
else
{
throw Oops.Oh(errorCode);
}
} }
else else
{ {
throw Oops.Oh(ErrorCode.COM1000); if (errorCode != ErrorCode.COM1004)
{
throw Oops.Oh(ErrorCode.COM1000);
}
else
{
throw Oops.Oh(errorCode);
}
} }
} }
return result.IsSuccess ? "保存成功" : result.ErrorMessage; return result.IsSuccess ? "保存成功" : result.ErrorMessage;
} }

1
BasicData/Tnb.BasicData/BasRouteService.cs
View File

@@ -62,6 +62,7 @@ namespace Tnb.BasicData
basRouteH.id = newId; basRouteH.id = newId;
basRouteH.code += "_复制的请修改"; basRouteH.code += "_复制的请修改";
basRouteH.name += "_复制的请修改"; basRouteH.name += "_复制的请修改";
basRouteH.status = "0";
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () => DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{ {