up

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs

@@ -128,8 +128,8 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
         Site = bbacSaImportRequestDto.Site;
         Version = bbacSaImportRequestDto.Version;
         #region 导入数据转换、数据校验
-        ExportImporter _exportImporter = new ExportImporter();
+        var exportImporter = new ExportImporter();
-        var importDtos = await _exportImporter.UploadExcelImport<BBAC_SA_DETAIL_IMPORT_DTO>(bbacSaImportRequestDto.Files, _excelImportService).ConfigureAwait(false);
+        var importDtos = await exportImporter.UploadExcelImport<BBAC_SA_DETAIL_IMPORT_DTO>(bbacSaImportRequestDto.Files, _excelImportService).ConfigureAwait(false);
 
         importDtos.ForEach(importDto =>
         {
@@ -146,6 +146,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
         {
             importBBACSaDetail.Version = Version;
             importBBACSaDetail.Site = Site;
+            importBBACSaDetail.BusinessType = importBBACSaDetail.PN.Contains("R0") ? EnumBusinessType.MaiDanJianBBAC : EnumBusinessType.JisBBAC;
         });
 
         //数据校验
@@ -165,23 +166,23 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
         if (!checkList.Any())
         {
             //验证客户对应厂内零件号是否存在
-            //导入的零件号集合
+
-            var importPubSaLUs = importBBACSaDetails.Select(t => t.LU).Distinct();
+            var jisSaDetails = importBBACSaDetails.FindAll(t => t.BusinessType == EnumBusinessType.JisBBAC);
-            var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => importPubSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
+            var maiDanSaDetails = importBBACSaDetails.FindAll(t => t.BusinessType == EnumBusinessType.MaiDanJianHBPO);
-            var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct();
+            if (jisSaDetails.Any())
-
-            //不存在的客户零件号（差集）
-            var noExistSettleMaterialCodes = importPubSaLUs.Except(materialRelationshipEntitySettleMaterialCodes);
-            noExistSettleMaterialCodes.ForEach(t =>
             {
-                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty));
+                checkList.AddRange(await CheckAsync(jisSaDetails, EnumBusinessType.JisBBAC).ConfigureAwait(false));
-            });
+            }
+            if (maiDanSaDetails.Any())
+            {
+                checkList.AddRange(await CheckAsync(maiDanSaDetails, EnumBusinessType.MaiDanJianBBAC).ConfigureAwait(false));
+            }
         }
 
         if (checkList.Count > 0)
         {
             string fileName = await ExportErrorReportAsync(checkList).ConfigureAwait(false);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message= "错误提示文件已下载,请打开文件查看", fileName = fileName });
+            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = fileName });
         }
         #endregion
 
@@ -192,6 +193,32 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
 
         return new JsonResult(new { Code = 200, Message = "导入成功" });
     }
+
+    /// <summary>
+    /// 数据校验
+    /// </summary>
+    private async Task<List<ErrorExportDto>> CheckAsync(List<BBAC_SA_DETAIL> saDetails, EnumBusinessType businessType)
+    {
+        #region 数据校验
+        //数据校验
+        var checkList = new List<ErrorExportDto>();
+
+        //验证客户对应厂内零件号是否存在
+        //导入的零件号集合
+        var saLus = saDetails.Select(t => t.LU).Distinct();
+        var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == businessType && saLus.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
+        var settleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct();
+
+        //不存在的客户零件号（差集）
+        var noExistSettleMaterialCodes = saLus.Except(settleMaterialCodes);
+        noExistSettleMaterialCodes.ForEach(t =>
+        {
+            checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty));
+        });
+
+        return checkList;
+        #endregion
+    }
     #endregion
 
     #region CURD
@@ -400,7 +427,6 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
             bbacSaDetail.BillNum = bbacSaBillNum;
             bbacSaDetail.KeyCode = bbacSaDetail.PN + bbacSaDetail.LU;
             bbacSaDetail.CustomerPartCodeNoSpace = bbacSaDetail.LU.Replace(" ", "");
-            bbacSaDetail.BusinessType = bbacSaDetail.PN.Contains("R0") ? EnumBusinessType.MaiDanJianBBAC : _businessType;
         });
 
         //导入的零件号集合
@@ -408,7 +434,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
         //销售价格
 
         var priceListEntitys = GetPriceListEntitys(importPubSaLUs);
-        var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => importPubSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
+        var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => new List<EnumBusinessType> { EnumBusinessType.JisBBAC, EnumBusinessType.MaiDanJianBBAC }.Contains(t.BusinessType) && importPubSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
         bbacSaDetails.ForEach(bbacSaDetail =>
         {
             //根据物料号、结算日期获取价格
@@ -420,7 +446,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
                 .FirstOrDefault();
             bbacSaDetail.Price = priceListEntity?.Price ?? 0;
 
-            bbacSaDetail.PartCode = materialRelationshipEntitys.FirstOrDefault(t => t.SettleMaterialCode == bbacSaDetail.LU)?.ErpMaterialCode;
+            bbacSaDetail.PartCode = materialRelationshipEntitys.FirstOrDefault(t => t.BusinessType == bbacSaDetail.BusinessType && t.SettleMaterialCode == bbacSaDetail.LU)?.ErpMaterialCode;
         });
         #endregion
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs

@@ -371,7 +371,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
         var priceListEntitys = _priceListRepository.Where(t => t.IsCancel == false)
             .Where(t => t.ClientCode == "104T")
             .Where(t => importPubSaLUs.Contains(t.LU)).ToList();
-        var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => importPubSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
+        var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == BusinessType && importPubSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
         hbpoSaDetails.ForEach(hbpoSaDetail =>
         {
             //根据物料号、结算日期获取价格
@@ -485,7 +485,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
             //验证客户对应厂内零件号是否存在
             //导入的零件号集合
             var importSaLUs = hbpoSaDetails.Select(t => t.LU).Distinct();
-            var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => importSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
+            var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == BusinessType && importSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
             var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct();
 
             //不存在的客户零件号（差集）

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs

@@ -36,6 +36,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ;
 [Route("api/settleaccount/[controller]/[action]")]
 public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
 {
+    /// <summary>
+    /// DbContext
+    /// </summary>
+    public SettleAccountDbContext _settleAccountDbContext;
     /// <summary>
     /// PUB结算仓储 
     /// </summary>
@@ -76,7 +80,8 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
     /// <summary>
     /// 构造
     /// </summary>
-    public PUB_SA_SERVICE(INormalEfCoreRepository<PUB_SA, Guid> repository,
+    public PUB_SA_SERVICE(SettleAccountDbContext settleAccountDbContext,
+        INormalEfCoreRepository<PUB_SA, Guid> repository,
         INormalEfCoreRepository<PUB_SA_DETAIL, Guid> pubSaDetailRepository,
         INormalEfCoreRepository<PUB_CAN_SA, Guid> pubCanSaRepository,
         INormalEfCoreRepository<PUB_CAN_SA_DETAIL, Guid> pubCanSaDetailRepository,
@@ -91,6 +96,7 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
         ICommonManager commonManager
     ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
     {
+        _settleAccountDbContext = settleAccountDbContext;
         _repository = repository;
         _pubSaDetailRepository = pubSaDetailRepository;
         _pubCanSaRepository = pubCanSaRepository;
@@ -105,7 +111,7 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
     /// <summary>
     /// 期间
     /// </summary>
-    private int _version;
+    private int version;
     /// <summary>
     /// 业务类别
     /// </summary>
@@ -123,7 +129,7 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
     public async Task<IActionResult> ImportAsync([FromForm] PUB_SAImportRequestDto pubSaImportRequestDto)
     {
         IActionResult result = new JsonResult(new { Code = 400 });
-        _version = pubSaImportRequestDto.Version;
+        version = pubSaImportRequestDto.Version;
         businessType = pubSaImportRequestDto.BusinessType;
         site = pubSaImportRequestDto.Site;
         switch (pubSaImportRequestDto.BusinessType)
@@ -376,7 +382,7 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
             //验证客户对应厂内零件号是否存在
             //导入的零件号集合
             var importPubSaLUs = pubSaDetails.Select(t => t.LU).Distinct();
-            var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => importPubSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
+            var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == businessType && importPubSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
             var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct();
 
             //不存在的客户零件号（差集）
@@ -429,9 +435,6 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
     /// </summary>
     private async Task<IActionResult> InsertSaDataAsync(List<PUB_SA_DETAIL> pubSaDetails, EnumBusinessType businessType)
     {
-        //客户零件关系
-        var materialRelationships = new List<MaterialRelationship>();
-
         #region 处理结算数据
         for (var i = 0; i < pubSaDetails.Count; i++)
         {
@@ -439,7 +442,7 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
             pubSaDetail.SetId(GuidGenerator.Create());
             pubSaDetail.CustomerPartCodeNoSpace = pubSaDetail.LU.Replace(" ", "");
             pubSaDetail.KeyCode = pubSaDetail.PN + pubSaDetail.LU;
-            pubSaDetail.Version = _version;
+            pubSaDetail.Version = version;
             pubSaDetail.BusinessType = businessType;
             pubSaDetail.IndexNum = i;
         }
@@ -494,9 +497,8 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
 
         //导入的零件号集合
         var importPubSaLUs = pubSaDetails.Select(t => t.LU).Distinct();
-        var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => importPubSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
+        var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == businessType && importPubSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
 
-        var seAllMaterialRelationships = materialRelationshipEntitys.Union(materialRelationships);
         pubSaDetails.ForEach(pubSaDetail =>
         {
             pubSaDetail.PartCode = materialRelationshipEntitys.FirstOrDefault(t => t.SettleMaterialCode == pubSaDetail.LU)?.ErpMaterialCode;
@@ -505,10 +507,6 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
 
         #region 添加入库
         await SeDataEntryAsync(pubSaDetails).ConfigureAwait(false);
-        if (materialRelationships.Count > 0)
-        {
-            await _materialRelationshipRepository.InsertManyAsync(materialRelationships).ConfigureAwait(false);
-        }
         #endregion
 
         return new JsonResult(new { Code = 200, Message = "导入成功" });

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs

@@ -63,13 +63,13 @@ public class MaterialRelationshipAppService : SettleAccountApplicationBase<Mater
         if (_ls.Count > 0)
         {
             var query = from arc in _ls
-                        group arc by new { arc.ErpMaterialCode }
+                        group arc by new { arc.SettleMaterialCode }
                         into g
                         where g.Count() > 1
                         select g;
             foreach (var itm in query)
             {
-                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("厂内物料号{0}有重复", itm.Key.ErpMaterialCode), string.Empty));
+                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("客户物料号{0}有重复", itm.Key.SettleMaterialCode), string.Empty));
             }
         }
         if (checkList.Count > 0)