diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs
index 9ec961ed..1e83bb59 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs
@@ -293,58 +293,55 @@ public class PriceListBJExportDto
///
/// 客户备件价格导入
///
-[Importer(HeaderRowIndex = 22)]
public class PriceListBJImportDto
{
///
/// 客户零件号
///
[Display(Name = "客户零件号")]
- [ImporterHeader(Name = "Part No.")]
+ [ImporterHeader(Name = "客户零件号")]
public string LU { get; set; }
///
/// 价格
///
- [Display(Name = "客户零件号")]
- [ImporterHeader(Name = "Total Price")]
+ [Display(Name = "价格")]
+ [ImporterHeader(Name = "价格")]
public decimal Price { get; set; }
///
/// 开始时间
///
[Display(Name = "开始时间")]
- [ImporterHeader(Name = "Valid From")]
+ [ImporterHeader(Name = "开始时间")]
public DateTime BeginDate { set; get; }
///
/// 结束时间
///
[Display(Name = "结束时间")]
- [ImporterHeader(Name = "Valid To")]
+ [ImporterHeader(Name = "结束时间")]
public DateTime EndDate { set; get; }
///
/// 客户编码
///
- [Display(Name = "客户零件号")]
- [ImporterHeader(Name = "Plant")]
+ [Display(Name = "客户编码")]
+ [ImporterHeader(Name = "客户编码")]
public string ClientCode { get; set; }
///
/// 合同签订时间
///
- [Display(Name = "客户零件号")]
- [ImporterHeader(IsIgnore = true)]
- [ExcelImporterHeadDesc(Row = 1, Cell = 1)]
- public string Date { get; set; }
+ [Display(Name = "合同签订时间")]
+ [ImporterHeader(Name = "合同签订时间")]
+ public DateTime Date { get; set; }
///
/// 合同号
///
- [Display(Name = "客户零件号")]
- [ImporterHeader(IsIgnore = true)]
- [ExcelImporterHeadDesc(Row = 2, Cell = 1)]
+ [Display(Name = "合同号")]
+ [ImporterHeader(Name = "合同号")]
public string ContractNo { get; set; }
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
index e08ce6f5..97594bae 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
@@ -5,6 +5,7 @@ using System.LinqAsync;
using System.Security.Policy;
using System.Threading.Tasks;
using AutoMapper;
+using EFCore.BulkExtensions;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
@@ -306,6 +307,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase
var bbacCanSa = new BBAC_CAN_SA()
{
BillNum = bbacCanSaBillNum,
+ InvGroupNum = bbacCanSaBillNum,
SettleBillNum = bbacSaBillNum,
State = SettleBillState.未结状态,
BusinessType = _businessType
@@ -323,6 +325,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase
bbacSaDetails.ForEach(bbacSaDetail =>
{
+ bbacSaDetail.SetId(GuidGenerator.Create());
List lus = bbacSaDetail.LU.Split(" ").ToList();
bbacSaDetail.LU = lus[0].Replace(" ", "");
if (lus.Count > 1)
@@ -379,10 +382,9 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase
#region 添加入库
await _bbacSaRepository.InsertAsync(bbacSa);
- await _bbacSaDetailRepository.InsertManyAsync(bbacSaDetails);
+ await _bbacSaDetailRepository.DbContext.BulkInsertAsync(bbacSaDetails);
if (bbacCanSaDetails.Count > 0)
{
- bbacCanSa.InvGroupNum = bbacCanSaDetails.Count.ToString();
bbacCanSaDetails.ForEach(bbacCanSaDetail =>
{
bbacCanSaDetail.BillNum = bbacCanSaDetail.InvGroupNum = bbacCanSaBillNum;
@@ -390,7 +392,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase
});
await _bbacCanSaRepository.InsertAsync(bbacCanSa);
- await _bbacCanSaDetailRepository.InsertManyAsync(bbacCanSaDetails);
+ await _bbacCanSaDetailRepository.DbContext.BulkInsertAsync(bbacCanSaDetails);
}
if (bbacNotSaDetails.Count > 0)
{
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
index 83078799..448995f5 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using EFCore.BulkExtensions;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
@@ -305,6 +306,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase
var hbpoCanSa = new HBPO_CAN_SA()
{
BillNum = hbpoCanSaBillNum,
+ InvGroupNum = hbpoCanSaBillNum,
SettleBillNum = hbpoSaBillNum,
State = SettleBillState.未结状态,
BusinessType = _businessType,
@@ -323,6 +325,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase
hbpoSaDetails.ForEach(hbpoSaDetail =>
{
+ hbpoSaDetail.SetId(GuidGenerator.Create());
List lus = hbpoSaDetail.LU.Split(" ").ToList();
hbpoSaDetail.LU = lus[0].Replace(" ", "");
if (lus.Count > 1)
@@ -379,21 +382,20 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase
#region 添加入库
await _hbpoSaRepository.InsertAsync(hbpoSa).ConfigureAwait(false);
- await _hbpoSaDetailRepository.InsertManyAsync(hbpoSaDetails).ConfigureAwait(false);
+ await _hbpoSaDetailRepository.DbContext.BulkInsertAsync(hbpoSaDetails).ConfigureAwait(false);
if (hbpoCanSaDetails.Count > 0)
{
- hbpoCanSa.InvGroupNum = hbpoCanSaDetails.Count.ToString();
hbpoCanSaDetails.ForEach(hbpoCanSaDetail =>
{
hbpoCanSaDetail.BillNum = hbpoCanSaDetail.InvGroupNum = hbpoCanSaBillNum;
});
await _hbpoCanSaRepository.InsertAsync(hbpoCanSa).ConfigureAwait(false);
- await _hbpoCanSaDetailRepository.InsertManyAsync(hbpoCanSaDetails).ConfigureAwait(false);
+ await _hbpoCanSaDetailRepository.DbContext.BulkInsertAsync(hbpoCanSaDetails).ConfigureAwait(false);
}
if (hbpoNotSaDetails.Count > 0)
{
- await _hbpoNotSaDetailRepository.InsertManyAsync(hbpoNotSaDetails).ConfigureAwait(false);
+ await _hbpoNotSaDetailRepository.DbContext.BulkInsertAsync(hbpoNotSaDetails).ConfigureAwait(false);
}
if (materialRelationships.Count > 0)
{
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
index 446434fd..7f637fa7 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
@@ -67,6 +67,11 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase
///
private readonly INormalEfCoreRepository _priceListRepository;
+ ///
+ /// 备件价格仓储
+ ///
+ private readonly INormalEfCoreRepository _priceBjListRepository;
+
///
/// 客户零件关系仓储
///
@@ -86,6 +91,7 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase
INormalEfCoreRepository pubCanSaDetailRepository,
INormalEfCoreRepository pubNotSaDetailRepository,
INormalEfCoreRepository priceListRepository,
+ INormalEfCoreRepository priceBjListRepository,
INormalEfCoreRepository materialRelationshipRepository,
INormalEfCoreRepository tbRePartsRelationshipRepository,
IDistributedCache cache,
@@ -100,6 +106,7 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase
_pubCanSaDetailRepository = pubCanSaDetailRepository;
_pubNotSaDetailRepository = pubNotSaDetailRepository;
_priceListRepository = priceListRepository;
+ _priceBjListRepository = priceBjListRepository;
_materialRelationshipRepository = materialRelationshipRepository;
_tbRePartsRelationshipRepository = tbRePartsRelationshipRepository;
}
@@ -460,9 +467,6 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase
var materialRelationships = new List();
#region 处理结算数据
- //销售价格
- var priceListEntitys = await _priceListRepository.GetAllAsync().ConfigureAwait(false);
-
pubSaDetails.ForEach(importPubSaDetail =>
{
importPubSaDetail.SetId(GuidGenerator.Create());
@@ -479,11 +483,30 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase
importPubSaDetail.Version = _version;
importPubSaDetail.BusinessType = businessType;
importPubSaDetail.Site = "XX工厂";
-
- //根据物料号、结算日期获取价格
- var priceListEntity = priceListEntitys.Find(t => t.LU == importPubSaDetail.LU && importPubSaDetail.SettleDate > t.BeginTime && importPubSaDetail.SettleDate < t.EndTime);
- importPubSaDetail.Price = priceListEntity?.Price ?? 0;
});
+ var lus = pubSaDetails.Select(t => t.LU).Distinct().ToList();
+ if (businessType == EnumBusinessType.BeiJian)
+ {
+ //备件销售价格
+ var priceListEntitys = _priceBjListRepository.Where(t => lus.Contains(t.LU)).ToList();
+ pubSaDetails.ForEach(importPubSaDetail =>
+ {
+ //根据物料号、结算日期获取价格
+ var priceListEntity = priceListEntitys.Find(t => t.LU == importPubSaDetail.LU && importPubSaDetail.SettleDate >= t.BeginDate && importPubSaDetail.SettleDate <= t.EndDate);
+ importPubSaDetail.Price = priceListEntity?.Price ?? 0;
+ });
+ }
+ else
+ {
+ //销售价格
+ var priceListEntitys = _priceListRepository.Join(lus, a => a.LU, b => b, (a, b) => a).ToList();
+ pubSaDetails.ForEach(importPubSaDetail =>
+ {
+ //根据物料号、结算日期获取价格
+ var priceListEntity = priceListEntitys.Find(t => t.LU == importPubSaDetail.LU && importPubSaDetail.SettleDate >= t.BeginTime && importPubSaDetail.SettleDate <= t.EndTime);
+ importPubSaDetail.Price = priceListEntity?.Price ?? 0;
+ });
+ }
//导入的零件号集合
var importPubSaLUs = pubSaDetails.Select(t => t.LU).Distinct();
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/BeiSeSyncAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/BeiSeSyncAppService.cs
index 01bba453..feec51ae 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/BeiSeSyncAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/BeiSeSyncAppService.cs
@@ -36,7 +36,7 @@ public class BeiSeSyncAppService : JitSeSyncAppService, IJobService
SyncDeliverBillType = EnumDeliverBjBmpBillType.北汽4S备件,
SyncDeliverSubBillTypes = new List
{
- EnumDeliverSubBillType.无
+ EnumDeliverSubBillType.北汽4S备件BBAC
},
BusinessType = EnumBusinessType.BeiJian
};
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/YinDuSeSyncAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/YinDuSeSyncAppService.cs
index a39dbfcb..0a81b555 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/YinDuSeSyncAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/YinDuSeSyncAppService.cs
@@ -36,7 +36,7 @@ public class YinDuSeSyncAppService : JitSeSyncAppService, IJobService
SyncDeliverBillType = EnumDeliverBjBmpBillType.印度件,
SyncDeliverSubBillTypes = new List
{
- EnumDeliverSubBillType.无
+ EnumDeliverSubBillType.印度件BBAC
},
BusinessType = EnumBusinessType.YinDuJian
};
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
index 8d16d0a5..2e53e2cf 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
@@ -562,8 +562,7 @@ namespace Win.Sfs.SettleAccount
///
private void CreateMapPriceListBJ()
{
- CreateMap()
- .ForMember(x => x.Date, y => y.MapFrom(y => DateTime.ParseExact(y.Date, "dd.MM.yyyy", System.Globalization.CultureInfo.CurrentCulture)));
+ CreateMap();
CreateMap().ReverseMap();
CreateMap().ReverseMap();
@@ -1128,37 +1127,6 @@ namespace Win.Sfs.SettleAccount
///
private void CreateMapSeSync()
{
- CreateMap()
- .ForMember(x => x.SeqNumber, y => y.MapFrom(d => d.Seq))
- .ForMember(x => x.AssemblyCode, y => y.MapFrom(d => d.MatchNumber))
- .ForMember(x => x.InjectionCode, y => y.MapFrom(d => d.UniqueCode))
- .ForMember(x => x.BeginDate, y => y.MapFrom(d => d.AssembleData))
- .ForMember(x => x.ShippingDate, y => y.MapFrom(d => d.BillTime))
- .ForMember(x => x.WmsBillNum, y => y.MapFrom(d => d.BillNum))
- .ForMember(x => x.LU, y => y.MapFrom(d => d.CustPartCode))
- .ForMember(x => x.FactoryPartCode, y => y.MapFrom(d => d.RealPartCode))
- .ForMember(x => x.PN, y => y.MapFrom(d => d.VinCode))
- .ForMember(x => x.Qty, y => y.MapFrom(d => d.Qty));
- CreateMap()
- .ForMember(x => x.SeqNumber, y => y.MapFrom(d => d.Seq))
- .ForMember(x => x.AssemblyCode, y => y.MapFrom(d => d.MatchNumber))
- .ForMember(x => x.InjectionCode, y => y.MapFrom(d => d.UniqueCode))
- .ForMember(x => x.BeginDate, y => y.MapFrom(d => d.AssembleData))
- .ForMember(x => x.ShippingDate, y => y.MapFrom(d => d.BillTime))
- .ForMember(x => x.WmsBillNum, y => y.MapFrom(d => d.BillNum))
- .ForMember(x => x.LU, y => y.MapFrom(d => d.CustPartCode))
- .ForMember(x => x.FactoryPartCode, y => y.MapFrom(d => d.RealPartCode))
- .ForMember(x => x.PN, y => y.MapFrom(d => d.VinCode))
- .ForMember(x => x.Qty, y => y.MapFrom(d => d.Qty));
- CreateMap()
- .ForMember(x => x.BeginDate, y => y.MapFrom(d => d.AssembleData))
- .ForMember(x => x.ShippingDate, y => y.MapFrom(d => d.BillTime))
- .ForMember(x => x.WmsBillNum, y => y.MapFrom(d => d.BillNum))
- .ForMember(x => x.LU, y => y.MapFrom(d => d.CustPartCode))
- .ForMember(x => x.FactoryPartCode, y => y.MapFrom(d => d.RealPartCode))
- .ForMember(x => x.PN, y => y.MapFrom(d => d.VinCode))
- .ForMember(x => x.Qty, y => y.MapFrom(d => d.Qty));
-
CreateMap()
.ForMember(x => x.SeqNumber, y => y.MapFrom(d => d.JISNum))
.ForMember(x => x.AssemblyCode, y => y.MapFrom(d => d.RealPartCode))
@@ -1168,7 +1136,7 @@ namespace Win.Sfs.SettleAccount
.ForMember(x => x.WmsBillNum, y => y.MapFrom(d => d.BillNum))
.ForMember(x => x.LU, y => y.MapFrom(d => d.CustPartCode))
.ForMember(x => x.FactoryPartCode, y => y.MapFrom(d => d.RealPartCode))
- .ForMember(x => x.PN, y => y.MapFrom(d => d.VinCode))
+ .ForMember(x => x.PN, y => y.MapFrom(d => d.OrderNum))
.ForMember(x => x.Qty, y => y.MapFrom(d => d.Qty));
CreateMap()
.ForMember(x => x.SeqNumber, y => y.MapFrom(d => d.JISNum))
@@ -1179,7 +1147,7 @@ namespace Win.Sfs.SettleAccount
.ForMember(x => x.WmsBillNum, y => y.MapFrom(d => d.BillNum))
.ForMember(x => x.LU, y => y.MapFrom(d => d.CustPartCode))
.ForMember(x => x.FactoryPartCode, y => y.MapFrom(d => d.RealPartCode))
- .ForMember(x => x.PN, y => y.MapFrom(d => d.VinCode))
+ .ForMember(x => x.PN, y => y.MapFrom(d => d.OrderNum))
.ForMember(x => x.Qty, y => y.MapFrom(d => d.Qty));
CreateMap()
.ForMember(x => x.BeginDate, y => y.MapFrom(d => d.BillTime))
@@ -1187,7 +1155,38 @@ namespace Win.Sfs.SettleAccount
.ForMember(x => x.WmsBillNum, y => y.MapFrom(d => d.BillNum))
.ForMember(x => x.LU, y => y.MapFrom(d => d.CustPartCode))
.ForMember(x => x.FactoryPartCode, y => y.MapFrom(d => d.RealPartCode))
- .ForMember(x => x.PN, y => y.MapFrom(d => d.VinCode))
+ .ForMember(x => x.PN, y => y.MapFrom(d => d.OrderNum))
+ .ForMember(x => x.Qty, y => y.MapFrom(d => d.Qty));
+
+ CreateMap()
+ .ForMember(x => x.SeqNumber, y => y.MapFrom(d => d.Seq))
+ .ForMember(x => x.AssemblyCode, y => y.MapFrom(d => d.MatchNumber))
+ .ForMember(x => x.InjectionCode, y => y.MapFrom(d => d.UniqueCode))
+ .ForMember(x => x.BeginDate, y => y.MapFrom(d => d.AssembleData))
+ .ForMember(x => x.ShippingDate, y => y.MapFrom(d => d.BillTime))
+ .ForMember(x => x.WmsBillNum, y => y.MapFrom(d => d.BillNum))
+ .ForMember(x => x.LU, y => y.MapFrom(d => d.CustPartCode))
+ .ForMember(x => x.FactoryPartCode, y => y.MapFrom(d => d.RealPartCode))
+ .ForMember(x => x.PN, y => y.MapFrom(d => d.JISNum))
+ .ForMember(x => x.Qty, y => y.MapFrom(d => d.Qty));
+ CreateMap()
+ .ForMember(x => x.SeqNumber, y => y.MapFrom(d => d.Seq))
+ .ForMember(x => x.AssemblyCode, y => y.MapFrom(d => d.MatchNumber))
+ .ForMember(x => x.InjectionCode, y => y.MapFrom(d => d.UniqueCode))
+ .ForMember(x => x.BeginDate, y => y.MapFrom(d => d.AssembleData))
+ .ForMember(x => x.ShippingDate, y => y.MapFrom(d => d.BillTime))
+ .ForMember(x => x.WmsBillNum, y => y.MapFrom(d => d.BillNum))
+ .ForMember(x => x.LU, y => y.MapFrom(d => d.CustPartCode))
+ .ForMember(x => x.FactoryPartCode, y => y.MapFrom(d => d.RealPartCode))
+ .ForMember(x => x.PN, y => y.MapFrom(d => d.JISNum))
+ .ForMember(x => x.Qty, y => y.MapFrom(d => d.Qty));
+ CreateMap()
+ .ForMember(x => x.BeginDate, y => y.MapFrom(d => d.AssembleData))
+ .ForMember(x => x.ShippingDate, y => y.MapFrom(d => d.BillTime))
+ .ForMember(x => x.WmsBillNum, y => y.MapFrom(d => d.BillNum))
+ .ForMember(x => x.LU, y => y.MapFrom(d => d.CustPartCode))
+ .ForMember(x => x.FactoryPartCode, y => y.MapFrom(d => d.RealPartCode))
+ .ForMember(x => x.PN, y => y.MapFrom(d => d.JISNum))
.ForMember(x => x.Qty, y => y.MapFrom(d => d.Qty));
CreateMap()
@@ -1196,7 +1195,7 @@ namespace Win.Sfs.SettleAccount
.ForMember(x => x.WmsBillNum, y => y.MapFrom(d => d.BillNum))
.ForMember(x => x.LU, y => y.MapFrom(d => d.CustPartCode))
.ForMember(x => x.FactoryPartCode, y => y.MapFrom(d => d.PartCode))
- .ForMember(x => x.PN, y => y.MapFrom(d => d.BillNum))
+ .ForMember(x => x.PN, y => y.MapFrom(d => d.DeliveryIndex))
.ForMember(x => x.Qty, y => y.MapFrom(d => d.Qty));
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SA.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SA.cs
index 846f1943..1d894db1 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SA.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SA.cs
@@ -153,4 +153,9 @@ public class BBAC_SA_DETAIL:SA_BASE
{
}
+
+ public void SetId(Guid id)
+ {
+ Id = id;
+ }
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SA.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SA.cs
index 1fd2efac..3d0c0e0d 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SA.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SA.cs
@@ -142,4 +142,9 @@ public class HBPO_SA_DETAIL : SA_BASE
public HBPO_SA_DETAIL()
{
}
+
+ public void SetId(Guid id)
+ {
+ Id = id;
+ }
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs
index 86988df7..90998ba1 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs
@@ -203,4 +203,6 @@ public enum EnumDeliverSubBillType
小件HBPO = 8,
JIT直供件BBAC = 9,
JIT直供件HBPO = 10,
+ 印度件BBAC = 11,
+ 北汽4S备件BBAC = 12,
}