😭修改ecn生成ECN差异清单查询逻辑

This commit is contained in:
bairubing 2024-12-11 09:38:30 +08:00
parent 7f0a44400f
commit 869830d6ee

View File

@ -390,7 +390,7 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient
for (var i = 0; i < bomChange.Count; i++)
{
var versionChange = "";
if (bomListItem.childVersion== bomChange[i].childVersion)
if (bomListItem.childVersion != bomChange[i].childVersion)
{
var contrastResult = await _dataValidationService.ComparativeVersion(bomChange[i].ChildObjID, bomListChildGuid, (int)bomListItem.childVersion,(int)bomChange[i].childVersion);
versionChange = contrastResult;
@ -428,8 +428,8 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient
fld006567 = "子项",
fld006581 = recordData._System_objNBS,
fld006565 = "修改",
fld006564 = bomListQuantity.ToString(),
fld006566 = bomChange[i].QtyManual.ToString()
fld006564 = bomChange[i].QtyManual.ToString(),
fld006566 = bomListQuantity.ToString()
};
var addChildBomBom = await _configurationDataRep.AsInsertable(childBom).InsertColumns(x => new{ x.ParentGuid, x.ChildGuid, x.ChildObjID, x.ConfigId, x.childVersion, x.ParentVersion, x.isDeleted, x.Quantity, x.Description, x.OrderIndex, x.PartNumber, x.BOMGuid, x.CreatedDate, x.ModifiedDate, x.EffectiveFrom, x.EffectiveTo, x.ChildSwFileType, x.ParentSwFileType, x.ParentObjectID, x.CreatedUserID, x.ModifiedUserID, x.ChildConfigID, x.fld006567, x.fld006581, x.fld006565, x.fld006564, x.fld006566,x.isAddedFromSW,x.fld006586 }).ExecuteReturnEntityAsync();
@ -438,6 +438,11 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient
var bomChangeVersion = historyBomList.Where(x => x.ChildGuid == bomListChildGuid && x.QtyManual == bomListQuantity && x.childVersion!= bomListItem.childVersion).ToList();
for (var i = 0; i < bomChangeVersion.Count; i++)
{
var versionChange = await _dataValidationService.ComparativeVersion(bomChangeVersion[i].ChildObjID, bomListChildGuid, (int)bomListItem.childVersion, (int)bomChangeVersion[i].childVersion);
if (string.IsNullOrWhiteSpace(versionChange))
{
continue;
}
//创建子项
var childBom = new ConfigurationData
{
@ -466,7 +471,7 @@ public class ChangeNoticeEcnService : IDynamicApiController, ITransient
ModifiedUserID = 2,
ChildConfigID = ChildConfigID,
isAddedFromSW = true,
fld006586 = await _dataValidationService.ComparativeVersion(bomChange[i].ChildObjID, bomListChildGuid, (int)bomListItem.childVersion, (int)bomChange[i].childVersion),
fld006586 = versionChange,
fld006567 = "子项",
fld006581 = recordData._System_objNBS,