Browse Source

更新版本

master
学 赵 1 year ago
parent
commit
cc3414d39a
  1. 59
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

59
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

@ -431,7 +431,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{ {
foreach (var itm in adjlist) foreach (var itm in adjlist)
{ {
entityList.Add(new BBAC_CAN_SA_DETAIL( var detail = new BBAC_CAN_SA_DETAIL(
guid: GuidGenerator.Create(), guid: GuidGenerator.Create(),
keyCode: itm.KeyCode, keyCode: itm.KeyCode,
version: itm.Version, version: itm.Version,
@ -449,9 +449,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
invGroupNum: itm.InvGroupNum, invGroupNum: itm.InvGroupNum,
contactid: itm.Extend1,//生产号 contactid: itm.Extend1,//生产号
invbillnum: itm.InvBillNum, invbillnum: itm.InvBillNum,
partcode:itm.PartCode partcode: itm.PartCode);
detail.ErpLoc = itm.ErpLoc;
)); detail.RealPartCode = itm.RealPartCode;
entityList.Add(detail);
} }
} }
} }
@ -464,7 +465,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{ {
foreach (var itm in adjlist) foreach (var itm in adjlist)
{ {
entityDetail.Add(new BBAC_CAN_SA_DETAIL( var detail = new BBAC_CAN_SA_DETAIL(
guid: GuidGenerator.Create(), guid: GuidGenerator.Create(),
keyCode: itm.KeyCode, keyCode: itm.KeyCode,
version: itm.Version, version: itm.Version,
@ -482,9 +483,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
invGroupNum: itm.InvGroupNum, invGroupNum: itm.InvGroupNum,
contactid: itm.Extend1,//生产号 contactid: itm.Extend1,//生产号
invbillnum: itm.InvBillNum, invbillnum: itm.InvBillNum,
partcode:itm.PartCode partcode: itm.PartCode
);
)); detail.ErpLoc = itm.ErpLoc;
detail.RealPartCode = itm.RealPartCode;
entityDetail.Add(detail);
} }
} }
entityList.AddRange(entityDetail); entityList.AddRange(entityDetail);
@ -500,12 +503,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
state: SettleBillState., state: SettleBillState.,
invGroupNum: itm.InvGroupNum, invGroupNum: itm.InvGroupNum,
site: string.Empty site: string.Empty
); );
bbacmainlist.Add( bbac ); bbacmainlist.Add( bbac );
} }
var bbacDetail = new List<BBAC_PD_DETAIL>(); var bbacDetail = new List<BBAC_PD_DETAIL>();
foreach (var itm in entityList) foreach (var itm in entityList)
@ -570,8 +569,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
newlist = p_invs.Where(p => !oldlist.Contains(p)).ToList();//不存在扣减记录的发票号 newlist = p_invs.Where(p => !oldlist.Contains(p)).ToList();//不存在扣减记录的发票号
List<HBPO_CAN_SA_DETAIL> entityList = new List<HBPO_CAN_SA_DETAIL>();//结算明细 List<HBPO_CAN_SA_DETAIL> entityList = new List<HBPO_CAN_SA_DETAIL>();//结算明细
var namelist = invList.Select(p => p.InvbillNum).ToList(); var namelist = invList.Select(p => p.InvbillNum).ToList();
if (oldlist.Count > 0) if (oldlist.Count > 0)
@ -584,7 +581,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{ {
foreach (var itm in adjlist) foreach (var itm in adjlist)
{ {
entityList.Add(new HBPO_CAN_SA_DETAIL( var detail = new HBPO_CAN_SA_DETAIL(
guid: GuidGenerator.Create(), guid: GuidGenerator.Create(),
keyCode: itm.KeyCode, keyCode: itm.KeyCode,
version: itm.Version, version: itm.Version,
@ -600,8 +597,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
groupNum: itm.GroupNum, groupNum: itm.GroupNum,
invGroupNum: itm.InvGroupNum, invGroupNum: itm.InvGroupNum,
invbillnum: itm.InvBillNum, invbillnum: itm.InvBillNum,
partcode:itm.PartCode partcode: itm.PartCode
)); );
detail.ErpLoc = itm.ErpLoc;
detail.RealPartCode = itm.RealPartCode;
entityList.Add(detail);
} }
} }
} }
@ -631,8 +631,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
invGroupNum: itm.InvGroupNum, invGroupNum: itm.InvGroupNum,
invbillnum: itm.InvBillNum, invbillnum: itm.InvBillNum,
partcode: itm.PartCode); partcode: itm.PartCode);
entityDetail.Add(entity entity.ErpLoc = itm.ErpLoc;//补字段库位
); entity.PartCode = itm.RealPartCode;//真实零件号
entityDetail.Add(entity);
} }
} }
entityList.AddRange(entityDetail); entityList.AddRange(entityDetail);
@ -724,7 +726,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{ {
foreach (var itm in adjlist) foreach (var itm in adjlist)
{ {
entityList.Add(new PUB_CAN_SA_DETAIL( var detail = new PUB_CAN_SA_DETAIL(
guid: GuidGenerator.Create(), guid: GuidGenerator.Create(),
keyCode: itm.KeyCode, keyCode: itm.KeyCode,
version: itm.Version, version: itm.Version,
@ -740,11 +742,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
groupNum: itm.GroupNum, groupNum: itm.GroupNum,
invGroupNum: itm.InvGroupNum, invGroupNum: itm.InvGroupNum,
invbillnum: itm.InvBillNum, invbillnum: itm.InvBillNum,
partcode:itm.PartCode, partcode: itm.PartCode,
pobillnum:string.Empty pobillnum: string.Empty
);
detail.RealPartCode = itm.RealPartCode;//厂内替换零件号
detail.ErpLoc = itm.ErpLoc;//ERP库位
)); entityList.Add(detail);
} }
} }
} }
@ -757,7 +761,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{ {
foreach (var itm in adjlist) foreach (var itm in adjlist)
{ {
entityDetail.Add(new PUB_CAN_SA_DETAIL( var detail = new PUB_CAN_SA_DETAIL(
guid: GuidGenerator.Create(), guid: GuidGenerator.Create(),
keyCode: itm.KeyCode, keyCode: itm.KeyCode,
version: itm.Version, version: itm.Version,
@ -775,7 +779,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
invbillnum: itm.InvBillNum, invbillnum: itm.InvBillNum,
partcode: itm.PartCode, partcode: itm.PartCode,
pobillnum: string.Empty pobillnum: string.Empty
)); );
detail.RealPartCode = itm.RealPartCode;//厂内替换零件号
detail.ErpLoc = itm.ErpLoc;//ERP库位
entityDetail.Add(detail);
} }
} }
entityList.AddRange(entityDetail); entityList.AddRange(entityDetail);

Loading…
Cancel
Save