diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs index 3973b4be..401548ba 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -47,6 +47,7 @@ using Win.Sfs.SettleAccount.Entities.WMS; using Win.Sfs.SettleAccount.Entities.Wms; using Win.Sfs.SettleAccount.Repository; using WY.NewJit.Extends.PaiGe.WMS; +using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; namespace Win.Sfs.SettleAccount.Entities.SettleAccounts { @@ -54,16 +55,16 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts /// wms出库 /// - //[AllowAnonymous] + [AllowAnonymous] [Route("api/settleaccount/wmsSharePartoutput")] - [Authorize(SettleAccountPermissions.WMSJIT.Default)] + //[Authorize(SettleAccountPermissions.WMSJIT.Default)] public class WMSSharePartAppService : SettleAccountApplicationBase { private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; private readonly WMSEfCoreRepository _wmsefRespository; - + private readonly WmsDapperRepository _wmsDapper; private readonly WMSEfCoreRepository _wmstbRespository; private readonly ISettleAccountBranchEfCoreRepository _job; private readonly IExcelImportAppService _excelImportService; @@ -87,7 +88,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts IExcelImportAppService excelImportService, IDistributedCache cache, ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager + ICommonManager commonManager, + WmsDapperRepository wmsDapper ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) { _excelImportService = excelImportService; @@ -95,6 +97,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts _wmstbRespository = wmstbRespository; _wmsRepository = wmsRepository; _wmsVersionRepository = wmsVersionRepository; + _wmsDapper = wmsDapper; _wmsefRespository = wmsefRespository; } @@ -136,15 +139,43 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts /// [HttpPost] [Route("WmsSharePartDetailList")] + [UnitOfWork(false)] //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] virtual public async Task> GetListAsync(WmsSharePartOutPutDetialRequestDto input) { input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true); + var stockList = _wmsDapper.GetSalesStock(); + var query = from itm in entities + join itm1 in stockList on itm.MaterialCode equals itm1.SapCode + into temp1 + from tm1 in temp1.DefaultIfEmpty() + select new WmsSharePartOutPutDetial(//少加个发货，由于零件有重复 + itm.Id, + itm.WmsBillNum, + itm.OrderBillNum, + itm.MaterialCode, + itm.MaterialDesc, + itm.MaterialGroup, + itm.OutPut, + itm.InPut, + itm.State, + itm.Extend1, + itm.Extend2, + itm.Version, + itm.ParentMaterialCode, + itm.BillNum, + itm.TaskId, + itm.Remark, + itm.Qty, + tm1 == null ? 0 : tm1.Qty, + itm.OutPutQty + ); + var totalCount = await GetCountAsync(input); - return new PagedResultDto(totalCount, entities); + return new PagedResultDto(totalCount, query.ToList()); } /// /// 任务明细标记已确认 @@ -248,8 +279,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts string.Empty, 0, string.Empty, - input.Version, string.Empty, + input.Version, p.MaterialCode, _billNum, GuidGenerator.Create(), @@ -337,7 +368,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts [DisableRequestSizeLimit] public async Task WmsSharePartUpdate(WmsSharePartOutPutDetial detial) { - var _entityList = _wmsRepository.Where(p => p.Id == detial.Id).ToList(); + var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId).ToList(); if (_entityList.Count() > 0) { foreach (var itm in _entityList) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index a9f7692e..748fcb72 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -247,7 +247,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "BegingTime", Value = begin.ToString() }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = end.ToString() }); - var _taskid = await _service.ExportEnqueueAsync("大众备件正常结算输出", ExportExtentsion.Excel, version, string.Empty, CurrentUser, typeof(SettleSparePartExportService), customConditionList, (rs) => + var _taskid = await _service.ExportEnqueueAsync("大众备件结算输出", ExportExtentsion.Excel, version, string.Empty, CurrentUser, typeof(SettleSparePartExportService), customConditionList, (rs) => { }); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml index 8e7a6251..a30a9fd5 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml @@ -2202,7 +2202,7 @@ wms出库 - + diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs index 0a0b5588..c9d02495 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs @@ -95,7 +95,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " AmountNoTax \n" + " ) t \n" + " ) AS a\n" + - " LEFT OUTER JOIN (\n" + + " INNER JOIN (\n" + " SELECT SUM\n" + " ( ReceiptQty ) AS ReceiptQty,\n" + " PurchaseOrderNo,\n" +