更新版本

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

@@ -289,19 +289,19 @@ namespace Win.Sfs.SettleAccount.Bases
         //[Route("mainquery")]
         public virtual async Task<PagedResultDto<TEntityDto>> MainQueryAsync(TRequestMainInput input)
         {
-            var invs= await _invRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount).ConfigureAwait(false);
+            //var invs= await _invRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount).ConfigureAwait(false);
-            var invbills = invs.Select(p => p.InvbillNum).ToList();
+            //var invbills = invs.Select(p => p.InvbillNum).ToList();
 
             var entitys = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount).ConfigureAwait(false);
 
-             entitys=entitys.Where(p => invbills.Contains(p.BillNum)).ToList();
+            // entitys=entitys.Where(p => invbills.Contains(p.BillNum)).ToList();
 
             var totalCount = await _repository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false);
             var dtos = ObjectMapper.Map<List<TEntity>, List<TEntityDto>>(entitys);
 
 
            
-            dtos = dtos.Where(p => invbills.Contains(p.BillNum)).ToList();
+           // dtos = dtos.Where(p => invbills.Contains(p.BillNum)).ToList();
 
 
 

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

@@ -98,6 +98,11 @@ namespace SettleAccount.Bases
         [Display(Name = "地点")]
         public virtual string Site { get; set; }
 
+        [Display(Name = "业务类型")]
+        public virtual EnumBusinessType BusinessType { get; set; }
+
+
+
     }
 
     public interface ISA_BASE : ISBASE

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD.cs

@@ -40,5 +40,9 @@ namespace SettleAccount.Domain.BQ
             InvGroupNum = invGroupNum;
             Site = site;
         }
+        public void SetBusinessType(EnumBusinessType enumBusinessType)
+        {
+            BusinessType = enumBusinessType;
+        }
     }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_PD.cs

@@ -40,5 +40,9 @@ namespace SettleAccount.Domain.BQ
             InvGroupNum = invGroupNum;
             Site = site;
         }
+        public void SetBusinessType(EnumBusinessType enumBusinessType)
+        {
+            BusinessType = enumBusinessType;
+        }
     }
 }

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

@@ -502,8 +502,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                         settleBillNum: itm.InvGroupNum,
                         state: SettleBillState.客户已收票,
                         invGroupNum: itm.InvGroupNum,
-                        site: string.Empty
+                        site: itm.Site
+
+                        
                         );
+                    bbac.SetBusinessType(itm.BusinessType);
                     bbacmainlist.Add(bbac);
                 }
                 var bbacDetail = new List<BBAC_PD_DETAIL>();
@@ -662,8 +665,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                         settleBillNum: itm.InvGroupNum,
                         state: SettleBillState.客户已收票,
                         invGroupNum: itm.InvGroupNum,
-                        site: string.Empty
+                        site: itm.Site
                         );
+                    bbac.SetBusinessType(itm.BusinessType);
                     bbacmainlist.Add(bbac);
                 }
                 var bbacDetail = new List<HBPO_PD_DETAIL>();
@@ -825,10 +829,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                         settleBillNum: itm.InvGroupNum,
                         state: SettleBillState.客户已收票,
                         invGroupNum: itm.InvGroupNum,
-                        site: string.Empty
+                        site: itm.Site
                        
                         
                         );
+                    pub.SetBusinessType(itm.BusinessType);
                     bbacmainlist.Add(pub);
 
                 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_PD.cs

@@ -40,5 +40,9 @@ namespace SettleAccount.Domain.BQ
             InvGroupNum = invGroupNum;
             Site = site;
         }
+        public void SetBusinessType(EnumBusinessType enumBusinessType)
+        {
+            BusinessType = enumBusinessType;
+        }
     }
 }