更新版本

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsDetailReportDto.cs

@@ -10,6 +10,8 @@ namespace Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput
 {
     public class WmsRequestDetailReportDto: RequestDtoBase
     {
+        [Display(Name = "版本")]
+        public string Version { set; get; }
         [Display(Name = "行号")]
         public int LineNumber { set; get; }
         [Display(Name = "客户")]

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

@@ -113,6 +113,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
         virtual public async Task<PagedResultDto<WmsDetailDiffReport>> GetListAsync(WmsRequestDetailReportDto input)
         {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
             var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
                  input.SkipCount, true);
             var totalCount = await GetCountAsync(input);
@@ -122,11 +123,17 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
         private async Task<long> GetCountAsync(WmsRequestDetailReportDto input)
         {
-           // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
+           
             return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
         }
+        [HttpPost]
+        [Route("Sync")]
 
-
+        public virtual async Task<bool> SyncInterface()
+        {
+            //_wmsRepository.Where(p => p.BillNum ==)
+            return true;
+        }
         //[HttpPost]
         //[Route("Output")]
 
@@ -155,7 +162,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                  0, true);
             IExporter _excel = new ExcelExporter();
             byte[] result = null;
-            var _fileName = string.Format("汇总合计报表_{0}.xlsx", Guid.NewGuid().ToString());
+            var _fileName = string.Format("差异清单报表_{0}.xlsx", Guid.NewGuid().ToString());
             result = await _excel.ExportAsByteArray(entities);
             result.ShouldNotBeNull();
             //保存导出文件到服务器存成二进制

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

@@ -122,6 +122,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
         virtual public async Task<PagedResultDto<WmsDetailReport>> GetListAsync(WmsRequestDetailReportDto input)
         {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
             var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
                  input.SkipCount, true);
             var totalCount = await GetCountAsync(input);
@@ -135,7 +136,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
-        [Route("version")]
+        [Route("Version")]
 
         virtual public async Task<List<string>> GetVersionListAsync()
         {
@@ -145,10 +146,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         }
 
 
-
-
-
-
         private async Task<long> GetCountAsync(WmsRequestDetailReportDto input)
         {
            // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });

src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml

@@ -3012,6 +3012,20 @@
             <param name="input"></param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WMSOutputDetailDiffReportAppService.#ctor(Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report.WmsOutputSumDapperRepository,Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WmsDetailDiffReport,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.TaskJob,System.Guid},Win.Sfs.BaseData.ImportExcelCommon.IExcelImportAppService,Volo.Abp.Caching.IDistributedCache{Win.Sfs.SettleAccount.Entities.WmsDetailDiffReport},Win.Abp.Snowflakes.ISnowflakeIdGenerator,Win.Sfs.SettleAccount.CommonManagers.ICommonManager,Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report.ErpSumOutputDapperRepository)">
+            <summary>
+            
+            </summary>
+            <param name="wmsRepository"></param>
+            <param name="job"></param>
+        </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WMSOutputDetailDiffReportAppService.GetListAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput.WmsRequestDetailReportDto)">
+            <summary>
+            Wms汇总合计明细
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.WMS.WmsHQCarAppService">
             <summary>
             wms出库-一汽轿车
@@ -3631,6 +3645,13 @@
             <param name="input"></param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WMSOutputSumReportAppService.GetVersionListAsync">
+            <summary>
+            Wms汇总合计明细
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.FISes.FISAppService">
             <summary>
             区域相关应用服务

src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/InvoiceSettledDiffs/InvoiceSettledDiff.cs

@@ -103,6 +103,10 @@ namespace Win.Sfs.SettleAccount.Reports.InvoiceSettledDiffs
 
         [ExporterHeader(DisplayName = "版本", IsIgnore = true)]
         public string Version { set; get; }
+
+
+        [ExporterHeader(DisplayName = "未结期间", IsIgnore = true)]
+        public string UnSettleVersion { set; get; }
         //总金额差异
         //[ExporterHeader(DisplayName = "总金额差异")]
         //public decimal AmtDiffPrice { set; get; }

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs

@@ -100,7 +100,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
     "		0 DiffSettleFisQty,\n" +
     "		0 DiffSettleInvQty, \n" +
     "		a.Qty InvoiceQty ,\n" +
-    "       IsNull( B.Qty, 0 ) SettleReadyQty \n" +
+    "       IsNull( B.Qty, 0 ) SettleReadyQty, \n" +
+    "       a.UnSettleVersion                  \n" +
     "	FROM\n" +
     tablestr +