Browse Source

更新ERP库位信息

master
学 赵 1 year ago
parent
commit
854a8c8643
  1. 20
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs
  2. 23
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
  3. 17
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs
  4. 13
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SEC_DETAIL.cs
  5. 3
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_NOT_SA_DETAIL.cs
  6. 12
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SEC_DETAIL.cs
  7. 52
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
  8. 11
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SEC_DETAIL.cs
  9. 5587
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230822025542_202308120001.Designer.cs
  10. 224
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230822025542_202308120001.cs
  11. 61
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs

20
code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs

@ -139,12 +139,9 @@ namespace Win.Sfs.SettleAccount.Bases
{ {
//_repository.Where(p => p_list.Contains(p.BillNum)); //_repository.Where(p => p_list.Contains(p.BillNum));
//public VmiLog() //public VmiLog()
//{ //{
//} //}
//public VmiLog(Guid id) //public VmiLog(Guid id)
//{ //{
// this.Id = id; // this.Id = id;
@ -267,11 +264,6 @@ namespace Win.Sfs.SettleAccount.Bases
// #endregion 库存备份 // #endregion 库存备份
// public enum VmiLogType // public enum VmiLogType
//{ //{
// /// <summary> // /// <summary>
@ -310,18 +302,6 @@ namespace Win.Sfs.SettleAccount.Bases
// [Display(Name = "调整出库")] // [Display(Name = "调整出库")]
// Type600 = 600, // Type600 = 600,
//} //}
return ApplicationConsts.SuccessStr; return ApplicationConsts.SuccessStr;
} }
/// <summary> /// <summary>

23
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs

@ -12,6 +12,7 @@ using TaskJob.Interfaces;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Win.Sfs.SettleAccount.Constant; using Win.Sfs.SettleAccount.Constant;
using Win.Sfs.SettleAccount.Entities.BQ.Vmi; using Win.Sfs.SettleAccount.Entities.BQ.Vmi;
using Win.Sfs.SettleAccount.Entities.CodeSettings;
using Win.Sfs.Shared.RepositoryBase; using Win.Sfs.Shared.RepositoryBase;
namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs; namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
@ -24,6 +25,8 @@ public class PendingDeductionService : ITransientDependency, IExportJob
protected readonly INormalEfCoreRepository<BBAC_PD_DETAIL, Guid> _bbacRepository; protected readonly INormalEfCoreRepository<BBAC_PD_DETAIL, Guid> _bbacRepository;
protected readonly INormalEfCoreRepository<HBPO_PD_DETAIL, Guid> _hbpoRepository; protected readonly INormalEfCoreRepository<HBPO_PD_DETAIL, Guid> _hbpoRepository;
protected readonly INormalEfCoreRepository<PUB_PD_DETAIL, Guid> _pubRepository; protected readonly INormalEfCoreRepository<PUB_PD_DETAIL, Guid> _pubRepository;
protected readonly INormalEfCoreRepository<CodeSetting, Guid> _codesetRepository;
public PendingDeductionService( public PendingDeductionService(
INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> bbacSecRepository, INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> bbacSecRepository,
INormalEfCoreRepository<HBPO_SEC_DETAIL, Guid> hbpoSecRepository, INormalEfCoreRepository<HBPO_SEC_DETAIL, Guid> hbpoSecRepository,
@ -31,6 +34,9 @@ public class PendingDeductionService : ITransientDependency, IExportJob
INormalEfCoreRepository<BBAC_PD_DETAIL, Guid> bbacRepository, INormalEfCoreRepository<BBAC_PD_DETAIL, Guid> bbacRepository,
INormalEfCoreRepository<HBPO_PD_DETAIL, Guid> hbpoRepository, INormalEfCoreRepository<HBPO_PD_DETAIL, Guid> hbpoRepository,
INormalEfCoreRepository<PUB_PD_DETAIL, Guid> pubRepository, INormalEfCoreRepository<PUB_PD_DETAIL, Guid> pubRepository,
VmiAppService vimservice VmiAppService vimservice
) )
{ {
@ -50,18 +56,11 @@ public class PendingDeductionService : ITransientDependency, IExportJob
var list=billList.Split(","); var list=billList.Split(",");
// /// </summary>
//[Display(Name = "JisBBAC")]
// JisBBAC = 1,
///// <summary>
///// JisHBPO
///// </summary>
//[Display(Name = "JisHBPO")]
// JisHBPO = 2,
if (type == "JisBBAC") if (type == "JisBBAC")
{ {
var jisdetail = _bbacRepository.Where(p => list.Contains(p.BillNum) && p.IsMaiDan==false); var jisdetail = _bbacRepository.Where(p => list.Contains(p.BillNum) && p.IsMaiDan==false);
var mdetail = _bbacRepository.Where(p => list.Contains(p.BillNum) && p.IsMaiDan ==true); var mdetail = _bbacRepository.Where(p => list.Contains(p.BillNum) && p.IsMaiDan ==true);
var query = from itm in jisdetail var query = from itm in jisdetail
@ -79,8 +78,8 @@ public class PendingDeductionService : ITransientDependency, IExportJob
LogType = Entities.BQ.Vmi.VmiLogType.Type200, LogType = Entities.BQ.Vmi.VmiLogType.Type200,
ChangedQty = itm.Qty, ChangedQty = itm.Qty,
ChangedType = VmiType.Out, ChangedType = VmiType.Out,
SubBillType = EnumDeliverSubBillType.BBAC, //SubBillType = EnumDeliverSubBillType.小件BBAC,
BillType = EnumDeliverBjBmpBillType.JIS件, //BillType = EnumDeliverBjBmpBillType.JIS件,
PartCode = tm != null ? tm.ReplaceLU : itm.LU, PartCode = tm != null ? tm.ReplaceLU : itm.LU,
SettlementVinCode = itm.PN, SettlementVinCode = itm.PN,
PartCode2 = tm != null ? tm.ReplaceLU : itm.LU, PartCode2 = tm != null ? tm.ReplaceLU : itm.LU,
@ -110,7 +109,7 @@ public class PendingDeductionService : ITransientDependency, IExportJob
PartCode2 = itm.PartCode2, PartCode2 = itm.PartCode2,
CustomerPartCode = itm.CustomerPartCode, CustomerPartCode = itm.CustomerPartCode,
VinCode = itm.VinCode, VinCode = itm.VinCode,
OrderNum = itm.OrderNum, //OrderNum = itm.OrderNum,
ErpToLoc = "C0001" ErpToLoc = "C0001"
}).ConfigureAwait(false); }).ConfigureAwait(false);
} }

17
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs

@ -378,6 +378,11 @@ namespace SettleAccount.Bases
/// 厂内物料号 /// 厂内物料号
/// </summary> /// </summary>
public virtual string PartCode { get; set; } public virtual string PartCode { get; set; }
/// <summary> /// <summary>
/// 业务分类 /// 业务分类
/// </summary> /// </summary>
@ -439,12 +444,11 @@ namespace SettleAccount.Bases
/// </summary> /// </summary>
public string SettleBillNum { get; set; } public string SettleBillNum { get; set; }
public string InvbillNum { get; set; } public string InvbillNum { get; set; }
public string ErpLoc { get; set; }=string.Empty;
public string PartCode { get; set; } public string PartCode { get; set; }
public string RealPartCode { get; set; }
//public SA_CAN_BASE(int version, decimal price, string billNum, DateTime settleDate, string invGroupNum, string lU, string pN, string keyCode, decimal qty, string groupNum) //public SA_CAN_BASE(int version, decimal price, string billNum, DateTime settleDate, string invGroupNum, string lU, string pN, string keyCode, decimal qty, string groupNum)
//{ //{
@ -516,6 +520,13 @@ namespace SettleAccount.Bases
public string PartCode { get; set; } public string PartCode { get; set; }
/// <summary>
/// 实际出库厂内物料号
/// </summary>
public virtual string RealPartCode { get; set; }
public string ErpLoc { get; set; }
//public SA_NOT_BASE(decimal price, int version, string settleBillNum, DateTime settleDate, string invGroupNum, string lU, string pN, string keyCode, decimal qty, string groupNum) //public SA_NOT_BASE(decimal price, int version, string settleBillNum, DateTime settleDate, string invGroupNum, string lU, string pN, string keyCode, decimal qty, string groupNum)
//{ //{
// Price = price; // Price = price;

13
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SEC_DETAIL.cs

@ -128,7 +128,17 @@ public class BBAC_SEC_DETAIL : FullAuditedAggregateRoot<Guid>
[ExporterHeader(DisplayName = "PJIS日顺序号")] [ExporterHeader(DisplayName = "PJIS日顺序号")]
public string PJISSeqNumber { get; set; } public string PJISSeqNumber { get; set; }
public BBAC_SEC_DETAIL(Guid guid, EnumPubSaSeCompareCategory category, string wmsBillNum, DateTime shippingDate, string pN, string materialNumber, string materialDes, string primitiveLU, string replaceLU, DateTime customerOfflineTime, decimal sAQty, decimal sEQty, decimal diffQty, string mateType, decimal fixPrice, string seqNumber, string pJISSeqNumber)
/// <summary>
/// PJIS日顺序号
/// </summary>
[Display(Name = "库位")]
[ExporterHeader(DisplayName = "库位")]
public string ErpLoc { get; set; }
public BBAC_SEC_DETAIL(Guid guid, EnumPubSaSeCompareCategory category, string wmsBillNum, DateTime shippingDate, string pN, string materialNumber, string materialDes, string primitiveLU, string replaceLU, DateTime customerOfflineTime, decimal sAQty, decimal sEQty, decimal diffQty, string mateType, decimal fixPrice, string seqNumber, string pJISSeqNumber,string erploc)
{ {
Id = guid; Id = guid;
Category = category; Category = category;
@ -147,6 +157,7 @@ public class BBAC_SEC_DETAIL : FullAuditedAggregateRoot<Guid>
FixPrice = fixPrice; FixPrice = fixPrice;
SeqNumber = seqNumber; SeqNumber = seqNumber;
PJISSeqNumber = pJISSeqNumber; PJISSeqNumber = pJISSeqNumber;
ErpLoc = erploc;
} }
public BBAC_SEC_DETAIL() public BBAC_SEC_DETAIL()

3
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_NOT_SA_DETAIL.cs

@ -99,6 +99,9 @@ public class HBPO_NOT_SA_DETAIL :SA_NOT_BASE
public EnumBusinessType BusinessType { get; set; } public EnumBusinessType BusinessType { get; set; }
public HBPO_NOT_SA_DETAIL(Guid guid ,string keyCode, int version, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, DateTime settleDate, string groupNum, string invGroupNum, EnumBusinessType businessType,string partcode) public HBPO_NOT_SA_DETAIL(Guid guid ,string keyCode, int version, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, DateTime settleDate, string groupNum, string invGroupNum, EnumBusinessType businessType,string partcode)
{ {
Id = guid; Id = guid;

12
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SEC_DETAIL.cs

@ -129,7 +129,16 @@ public class HBPO_SEC_DETAIL: FullAuditedAggregateRoot<Guid>
[ExporterHeader(DisplayName = "PJIS日顺序号")] [ExporterHeader(DisplayName = "PJIS日顺序号")]
public string PJISSeqNumber { get; set; } public string PJISSeqNumber { get; set; }
public HBPO_SEC_DETAIL(Guid guid, EnumPubSaSeCompareCategory category, string wmsBillNum, DateTime shippingDate, string pN, string materialNumber, string materialDes, string primitiveLU, string replaceLU, DateTime customerOfflineTime, decimal sAQty, decimal sEQty, decimal diffQty, string mateType, decimal fixPrice, string seqNumber, string pJISSeqNumber) /// <summary>
/// PJIS日顺序号
/// </summary>
[Display(Name = "库位")]
[ExporterHeader(DisplayName = "库位")]
public string ErpLoc { get; set; }
public HBPO_SEC_DETAIL(Guid guid, EnumPubSaSeCompareCategory category, string wmsBillNum, DateTime shippingDate, string pN, string materialNumber, string materialDes, string primitiveLU, string replaceLU, DateTime customerOfflineTime, decimal sAQty, decimal sEQty, decimal diffQty, string mateType, decimal fixPrice, string seqNumber, string pJISSeqNumber,string erploc)
{ {
Id = guid; Id = guid;
Category = category; Category = category;
@ -148,6 +157,7 @@ public class HBPO_SEC_DETAIL: FullAuditedAggregateRoot<Guid>
FixPrice = fixPrice; FixPrice = fixPrice;
SeqNumber = seqNumber; SeqNumber = seqNumber;
PJISSeqNumber = pJISSeqNumber; PJISSeqNumber = pJISSeqNumber;
ErpLoc= erploc;
} }
public HBPO_SEC_DETAIL() public HBPO_SEC_DETAIL()

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

@ -25,6 +25,7 @@ using Volo.Abp.Domain.Services;
using Volo.Abp.Json; using Volo.Abp.Json;
using Win.Sfs.SettleAccount.Bases; using Win.Sfs.SettleAccount.Bases;
using Win.Sfs.SettleAccount.Entities.BQ.Temp; using Win.Sfs.SettleAccount.Entities.BQ.Temp;
using Win.Sfs.SettleAccount.Entities.CodeSettings;
using Win.Sfs.SettleAccount.Entities.Prices; using Win.Sfs.SettleAccount.Entities.Prices;
using Win.Sfs.Shared.RepositoryBase; using Win.Sfs.Shared.RepositoryBase;
@ -38,7 +39,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
private readonly INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> _detailRepository; private readonly INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> _detailRepository;
private readonly INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> _notRepository; private readonly INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> _notRepository;
private readonly INormalEfCoreRepository<PUB_ADJ_DETAIL, Guid> _adjRepository; private readonly INormalEfCoreRepository<PUB_ADJ_DETAIL, Guid> _adjRepository;
protected readonly INormalEfCoreRepository<CodeSetting, Guid> _codesetRepository;
private readonly INormalEfCoreRepository<BBAC_PD, Guid> _pdbbacRepository; private readonly INormalEfCoreRepository<BBAC_PD, Guid> _pdbbacRepository;
private readonly INormalEfCoreRepository<HBPO_PD, Guid> _pdhbpoRepository; private readonly INormalEfCoreRepository<HBPO_PD, Guid> _pdhbpoRepository;
private readonly INormalEfCoreRepository<PUB_PD, Guid> _pdpubRepository; private readonly INormalEfCoreRepository<PUB_PD, Guid> _pdpubRepository;
@ -57,7 +58,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> groupRepository, INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> groupRepository,
INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> detailRepository, INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> detailRepository,
INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> notRepository, INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> notRepository,
INormalEfCoreRepository<PUB_ADJ_DETAIL, Guid> adjRepository INormalEfCoreRepository<PUB_ADJ_DETAIL, Guid> adjRepository,
INormalEfCoreRepository<CodeSetting, Guid> codesetRepository
) )
{ {
@ -73,6 +75,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
_pdbbacRepository=pdbbacRepository; _pdbbacRepository=pdbbacRepository;
_pdhbpoRepository=pdhbpoRepository; _pdhbpoRepository=pdhbpoRepository;
_pdpubRepository =pdpubRepository; _pdpubRepository =pdpubRepository;
_codesetRepository = codesetRepository;
} }
public INV_MNG() public INV_MNG()
@ -497,22 +500,24 @@ 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)
{ {
bbacDetail.Add(
new BBAC_PD_DETAIL( var detail= new BBAC_PD_DETAIL(
guid: itm.Id, guid: itm.Id,
keyCode: itm.KeyCode, keyCode: itm.KeyCode,
version: itm.Version, version: itm.Version,
billNum: itm.InvbillNum, billNum: itm.InvbillNum,
lU: itm.LU, lU: itm.LU,
rELU: string.Empty, rELU: string.Empty,
pN: itm.PN, pN: itm.PN,
rEPN: string.Empty, rEPN: string.Empty,
@ -525,8 +530,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
extend1: string.Empty, extend1: string.Empty,
extend2: string.Empty, extend2: string.Empty,
extend3: string.Empty, extend3: string.Empty,
extend4: itm.PartCode extend4: itm.PartCode);//厂内实际零件号
));
detail.RELU = itm.RealPartCode;//厂内替换零件号
detail.Extend2 = itm.ErpLoc;//ERP库位
bbacDetail.Add(detail);
} }
await _repository.DbContext.BulkInsertAsync(bbacmainlist); await _repository.DbContext.BulkInsertAsync(bbacmainlist);
await _repository.DbContext.BulkInsertAsync(bbacDetail); await _repository.DbContext.BulkInsertAsync(bbacDetail);
@ -606,7 +614,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{ {
foreach (var itm in adjlist) foreach (var itm in adjlist)
{ {
entityDetail.Add(new HBPO_CAN_SA_DETAIL( var entity= new HBPO_CAN_SA_DETAIL(
guid: GuidGenerator.Create(), guid: GuidGenerator.Create(),
keyCode: itm.KeyCode, keyCode: itm.KeyCode,
version: itm.Version, version: itm.Version,
@ -622,8 +630,9 @@ 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);
)); entityDetail.Add(entity
);
} }
} }
entityList.AddRange(entityDetail); entityList.AddRange(entityDetail);
@ -645,8 +654,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var bbacDetail = new List<HBPO_PD_DETAIL>(); var bbacDetail = new List<HBPO_PD_DETAIL>();
foreach (var itm in entityList) foreach (var itm in entityList)
{ {
bbacDetail.Add( var entity = new HBPO_PD_DETAIL(
new HBPO_PD_DETAIL(
guid: itm.Id, guid: itm.Id,
keyCode: itm.KeyCode, keyCode: itm.KeyCode,
version: itm.Version, version: itm.Version,
@ -665,7 +673,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
extend2: string.Empty, extend2: string.Empty,
extend3: string.Empty, extend3: string.Empty,
extend4: itm.PartCode extend4: itm.PartCode
)); );
entity.RELU = itm.RealPartCode;//厂内替换零件号
entity.Extend2 = itm.ErpLoc;//ERP库位
bbacDetail.Add(entity
);
} }
await _repository.DbContext.BulkInsertAsync(bbacmainlist); await _repository.DbContext.BulkInsertAsync(bbacmainlist);
await _repository.DbContext.BulkInsertAsync(bbacDetail); await _repository.DbContext.BulkInsertAsync(bbacDetail);
@ -728,8 +741,6 @@ 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,
pobillnum:string.Empty pobillnum:string.Empty
@ -768,9 +779,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
} }
entityList.AddRange(entityDetail); entityList.AddRange(entityDetail);
} }
var bbacmainlist = new List<PUB_PD>(); var bbacmainlist = new List<PUB_PD>();
foreach (var itm in invList) foreach (var itm in invList)
{ {
@ -789,8 +798,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var bbacDetail = new List<PUB_PD_DETAIL>(); var bbacDetail = new List<PUB_PD_DETAIL>();
foreach (var itm in entityList) foreach (var itm in entityList)
{ {
bbacDetail.Add( var entity = new PUB_PD_DETAIL(
new PUB_PD_DETAIL(
guid: itm.Id, guid: itm.Id,
keyCode: itm.KeyCode, keyCode: itm.KeyCode,
version: itm.Version, version: itm.Version,
@ -810,7 +818,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
extend2: string.Empty, extend2: string.Empty,
extend3: string.Empty, extend3: string.Empty,
extend4: itm.PartCode extend4: itm.PartCode
)); );
entity.RELU = itm.RealPartCode;//厂内替换零件号
entity.Extend2 = itm.ErpLoc;//ERP库位
bbacDetail.Add(entity
);
} }
await _repository.DbContext.BulkInsertAsync(bbacmainlist); await _repository.DbContext.BulkInsertAsync(bbacmainlist);
await _repository.DbContext.BulkInsertAsync(bbacDetail); await _repository.DbContext.BulkInsertAsync(bbacDetail);

11
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SEC_DETAIL.cs

@ -128,7 +128,15 @@ public class PUB_SEC_DETAIL:FullAuditedAggregateRoot<Guid>
[ExporterHeader(DisplayName = "PJIS日顺序号")] [ExporterHeader(DisplayName = "PJIS日顺序号")]
public string PJISSeqNumber { get; set; } public string PJISSeqNumber { get; set; }
public PUB_SEC_DETAIL(Guid guid, EnumPubSaSeCompareCategory category, string wmsBillNum, DateTime shippingDate, string pN, string materialNumber, string materialDes, string primitiveLU, string replaceLU, DateTime customerOfflineTime, decimal sAQty, decimal sEQty, decimal diffQty, string mateType, decimal fixPrice, string seqNumber, string pJISSeqNumber)
/// <summary>
/// PJIS日顺序号
/// </summary>
[Display(Name = "库位")]
[ExporterHeader(DisplayName = "库位")]
public string ErpLoc { get; set; }
public PUB_SEC_DETAIL(Guid guid, EnumPubSaSeCompareCategory category, string wmsBillNum, DateTime shippingDate, string pN, string materialNumber, string materialDes, string primitiveLU, string replaceLU, DateTime customerOfflineTime, decimal sAQty, decimal sEQty, decimal diffQty, string mateType, decimal fixPrice, string seqNumber, string pJISSeqNumber,string erploc)
{ {
Id = guid; Id = guid;
Category = category; Category = category;
@ -147,6 +155,7 @@ public class PUB_SEC_DETAIL:FullAuditedAggregateRoot<Guid>
FixPrice = fixPrice; FixPrice = fixPrice;
SeqNumber = seqNumber; SeqNumber = seqNumber;
PJISSeqNumber = pJISSeqNumber; PJISSeqNumber = pJISSeqNumber;
ErpLoc = erploc;
} }
public PUB_SEC_DETAIL() public PUB_SEC_DETAIL()

5587
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230822025542_202308120001.Designer.cs

File diff suppressed because it is too large

224
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230822025542_202308120001.cs

@ -0,0 +1,224 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace Win.Sfs.SettleAccount.Migrations
{
public partial class _202308120001 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "Set_VmiBalance",
keyColumn: "Id",
keyValue: new Guid("3fc80398-34df-4288-9ad7-37db79c80192"));
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_PUB_SEC_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_PUB_NOT_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_PUB_NOT_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_PUB_CAN_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_PUB_CAN_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_PUB_ADJ_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_PUB_ADJ_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_HBPO_SEC_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_HBPO_NOT_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_HBPO_NOT_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_HBPO_CAN_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_HBPO_CAN_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_HBPO_ADJ_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_HBPO_ADJ_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_BBAC_SEC_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_BBAC_NOT_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_BBAC_NOT_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_BBAC_CAN_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_BBAC_CAN_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.InsertData(
table: "Set_VmiBalance",
columns: new[] { "Id", "BackupTime", "BillTime", "BillType", "CodeType", "ConcurrencyStamp", "Configcode", "CustomerPartCode", "DeliverTime", "ErpToLoc", "MatchNumber", "OrderNum", "PartCode", "PjsNum", "Qty", "ReMark", "RealCode", "Seq", "SubBillType", "UniqueCode", "VinCode", "factory" },
values: new object[] { new Guid("0986cf48-5c48-4d14-a7b5-77e0d5da28b9"), null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), 1, null, "60e9bdd1236e478e861a8d0d950d715b", null, null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), "ErpToLoc", null, "OrderNum", "PartCode", null, 0m, null, null, null, 0, null, "VinCode", null });
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "Set_VmiBalance",
keyColumn: "Id",
keyValue: new Guid("0986cf48-5c48-4d14-a7b5-77e0d5da28b9"));
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_PUB_SEC_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_PUB_NOT_SA_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_PUB_NOT_SA_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_PUB_CAN_SA_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_PUB_CAN_SA_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_PUB_ADJ_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_PUB_ADJ_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_HBPO_SEC_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_HBPO_NOT_SA_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_HBPO_NOT_SA_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_HBPO_CAN_SA_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_HBPO_CAN_SA_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_HBPO_ADJ_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_HBPO_ADJ_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_BBAC_SEC_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_BBAC_NOT_SA_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_BBAC_NOT_SA_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_BBAC_CAN_SA_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_BBAC_CAN_SA_DETAIL");
migrationBuilder.InsertData(
table: "Set_VmiBalance",
columns: new[] { "Id", "BackupTime", "BillTime", "BillType", "CodeType", "ConcurrencyStamp", "Configcode", "CustomerPartCode", "DeliverTime", "ErpToLoc", "MatchNumber", "OrderNum", "PartCode", "PjsNum", "Qty", "ReMark", "RealCode", "Seq", "SubBillType", "UniqueCode", "VinCode", "factory" },
values: new object[] { new Guid("3fc80398-34df-4288-9ad7-37db79c80192"), null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), 1, null, "b792ebaa809446988e3a5e7887e75ecb", null, null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), "ErpToLoc", null, "OrderNum", "PartCode", null, 0m, null, null, null, 0, null, "VinCode", null });
}
}
}

61
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs

@ -113,6 +113,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId"); .HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)") .HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties"); .HasColumnName("ExtraProperties");
@ -164,6 +167,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty") b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)"); .HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum") b.Property<string>("SettleBillNum")
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("nvarchar(50)"); .HasColumnType("nvarchar(50)");
@ -209,6 +215,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId"); .HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)") .HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties"); .HasColumnName("ExtraProperties");
@ -257,6 +266,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty") b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)"); .HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum") b.Property<string>("SettleBillNum")
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("nvarchar(50)"); .HasColumnType("nvarchar(50)");
@ -1168,6 +1180,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId"); .HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)") .HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties"); .HasColumnName("ExtraProperties");
@ -1220,6 +1235,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty") b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)"); .HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum") b.Property<string>("SettleBillNum")
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("nvarchar(50)"); .HasColumnType("nvarchar(50)");
@ -1328,6 +1346,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId"); .HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)") .HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties"); .HasColumnName("ExtraProperties");
@ -1372,6 +1393,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty") b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)"); .HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum") b.Property<string>("SettleBillNum")
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("nvarchar(50)"); .HasColumnType("nvarchar(50)");
@ -1414,6 +1438,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId"); .HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)") .HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties"); .HasColumnName("ExtraProperties");
@ -1455,6 +1482,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty") b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)"); .HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum") b.Property<string>("SettleBillNum")
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("nvarchar(50)"); .HasColumnType("nvarchar(50)");
@ -2847,6 +2877,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId"); .HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("Extend1") b.Property<string>("Extend1")
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("nvarchar(50)"); .HasColumnType("nvarchar(50)");
@ -2903,6 +2936,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty") b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)"); .HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum") b.Property<string>("SettleBillNum")
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("nvarchar(50)"); .HasColumnType("nvarchar(50)");
@ -3012,6 +3048,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId"); .HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)") .HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties"); .HasColumnName("ExtraProperties");
@ -3059,6 +3098,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty") b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)"); .HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum") b.Property<string>("SettleBillNum")
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("nvarchar(50)"); .HasColumnType("nvarchar(50)");
@ -3102,6 +3144,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId"); .HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("Extend1") b.Property<string>("Extend1")
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("nvarchar(50)"); .HasColumnType("nvarchar(50)");
@ -3158,6 +3203,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty") b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)"); .HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum") b.Property<string>("SettleBillNum")
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("nvarchar(50)"); .HasColumnType("nvarchar(50)");
@ -3978,6 +4026,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("DiffQty") b.Property<decimal>("DiffQty")
.HasColumnType("decimal(18,2)"); .HasColumnType("decimal(18,2)");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)") .HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties"); .HasColumnName("ExtraProperties");
@ -4086,6 +4137,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("DiffQty") b.Property<decimal>("DiffQty")
.HasColumnType("decimal(18,2)"); .HasColumnType("decimal(18,2)");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)") .HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties"); .HasColumnName("ExtraProperties");
@ -4194,6 +4248,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("DiffQty") b.Property<decimal>("DiffQty")
.HasColumnType("decimal(18,2)"); .HasColumnType("decimal(18,2)");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)") .HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties"); .HasColumnName("ExtraProperties");
@ -4549,10 +4606,10 @@ namespace Win.Sfs.SettleAccount.Migrations
b.HasData( b.HasData(
new new
{ {
Id = new Guid("3fc80398-34df-4288-9ad7-37db79c80192"), Id = new Guid("0986cf48-5c48-4d14-a7b5-77e0d5da28b9"),
BillTime = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), BillTime = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
BillType = 1, BillType = 1,
ConcurrencyStamp = "b792ebaa809446988e3a5e7887e75ecb", ConcurrencyStamp = "60e9bdd1236e478e861a8d0d950d715b",
DeliverTime = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), DeliverTime = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
ErpToLoc = "ErpToLoc", ErpToLoc = "ErpToLoc",
OrderNum = "OrderNum", OrderNum = "OrderNum",

Loading…
Cancel
Save