更新版本

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

@@ -80,22 +80,22 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             _excelImportService = excelImportService;
         }
 
-        [HttpPost]
+        //[HttpPost]
-        [Route("ExcelImport")]
+        //[Route("ExcelImport")]
-        [UnitOfWork(false)]
+        //[UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.PriceLists.Create)]
+        ////[Authorize(SettleAccountPermissions.PriceLists.Create)]
-        virtual public async Task<string> ImportAsync([FromForm] IFormFileCollection files, string version,string accountDate)
+        //virtual public async Task<string> ImportAsync([FromForm] IFormFileCollection files, string version,string accountDate)
-        {
+        //{
-            ExportImporter _exportImporter = new ExportImporter();
+        //    ExportImporter _exportImporter = new ExportImporter();
 
-            var result = await _exportImporter.UploadExcelImport<WmsOutputSumReport>(files, _excelImportService);
+        //    var result = await _exportImporter.UploadExcelImport<WmsOutputSumReport>(files, _excelImportService);
-            var _list = result.Where(p => p.实际出库数量 != 0).ToList();
+        //    var _list = result.Where(p => p.实际出库数量 != 0).ToList();
 
-            _dapper.InsertWmsSum(_list, version,DateTime.Parse(accountDate));
+        //    _dapper.InsertWmsSum(_list, version,DateTime.Parse(accountDate));
 
           
-            return ApplicationConsts.SuccessStr;
+        //    return ApplicationConsts.SuccessStr;
-        }
+        //}
         /// <summary>
         /// 准时化出库主表
         /// </summary>

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

@@ -104,10 +104,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 }
             }
             await _wmsRepository.GetDbContext().BulkInsertAsync(_lst);
-
             return ApplicationConsts.SuccessStr;
-
-
         }
 
 
@@ -147,18 +144,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
     
         virtual public async Task<string> ExportAsync(WmsRequestDetailReportDto input)
         {
-         
             var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
                  0, true);
             IExporter _excel = new ExcelExporter();
             byte[] result = null;
-
             var _fileName = string.Format("汇总合计报表_{0}.xlsx", Guid.NewGuid().ToString());
             result = await _excel.ExportAsByteArray(entities);
-
-
             result.ShouldNotBeNull();
-
             //保存导出文件到服务器存成二进制
             await _excelImportService.SaveBlobAsync(
                      new SaveExcelImportInputDto
@@ -168,9 +160,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                      }
                  );
             return _fileName;
-
-
-
         }
 
 

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

@@ -4297,6 +4297,13 @@
              <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
              <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.HQFactoryUnSettledDetailDiffExportService(Win.Sfs.SettleAccount.Reports.ReportRequestDto.HQKanbanRequestDto)">
+             <summary>
+            红旗未结核对
+             </summary>
+             <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
+             <returns></returns>
+        </member>
         <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.HQHSharePartSettledDetailDiffExportServiceMake(Win.Sfs.SettleAccount.Reports.ReportRequestDto.HQKanbanRequestDto)">
             <summary>
             红旗工厂备件明细

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

@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories.Dapper;
 using Volo.Abp.EntityFrameworkCore;
+using Win.Sfs.SettleAccount.Entities;
 
 namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 {
@@ -167,7 +168,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 
 
 
-        public virtual  void InsertWmsSum(List<WmsOutputSumReport> p_list,string version,DateTime accountDate)
+        public virtual  void InsertWmsSum(List<WmsDetailReport> p_list,string version,DateTime accountDate)
         {
             StringBuilder _buffer = new StringBuilder();
             var billnum ="S" +DateTime.Now.ToString("yyyyMMddhhmmss");
@@ -224,27 +225,27 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 
                 sql = string.Format(sql,
                     taskid,
-                    itm.行号,
+                    itm.LineNumber.ToString(),
-                    itm.结算单,
+                    itm.BillNum,
                     "ZKE1",
                     "1001",
                     "00",
-                    itm.销售渠道,
+                    itm.SaleCode,
-                    itm.客户代码,
+                    itm.ClientCode,
-                    itm.客户代码,
+                    itm.ClientCode,
-                    itm.结算编码,
+                    itm.SettleCode,
-                    itm.物料号,
+                    itm.MaterialCode,
                     "1000",
                     string.Empty,
-                    itm.已出库金额,
+                    itm.Price,
-                    itm.实际出库数量,
+                    itm.OutputQty,
                     
 
-                    itm.客户,
+                    itm.Client,
-                    itm.物料组编码,
+                    itm.MaterialGroupCode,
-                    itm.物料组车型,
+                    itm.MaterialGroup,
-                    itm.出库类型,
+                    itm.Type,
-                    itm.开票单价,
+                     itm.OutPutAmt,
                     "0",
                     billnum
 
@@ -281,7 +282,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
       "           , '{8}'    \n" +
       "           ,  {9}     )";
 
-             sql=   string.Format(sql,
+             sql=string.Format(sql,
                       taskid
                     , "TA_WMS_JSKH"
                     , count.ToString(),