添加备件导出零件时间，备件添加地点信息

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

@@ -137,6 +137,7 @@ namespace Win.Sfs.SettleAccount.Bases
         //[Route("mainquery")]
         public virtual async Task<PagedResultDto<TEntityDto>> MainQueryAsync(TRequestMainInput input)
         {
+
             var entitys = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount).ConfigureAwait(false);
             var totalCount = await _repository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false);
             var dtos = ObjectMapper.Map<List<TEntity>, List<TEntityDto>>(entitys);

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

@@ -442,6 +442,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     bj.PN = itm.GetProperty("PN", "");//
                     bj.PO = itm.GetProperty("PO", "");
                     bj.ProductionGroup = itm.GetProperty("PartGroup", "");
+                    bj.SettleDate=DateTime.Parse(itm.GetProperty("SettleDate", ""));
                     bj.LineCode = itm.LineCode;
                     bj.BeginDate = itm.BeginDate;
                     bj.EndDate = itm.EndDate;
@@ -490,7 +491,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                                 SettleDate = itm.SettleDate,
                                 ProductionGroup = itm.ProductionGroup,
                                 LineCode = itm.LineCode,
-                                ContractID = itm.ContractID
+                                ContractID = itm.ContractID,
+                               
 
 
                             };

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

@@ -49,11 +49,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             INormalEfCoreRepository<PUB_CAN_SA, Guid> repository,
             INormalEfCoreRepository<PUB_CAN_SA_DETAIL, Guid> detailRepository,
             INV_MNG invmng,
-             INormalEfCoreRepository<PriceList, Guid> priceRepository,
+            INormalEfCoreRepository<PriceList, Guid> priceRepository,
             INormalEfCoreRepository<PriceListBJ, Guid> pricebjRepository,
-             PUB_CAN_SA_MNG pubMng,
+            PUB_CAN_SA_MNG pubMng,
-             BaseDomainService baseservice,
+            BaseDomainService baseservice,
-             INormalEfCoreRepository<PUB_NOT_SA_DETAIL, Guid> notRepository
+            INormalEfCoreRepository<PUB_NOT_SA_DETAIL, Guid> notRepository
 
         ) : base(excelImportService, snowflakeIdGenerator, commonManager, repository, detailRepository, invmng, baseservice)
         {

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

@@ -360,9 +360,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
         /// <returns></returns>
         public virtual async Task<bool> ReceivedAsync(List<string> p_invs)
         {
-
             var invList = _repository.Where(p => p_invs.Contains(p.InvbillNum)).ToList();//所有提交发票信息
-  
             int count = invList.Select(p => p.InvGroupNum).Distinct().Count();
             if (count > 1)
             {
@@ -1195,10 +1193,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                 copyDic.Add(itm.GroupNum, itm.Amt);
 
             }
-
-            
-
-
             Dictionary<string, List<string>> invoiceMap = new Dictionary<string, List<string>>();
             var first=p_list.FirstOrDefault();
             foreach (var itm in dic)
@@ -2257,7 +2251,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                                     PO= inv1.GetProperty("PO", ""),
                                     DeliveryIndexNumber = inv1.GetProperty("DeliveryIndexNumber", ""),//交付索引号
                                     PartName = inv1.GetProperty("PartName", ""),//零件名称
-                                    PartGroup=inv1.GetProperty("CommodityGroup","")
+                                    PartGroup=inv1.GetProperty("CommodityGroup",""),
+                                    SettleDate=inv1.GetProperty("SettleDate", "")
 
                                 };
 
@@ -2313,6 +2308,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                         entity.SetProperty("PartName", detail.PartName);//零件名称
                         entity.SetProperty("PartGroup", detail.PartGroup);
                         entity.SetProperty("PN", detail.PN);
+                        entity.SetProperty("SettleDate", detail.SettleDate);
+                        
                         _entityDetailList.Add(entity);
                     }
                     if (_entityDetailList.Count > 0)
@@ -2337,6 +2334,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                        clientCode: string.Empty,
                        realAmt: readAmt
                        );
+                    invbill.Site = "1049";
                     invbill.CreationTime = DateTime.Now;
                     invbill.ClientCode = "C001";
                     invlist.Add(invbill);