JisBBAC结算

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SA_DTO.cs

@@ -85,7 +85,7 @@ public class BBAC_SA_DETAIL_IMPORT_DTO
     /// 数量
     /// </summary>
     [Display(Name = "结算数量")]
-    [ImporterHeader(Name = "Qty")]
+    [ImporterHeader(IsIgnore = true)]
     public decimal Qty { get; set; }
 
     /// <summary>

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

@@ -113,18 +113,19 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
     {
         #region 导入数据转换、数据校验
         ExportImporter _exportImporter = new ExportImporter();
-        var result = await _exportImporter.UploadExcelImport<BBAC_SA_DETAIL_IMPORT_DTO>(files, _excelImportService);
-        var importHBOPSaDetails = ObjectMapper.Map<List<BBAC_SA_DETAIL_IMPORT_DTO>, List<BBAC_SA_DETAIL>>(result);
+        var importDtos = await _exportImporter.UploadExcelImport<BBAC_SA_DETAIL_IMPORT_DTO>(files, _excelImportService);
 
-        //Site包含CN1 亦庄
-        //Site包含CN5 顺义
-        var importCN1HBOPSaDetails = importHBOPSaDetails.FindAll(t => t.Site.Contains("CN1"));
-        var importCN5HBOPSaDetails = importHBOPSaDetails.FindAll(t => t.Site.Contains("CN5"));
+        //买单件BBAC
+        var importMaiDanJianHBOPDtos = importDtos.FindAll(t => t.PN.Contains("R0"));
+        //JisBBAC
+        var importHBOPDtos = importDtos.FindAll(t => t.PN.Contains("R0") == false);
+
+        var importBBACSaDetails = ObjectMapper.Map<List<BBAC_SA_DETAIL_IMPORT_DTO>, List<BBAC_SA_DETAIL>>(importHBOPDtos);
 
         //数据校验
         var checkList = new List<ErrorExportDto>();
         //结算分组号
-        var bbacSaGroupNums = importHBOPSaDetails.Select(t => t.GroupNum).Distinct();
+        var bbacSaGroupNums = importBBACSaDetails.Select(t => t.GroupNum).Distinct();
         //已存在的结算分组号
         var havBBACSaGroupNums = (await _bbacSaDetailRepository.GetListAsync(t => bbacSaGroupNums.Contains(t.GroupNum))).Select(t => t.GroupNum).Distinct();
         if (havBBACSaGroupNums.Any() == true)
@@ -141,13 +142,9 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
         }
         #endregion
 
-        if (importCN1HBOPSaDetails.Any())
-        {
-            await SaDataHandleAsync(importCN1HBOPSaDetails, "CN1");
-        }
-        if (importCN5HBOPSaDetails.Any())
+        if (importBBACSaDetails.Any())
         {
-            await SaDataHandleAsync(importCN5HBOPSaDetails, "CN5");
+            //await SaDataHandleAsync(importBBACSaDetails);
         }
 
         return ApplicationConsts.SuccessStr;
@@ -287,7 +284,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
     /// <summary>
     /// 结算数据处理
     /// </summary>
-    private async Task SaDataHandleAsync(List<BBAC_SA_DETAIL> bbacSaDetails, string site)
+    private async Task SaDataHandleAsync(List<BBAC_SA_DETAIL> bbacSaDetails)
     {
         //结算单号
         var bbacSaBillNum = OrderNumberGenerator.GenerateOrderNumber("SA");
@@ -296,7 +293,6 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
         {
             BillNum = bbacSaBillNum,
             State = "1",
-            Site = site,
         };
         //可结算单号
         var bbacCanSaBillNum = OrderNumberGenerator.GenerateOrderNumber("C");
@@ -306,8 +302,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
             BillNum = bbacCanSaBillNum,
             SettleBillNum = bbacSaBillNum,
             State = SettleBillState.未结状态,
-            BusinessType = _businessType,
-            Site = site,
+            BusinessType = _businessType
         };
         //可结算明细
         var bbacCanSaDetails = new List<BBAC_CAN_SA_DETAIL>();

code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs

@@ -142,6 +142,8 @@ namespace Win.Sfs.SettleAccount
 
             CreateMapBBAC_SE_DETAIL();
             CreateMapBBAC_SE_EDI();
+            CreateMapBBAC_SA();
+            CreateMapBBAC_SA_DETAIL();
 
             CreateMapHBPO_SE_DETAIL();
             CreateMapHBPO_SE_EDI();
@@ -952,6 +954,27 @@ namespace Win.Sfs.SettleAccount
             CreateMap<BBAC_SE_EDI, BBAC_SE_EDI_EXPORT_DTO>();
         }
 
+        /// <summary>
+        /// BBAC结算
+        /// </summary>
+        private void CreateMapBBAC_SA()
+        {
+            CreateMap<BBAC_SA, BBAC_SA_DTO>();
+        }
+
+        /// <summary>
+        /// BBAC结算明细
+        /// </summary>
+        private void CreateMapBBAC_SA_DETAIL()
+        {
+            CreateMap<BBAC_SA_DETAIL, BBAC_CAN_SA_DETAIL>()
+                .ForMember(x => x.SettleBillNum, y => y.MapFrom(d => d.BillNum));
+            CreateMap<BBAC_SA_DETAIL, BBAC_NOT_SA_DETAIL>()
+                .ForMember(x => x.SettleBillNum, y => y.MapFrom(d => d.BillNum));
+
+            CreateMap<BBAC_SA_DETAIL_IMPORT_DTO, BBAC_SA_DETAIL>();
+        }
+
         /// <summary>
         /// HBPO发运单
         /// </summary>