diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs index 4fcb9067..c8a271eb 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs @@ -44,7 +44,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// public string InvGroupNum { get; set; } /// - /// 零件号 + /// 客户零件号 /// public string LU { get; set; } /// @@ -61,7 +61,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos public string GroupNum { get; set; } /// - /// 客户零件号 + /// 厂内零件号 /// public string PartCode { get; set; } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs index d9744ed8..c5c0c9d4 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs @@ -44,7 +44,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// public string InvGroupNum { get; set; } /// - /// 零件号 + /// 客户零件号 /// public string LU { get; set; } /// @@ -64,7 +64,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// public string GroupNum { get; set; } /// - /// 客户零件号 + /// 厂内零件号 /// public string PartCode { get; set; } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs index a1758868..da7906a4 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs @@ -39,7 +39,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos public DateTime SettleDate { get; set; } [Display(Name = "发票分组号")] public string InvGroupNum { get; set; } - [Display(Name = "发票分组号")] + [Display(Name = "客户零件号")] public string LU { get; set; } [Display(Name = "发货单号、交付识别号")] public string PN { get; set; } @@ -50,9 +50,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos [Display(Name = "结算分组号")] public string GroupNum { get; set; } - - - + [Display(Name = "厂内零件号")] + public string PartCode { get; set; } + } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_NOT_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_NOT_SA_MNG.cs index afbf253d..0c2ffb05 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_NOT_SA_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_NOT_SA_MNG.cs @@ -67,7 +67,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers _entity.SetId(Guid.NewGuid()); _entity.BillNum = billNumber; _entity.InvGroupNum = billNumber; - _entity.Version = int.Parse(DateTime.Now.ToString("yyyymm")); + _entity.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); _entity.State = SettleBillState.未结状态; _entity.SettleBillNum = string.Empty; _entity.BusinessType = EnumBusinessType.JisBBAC; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/HBPO_NOT_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/HBPO_NOT_SA_MNG.cs index d99d5442..356ae78e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/HBPO_NOT_SA_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/HBPO_NOT_SA_MNG.cs @@ -72,7 +72,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers var _entity = new HBPO_CAN_SA(); _entity.BillNum = billNumber; _entity.InvGroupNum = billNumber; - _entity.Version = int.Parse(DateTime.Now.ToString("yyyymm")); + _entity.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); _entity.State = SettleBillState.未结状态; _entity.SettleBillNum = string.Empty; _entity.BusinessType = p_list.FirstOrDefault().BusinessType; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs index f4713026..b47a54bd 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs @@ -98,9 +98,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers _entity.SetId(Guid.NewGuid()); _entity.BillNum = billNumber; _entity.InvGroupNum = billNumber; - _entity.Version = int.Parse(DateTime.Now.ToString("yyyymm")); + _entity.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); _entity.State = SettleBillState.未结状态; _entity.SettleBillNum = string.Empty; + _entity.BusinessType = first.BusinessType; var _entityList = new List(); foreach (var itm in notlist) { @@ -126,7 +127,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers _entityList.Add(_detailEntity); } - await _notRepository.DbContext.BulkDeleteAsync(p_list); + await _repository.DbContext.BulkDeleteAsync(p_list); await _repository.DbContext.BulkInsertAsync(new List() { _entity }); await _repository.DbContext.BulkInsertAsync(_entityList); @@ -166,9 +167,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers _entityList.Add(_detailEntity); } - await _notRepository.DbContext.BulkDeleteAsync(p_list); + // _repository.DbContext.Database.BeginTransaction(); + await _repository.DbContext.BulkDeleteAsync(p_list); await _repository.DbContext.BulkInsertAsync(new List() { _entity }); await _repository.DbContext.BulkInsertAsync(_entityList); + //_repository.DbContext.Database.CommitTransaction(); } return errors;