更新版本

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs

@@ -48,6 +48,7 @@ using Win.Sfs.SettleAccount.Entities.Wms;
 using Win.Sfs.SettleAccount.Repository;
 using WY.NewJit.Extends.PaiGe.WMS;
 using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
+using SettleAccount.Job.Services;
 
 namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
 {
@@ -507,23 +508,29 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         [Authorize(SettleAccountPermissions.WMSJIT.Create)]
         public async Task<bool> WmsJitOutPutPass(WmsJitRequestDto input)
         {
-            //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
+            List<CustomCondition> customConditionList = new List<CustomCondition>();
-            //{
+            customConditionList.Add(new CustomCondition() { Name = "BillNum", Value = input.BillNum ?? string.Empty });
-            //    throw new BusinessException("8989", "填写过账日期应该为当月！");
+            customConditionList.Add(new CustomCondition() { Name = "Date", Value = input.AccountDate.ToString() });
-            //}
+
+            var _taskid = await _service.ExportEnqueueAsync("准时化出库服务"+input.BillNum, ExportExtentsion.Excel, input.Version, string.Empty, CurrentUser, typeof(FisOutputService), customConditionList, (rs) =>
+            {
+
+            });
+         
+
+
+
 
-            var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output]\n" +
-                          "		@billnum = N'{0}',\n" +
-                          "		@type = 0,\n" +
-                          "     @date = N'{1}'\n"+
-                          "SELECT	'Return Value' = @return_value";
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   string.Format(sql,input.BillNum,input.AccountDate.ToShortDateString())
-                 );
-            
-            
 
+            //var sql =     "DECLARE	@return_value int\n" +
+            //              "EXEC	@return_value = [dbo].[p_wms_output]\n" +
+            //              "		@billnum = N'{0}',\n" +
+            //              "		@type = 0,\n" +
+            //              "     @date = N'{1}'\n"+
+            //              "SELECT	'Return Value' = @return_value";
+            //    await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+            //       string.Format(sql,input.BillNum,input.AccountDate.ToShortDateString())
+            //     );
             return true;
         }
 

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

@@ -278,6 +278,8 @@ namespace Win.Sfs.SettleAccount
         {
             CreateMap<ErrorBill, ErrorBillDto>().ReverseMap();
             CreateMap<ErrorBill, ErrorBillRequestDto>().ReverseMap();
+            CreateMap<ErrorBill, ErrorBillImportDto>().ReverseMap();
+            CreateMap<ErrorBill, ErrorBillExportDto>().ReverseMap();
         }
 
         private void CreateMapWMSOutputSum()

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/WmsJitOutput/WmsJitOutputDapperRepository.cs

@@ -0,0 +1,48 @@
+using Dapper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories.Dapper;
+using Volo.Abp.EntityFrameworkCore;
+using Win.Sfs.SettleAccount.EntityFrameworkCore;
+using Win.Sfs.SettleAccount.Reports.InvoiceSettledDiffs;
+
+namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob
+{
+
+
+    /// <summary>
+    ///   1.大众发票与结算汇总核对表-UPdate
+    /// </summary>
+    public class WmsJitOutputDapperRepository : DapperRepository<UnInterfaceDbContext>, ITransientDependency
+    {
+        public WmsJitOutputDapperRepository(IDbContextProvider<UnInterfaceDbContext> dbContextProvider)
+       : base(dbContextProvider)
+        {
+        }
+        public virtual bool Execute(string billnum,string date)
+        {
+            string sqlString = 
+            "DECLARE\t@return_value int\n" +
+            "EXEC\t@return_value = [dbo].[p_wms_output_jit1]\n" +
+            "@billnum = N'{0}',\n" +
+            "@type = 1,\n" +
+            "@date = N'{1}'\n" +
+            "SELECT\t'Return Value' = @return_value\n";
+
+
+            string _sql = string.Format(sqlString, billnum,date);
+
+            var _query = DbConnection.ExecuteScalar(_sql,null,null,1200,System.Data.CommandType.StoredProcedure);
+
+
+            return true;
+        }
+
+
+
+    }
+}

src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/FisOutputService.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TaskJob.EventArgs;
+using TaskJob.Interfaces;
+using Volo.Abp.DependencyInjection;
+using Win.Sfs.SettleAccount.Reports.InvoiceSettledDiffs;
+using Win.Sfs.SettleAccount.Repository.SettleAccount;
+using Win.Sfs.SettleAccount.Repository.SettleAccountJob;
+
+namespace SettleAccount.Job.Services
+{
+    public class FisOutputService : ITransientDependency, IExportJob
+    {
+        private readonly InvoiceSettledDiffRepository _repository;
+        private readonly InvoiceSettledDiffVersionRepository _versionRepository;
+        private readonly WmsJitOutputDapperRepository _dapperRepository;
+        private readonly OutputService _outputService;
+        private readonly InputService _inputService;
+
+        public FisOutputService(
+            InvoiceSettledDiffRepository repository,
+            InvoiceSettledDiffVersionRepository versionRepository,
+            WmsJitOutputDapperRepository dapperRepository,
+            OutputService outputService,
+            InputService inputService
+            )
+        {
+            _inputService = inputService;
+            _outputService = outputService;
+            _repository = repository;
+            _versionRepository = versionRepository;
+            _dapperRepository=dapperRepository;
+        }
+
+        public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> p_list)
+        {
+            var billnum = p_list.Where(p => p.Name == "BillNum").FirstOrDefault().Value;
+
+            var date = p_list.Where(p => p.Name == "Date").FirstOrDefault().Value;
+       
+            var _ls= _dapperRepository.Execute(billnum,date);
+
+            return id.ToString();
+        }
+    }
+}

src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs

@@ -229,7 +229,13 @@ namespace Win.Sfs.SettleAccount
                     {
                         return implementationFactory.GetService<UnSettledSumService>();
                     }
+                    if (key.Equals(typeof(FisOutputService).FullName))
+                    {
+                        return implementationFactory.GetService<FisOutputService>();
+                    }
+
 
+                   
 
                     else
                     {