更新版本

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

@@ -188,7 +188,7 @@ namespace Win.Sfs.SettleAccount.Bases
                                 PRICE = itm.PRICE,
                                 Qty = itm.Qty,
                                 Amt = itm.Amt,
-                                BussiessType = itm.BussiessType,
+                           
                                 Extend1 = itm.Extend1,
                                 BeginDate = itm.BeginDate,
                                 EndDate = itm.EndDate,

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

@@ -2,6 +2,7 @@
 using DocumentFormat.OpenXml.Bibliography;
 using DocumentFormat.OpenXml.Drawing.Charts;
 using DocumentFormat.OpenXml.Office2010.Excel;
+using EFCore.BulkExtensions;
 using Magicodes.ExporterAndImporter.Core;
 using Magicodes.ExporterAndImporter.Csv;
 using Magicodes.ExporterAndImporter.Excel;
@@ -19,7 +20,9 @@ using System.Text;
 using System.Threading.Tasks;
 using TaskJob.EventArgs;
 using TaskJob.Services;
+using Volo.Abp;
 using Volo.Abp.Application.Dtos;
+using Volo.Abp.Uow;
 using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.CommonManagers;
@@ -28,6 +31,7 @@ using Win.Sfs.SettleAccount.Entities.BQ;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 using Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 using Win.Sfs.SettleAccount.Entities.BQ.Vmi;
+using Win.Sfs.SettleAccount.Entities.TaskJobs;
 using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.SettleAccount.ExportReports;
 using Win.Sfs.Shared.RepositoryBase;
@@ -50,7 +54,7 @@ namespace Win.Sfs.SettleAccount.Bases
         protected readonly INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> _bbacSecRepository;
         protected readonly INormalEfCoreRepository<HBPO_SEC_DETAIL, Guid> _hbpoSecRepository;
         protected readonly INormalEfCoreRepository<PUB_SEC_DETAIL, Guid> _pubSecRepository;
-
+        private readonly TaskJobService _service;
         public PD_SERVICE(
 
             INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> bbacSecRepository,
@@ -61,9 +65,11 @@ namespace Win.Sfs.SettleAccount.Bases
             ICommonManager commonManager,
             INormalEfCoreRepository<TEntity, Guid> repository,
             VmiAppService vimservice,
-            INormalEfCoreRepository<TEntityDetail, Guid> detailRepository
+            INormalEfCoreRepository<TEntityDetail, Guid> detailRepository,
+            TaskJobService service
             ) : base(excelImportService, snowflakeIdGenerator, commonManager)
         {
+            _service = service;
             _vimservice = vimservice;
             _repository = repository;
             _detailRepository = detailRepository;
@@ -127,18 +133,17 @@ namespace Win.Sfs.SettleAccount.Bases
             return _fileName;
         }
         [HttpPost]
-        //[Route("generateinvoice")]
+        [UnitOfWork(false)]
         public virtual async Task<string> ApprovalPassed(List<string> p_list)
         {
-
-
-
-
-
-
-            return ApplicationConsts.SuccessStr;
+            return await InvokePD(p_list, _service, false);
+        }
+        [HttpPost]
+        [UnitOfWork(false)]
+        public virtual async Task<string> RejectAsync(List<string> p_list)
+        {
+            return await InvokePD(p_list, _service, true);
         }
-
 
 
         protected async Task<string> InvokePD(List<string> p_list, TaskJobService p_service, bool isback=false)
@@ -214,16 +219,7 @@ namespace Win.Sfs.SettleAccount.Bases
             var dtos = ObjectMapper.Map<List<TEntity>, List<TEntityDto>>(entitys);
             return new PagedResultDto<TEntityDto>(totalCount, dtos);
         }
-        /// <summary>
-        /// 退回
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public virtual async Task<string> RejectAsync(List<string> p_list)
-        {
-            return ApplicationConsts.SuccessStr;
-        }
+       
         protected virtual async Task<TEntity> GetMainAsync([FromBody] string billNum)
         {
             return await _repository.Where(p => p.InvGroupNum == billNum).FirstOrDefaultAsync().ConfigureAwait(false);

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -31,29 +31,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         BBAC_PD_DETAIL_REQ_DTO, BBAC_PD_DETAIL_EXP_DTO>
     {
 
-        private readonly TaskJobService _service;
-        public BBAC_PD_SERVICE(INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> bbacSecRepository, INormalEfCoreRepository<HBPO_SEC_DETAIL, Guid> hbpoSecRepository, INormalEfCoreRepository<PUB_SEC_DETAIL, Guid> pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<BBAC_PD, Guid> repository, VmiAppService vimservice,
-            INormalEfCoreRepository<BBAC_PD_DETAIL, Guid> detailRepository,
-            TaskJobService service
 
-            ) :
-            base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository)
-        {
-            _service = service;
-        }
-        [UnitOfWork(false)]
-        public override async Task<string> ApprovalPassed(List<string> p_list)
-        {
-            return await InvokePD(p_list, _service,  false);
-        
-        }
 
-        [UnitOfWork(false)]
-        public override async Task<string> RejectAsync(List<string> p_list)
-        {
-            return await InvokePD(p_list, _service, true);
 
-        }
         //[HttpPost]
         //public virtual async Task<string> RejectAsync(List<string> p_list)
         //{
@@ -79,6 +59,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         //    return _taskid;
 
         //}
-
+        public BBAC_PD_SERVICE(INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> bbacSecRepository, INormalEfCoreRepository<HBPO_SEC_DETAIL, Guid> hbpoSecRepository, INormalEfCoreRepository<PUB_SEC_DETAIL, Guid> pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<BBAC_PD, Guid> repository, VmiAppService vimservice, INormalEfCoreRepository<BBAC_PD_DETAIL, Guid> detailRepository, TaskJobService service) : base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository, service)
+        {
+        }
     }
 }

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -25,23 +25,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         HBPO_PD_DETAIL, HBPO_PD_DETAIL_DTO, HBPO_PD_REQ_DTO,
         HBPO_PD_DETAIL_REQ_DTO, HBPO_PD_DETAIL_EXP_DTO>
     {
-        private readonly TaskJobService _service;
-        public HBPO_PD_SERVICE(INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> bbacSecRepository, INormalEfCoreRepository<HBPO_SEC_DETAIL, Guid> hbpoSecRepository, INormalEfCoreRepository<PUB_SEC_DETAIL, Guid> pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<HBPO_PD, Guid> repository, VmiAppService vimservice, INormalEfCoreRepository<HBPO_PD_DETAIL, Guid> detailRepository, TaskJobService service) : base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository)
+        public HBPO_PD_SERVICE(INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> bbacSecRepository, INormalEfCoreRepository<HBPO_SEC_DETAIL, Guid> hbpoSecRepository, INormalEfCoreRepository<PUB_SEC_DETAIL, Guid> pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<HBPO_PD, Guid> repository, VmiAppService vimservice, INormalEfCoreRepository<HBPO_PD_DETAIL, Guid> detailRepository, TaskJobService service) : base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository, service)
         {
-            _service = service;
         }
-
-        [UnitOfWork(false)]
-        public override async Task<string> ApprovalPassed(List<string> p_list)
-        {
-            return await InvokePD(p_list, _service, false);
-        }
-        [UnitOfWork(false)]
-        public override async Task<string> RejectAsync(List<string> p_list)
-        {
-            return await InvokePD(p_list, _service, true);
-        }
-
-
     }
 }

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

@@ -199,14 +199,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     bj.PartCode = itm.PartCode;
                     bj.PRICE = itm.PRICE;
           
-                    bj.InvGroupNum =         itm.InvGroupNum;
-                    bj.DeliveryNumber=       itm.GetProperty("DeliveryNumber", "");//交货号
-                    bj.InvbillNum =          itm.GetProperty("InvoiceNumber", "");//发票号
-                    bj.VendorCode =          itm.GetProperty("VendorCode", "");//供应商代码
-                    bj.VendorName =          itm.GetProperty("VendorName", "");//供应商名称
-                    bj.PurchaseOrderNumber = itm.GetProperty("PurchaseOrderNumber", "");//采购订单号
-                    bj.DeliveryIndexNumber = itm.GetProperty("DeliveryIndexNumber", "");//交付索引号
-                    bj.PartName = itm.GetProperty("PartName", "");//零件名称
+                    //bj.InvGroupNum =         itm.InvGroupNum;
+                    //bj.DeliveryNumber=       itm.GetProperty("DeliveryNumber", "");//交货号
+                    //bj.InvbillNum =          itm.GetProperty("InvoiceNumber", "");//发票号
+                    //bj.VendorCode =          itm.GetProperty("VendorCode", "");//供应商代码
+                    //bj.VendorName =          itm.GetProperty("VendorName", "");//供应商名称
+                    //bj.PurchaseOrderNumber = itm.GetProperty("PurchaseOrderNumber", "");//采购订单号
+                    //bj.DeliveryIndexNumber = itm.GetProperty("DeliveryIndexNumber", "");//交付索引号
+                    //bj.PartName = itm.GetProperty("PartName", "");//零件名称
                 }
 
                 //var BMap = ObjectMapper.Map<List<INVOICE_WAIT_DETAIL>, List<INVOICE_WAIT_DETAIL_BJ_DTO>>(B);

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -26,24 +26,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         PUB_PD_DETAIL, PUB_PD_DETAIL_DTO, PUB_PD_REQ_DTO,
         PUB_PD_DETAIL_REQ_DTO, PUB_PD_DETAIL_EXP_DTO>
     {
-        private readonly TaskJobService _service;
-        public PUB_PD_SERVICE(INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> bbacSecRepository, INormalEfCoreRepository<HBPO_SEC_DETAIL, Guid> hbpoSecRepository, INormalEfCoreRepository<PUB_SEC_DETAIL, Guid> pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<PUB_PD, Guid> repository, VmiAppService vimservice, INormalEfCoreRepository<PUB_PD_DETAIL, Guid> detailRepository, TaskJobService service) : base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository)
+        public PUB_PD_SERVICE(INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> bbacSecRepository, INormalEfCoreRepository<HBPO_SEC_DETAIL, Guid> hbpoSecRepository, INormalEfCoreRepository<PUB_SEC_DETAIL, Guid> pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<PUB_PD, Guid> repository, VmiAppService vimservice, INormalEfCoreRepository<PUB_PD_DETAIL, Guid> detailRepository, TaskJobService service) : base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository, service)
         {
-            _service = service;
-        }
-        [UnitOfWork(false)]
-        public override async Task<string> ApprovalPassed(List<string> p_list)
-        {
-            return await InvokePD(p_list, _service, false);
-        }
-        [UnitOfWork(false)]
-        public override async Task<string> RejectAsync(List<string> p_list)
-        {
-            return await InvokePD(p_list, _service, true);
-        }
-
-
-
         }
     }
 }