更新

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

@@ -293,18 +293,18 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 {
                     _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
                 }
-                _ls = _ls.Where(p => p.SockQty < p.OutputQty || p.Qty < p.OutputQty).ToList();
+                //_ls = _ls.Where(p => p.SockQty < p.OutputQty || p.Qty < p.OutputQty).ToList();
-                var checkList = new List<ErrorExportDto>();
+                //var checkList = new List<ErrorExportDto>();
-
+
-                foreach (var itm in _ls)
+                //foreach (var itm in _ls)
-                {
+                //{
-                    checkList.Add(new ErrorExportDto() { Message = string.Format("物料号:{0}出库数量大于结算数量或寄售库存数量!",itm.SapMaterialCode) });
+                //    checkList.Add(new ErrorExportDto() { Message = string.Format("物料号:{0}出库数量大于结算数量或寄售库存数量!",itm.SapMaterialCode) });
-                }
+                //}
-                if (checkList.Count > 0)
+                //if (checkList.Count > 0)
-                {
+                //{
-
+
-                    return await ExportErrorReportAsync(checkList,"校验失败.xlsx");
+                //    return await ExportErrorReportAsync(checkList,"校验失败.xlsx");
-                }
+                //}
 
                 if (_ls.Count() > 0)
                 {

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

@@ -62,7 +62,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
                 string tablestr = (_count == 0) ?
                   "		( SELECT * FROM Set_Settle b WHERE b.Version = '{0}' ) b\n" :
 
-                 " (SELECT count(1) lincount FROM [Set_Settle_RAM] WITH(SNAPSHOT) where Version = '{0}') b  \n";
+                 " (SELECT * FROM [Set_Settle_RAM] WITH(SNAPSHOT) where Version = '{0}') b  \n";