diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs index 5ffb8d76..8bd8e1b6 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs @@ -166,7 +166,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true); var totalCount = await GetCountAsync(input); - var stockList = _wmsDapper.GetSalesStock(); + var stockList = _wmsDapper.GetSalesStock("BJ"); var query= from itm in entities join itm1 in stockList on itm.MaterialCode equals itm1.SapCode into temp1 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs index a17f382a..3f683989 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs @@ -159,7 +159,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS input.SkipCount, true); var totalCount = await GetCountAsync(input); - var stockList = _wmsDapper.GetSalesStock(); + var stockList = _wmsDapper.GetSalesStock("PLJS"); var query = from itm in entities join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode into temp1 @@ -440,7 +440,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS //} var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss"); var _list = _dapper.GetNoKanbanSettleDetail(input.Version); - var stockList = _wmsDapper.GetSalesStock(); + var stockList = _wmsDapper.GetSalesStock("PLJS"); var query = from itm in _list join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode into temp1 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs index 8f99fce9..91a0b969 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs @@ -175,7 +175,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS var totalCount = await GetCountAsync(input); - var stockList = _wmsDapper.GetSalesStock(); + var stockList = _wmsDapper.GetSalesStock("BJJS"); var query = from itm in entities join itm1 in stockList on itm.MaterialCode equals itm1.SapCode into temp1 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 5c39382f..97f77450 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -174,7 +174,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts 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 stockList = _wmsDapper.GetSalesStock("BJJS"); var query = from itm in entities join itm1 in stockList on itm.MaterialCode equals itm1.SapCode into temp1 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs index d55be809..2522f7af 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs @@ -309,7 +309,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS var _billNum = getbillName + DateTime.Now.ToString("yyyyMMddhhmmss"); - var stockList = _wmsDapper.GetSalesStock(); + var stockList = _wmsDapper.GetSalesStock("PLJS"); var query = from itm in _list join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode into temp1 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs index c4c7ecf7..361baef4 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs @@ -127,7 +127,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS input.SkipCount, true); var totalCount = await GetCountAsync(input); - var stockList = _wmsDapper.GetSalesStock(); + var stockList = _wmsDapper.GetSalesStock("BJJS"); 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 dc6e79d9..c2811ff1 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -143,7 +143,6 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "SapMaterialCode", Value = input.SapMaterialCode ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "BegingTime", Value = input.Begin ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End ?? string.Empty }); - var _taskid = await _service.ExportEnqueueAsync("看板结算输出", ExportExtentsion.Excel,input.Version ,string.Empty,CurrentUser, typeof(SettleKBWithCodeExportService), customConditionList, (rs) => { }); @@ -167,7 +166,6 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "SapMaterialCode", Value = input.SapMaterialCode ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "BegingTime", Value = input.Begin ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End ?? string.Empty }); - var _taskid = await _service.ExportEnqueueAsync("无条码看板结算输出", ExportExtentsion.Excel, input.Version,string.Empty, CurrentUser, typeof(SettleKBWithOutCodeExportService), customConditionList, (rs) => { }); @@ -312,7 +310,6 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices public async Task SettledSparePartExtend(string purchaseOrderNo, string sapCode, string version, string customerCode, string factory, string matialCode, string state, DateTime begin, DateTime end) { - List customConditionList = new List(); customConditionList.Add(new CustomCondition() { Name = "Version", Value = version ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "PurchaseOrderNo", Value = purchaseOrderNo ?? string.Empty }); @@ -323,7 +320,6 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "大众备件结算核对" }); 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) => { @@ -903,211 +899,6 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices return _taskid; } - - - - - - - #region F及M平台已经合并入H平台 - - /// - ///红旗F平台核对明细 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - //[HttpPost] - //[Route("HQFSettledDetailDiffExportService")] - //[DisableRequestSizeLimit] - //public async Task HQFSettledDetailDiffExportServiceMake( - // HQKanbanRequestDto input - // ) - //{ - - // List customConditionList = new List(); - // customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); - // customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); - // customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); - // customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); - // customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); - // customConditionList.Add(new CustomCondition() { Name = "AcceptNo", Value = input.AcceptNo }); - // customConditionList.Add(new CustomCondition() { Name = "WarehouseDesc", Value = input.WarehouseDesc }); - // customConditionList.Add(new CustomCondition() { Name = "Kanban", Value = input.Kanban }); - // customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup }); - // customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(input.SapCode) ? string.Empty : input.SapCode }); - // var _taskid = await _service.ExportEnqueueAsync("F平台核对明细", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(HQFSettledDetailDiffExportService), customConditionList, (rs) => - // { - // }); - // return _taskid; - //} - /// - /// 红旗F平台备件结算出库 - /// - /// - /// - //[HttpPost] - //[Route("HQFSharePartSettledDetailDiffExportService")] - //[DisableRequestSizeLimit] - //public async Task HQFSharePartSettledDetailDiffExportServiceMake( - // HQKanbanRequestDto input - // ) - //{ - // List customConditionList = new List(); - // customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); - - // customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); - // customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); - // customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); - // customConditionList.Add(new CustomCondition() { Name = "AcceptNo", Value = input.AcceptNo }); - // customConditionList.Add(new CustomCondition() { Name = "WarehouseDesc", Value = input.WarehouseDesc }); - // customConditionList.Add(new CustomCondition() { Name = "Kanban", Value = input.Kanban }); - // customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup }); - // customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(input.SapCode) ? string.Empty : input.SapCode }); - // var _taskid = await _service.ExportEnqueueAsync("F平台备件核对明细", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(HQFSharePartSettledDetailDiffExportService), customConditionList, (rs) => - // { - // }); - // return _taskid; - //} - - /// - ///红旗M平台核对明细 - /// - /// 上传的文件(前端已经限制只能上传一个附件) - /// - //[HttpPost] - //[Route("HQMSettledDetailDiffExportService")] - //[DisableRequestSizeLimit] - //public async Task HQMSettledDetailDiffExportServiceMake( - // HQKanbanRequestDto input - // ) - //{ - - // List customConditionList = new List(); - // customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); - // customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); - // customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); - // customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); - // customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); - // customConditionList.Add(new CustomCondition() { Name = "AcceptNo", Value = input.AcceptNo }); - // customConditionList.Add(new CustomCondition() { Name = "WarehouseDesc", Value = input.WarehouseDesc }); - // customConditionList.Add(new CustomCondition() { Name = "Kanban", Value = input.Kanban }); - // customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup }); - // customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(input.SapCode) ? string.Empty : input.SapCode }); - // var _taskid = await _service.ExportEnqueueAsync("M平台核对明细", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(HQMSettledDetailDiffExportService), customConditionList, (rs) => - // { - // }); - // return _taskid; - //} - - /// - /// 红旗M平台备件结算出库 - /// - /// - /// - //[HttpPost] - //[Route("HQMSharePartSettledDetailDiffExportService")] - //[DisableRequestSizeLimit] - //public async Task HQMSharePartSettledDetailDiffExportServiceMake( - // HQKanbanRequestDto input - // ) - //{ - // List customConditionList = new List(); - // customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); - - // customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); - // customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); - // customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); - // customConditionList.Add(new CustomCondition() { Name = "AcceptNo", Value = input.AcceptNo }); - // customConditionList.Add(new CustomCondition() { Name = "WarehouseDesc", Value = input.WarehouseDesc }); - // customConditionList.Add(new CustomCondition() { Name = "Kanban", Value = input.Kanban }); - // customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup }); - // customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(input.SapCode) ? string.Empty : input.SapCode }); - // var _taskid = await _service.ExportEnqueueAsync("M平台备件核对明细", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(HQMSharePartSettledDetailDiffExportService), customConditionList, (rs) => - // { - // }); - // return _taskid; - //} - - - - - - - /// - /// H平台未结明细 - /// - /// - /// - //[HttpPost] - //[Route("HQHShippingExportService")] - //[DisableRequestSizeLimit] - //public async Task HQHShippingExportServiceMake( - // HQKanbanRequestDto input - // ) - //{ - // List customConditionList = new List(); - // customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); - // customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); - // customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); - // customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); - // var _taskid = await _service.ExportEnqueueAsync("H平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQHShippingExportService), customConditionList, (rs) => - // { - // }); - // return _taskid; - //} - - /// - /// F平台未结明细 - /// - /// - /// - //[HttpPost] - //[Route("HQHShippingExportService")] - //[DisableRequestSizeLimit] - //public async Task HQFShippingExportServiceMake( - // HQKanbanRequestDto input - // ) - //{ - // List customConditionList = new List(); - // customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); - // customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); - // customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); - // var _taskid = await _service.ExportEnqueueAsync("F平台未结明细", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQFShippingExportService), customConditionList, (rs) => - // { - // }); - // return _taskid; - //} - - /// - /// M平台未明细 - /// - /// - /// - //[HttpPost] - //[Route("HQMShippingExportService")] - //[DisableRequestSizeLimit] - //public async Task HQMShippingExportServiceMake( - // HQKanbanRequestDto input - // ) - //{ - // List customConditionList = new List(); - // customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); - // customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); - // customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); - // var _taskid = await _service.ExportEnqueueAsync("M平台未明细", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQMShippingExportService), customConditionList, (rs) => - // { - // }); - // return _taskid; - //} - - #endregion - - - - - - - #endregion } diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettledDetailDapperRepository.cs index 1f76d6cf..0996324e 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettledDetailDapperRepository.cs @@ -143,7 +143,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report string _sql = string.Format(sqlString, str, version); ; - var _query = DbConnection.Query(_sql); + var _query = DbConnection.Query(_sql, null, null, true, 1200, null); var _list = _query.ToList(); diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsDapperRepository.cs index 7da63a86..b58be080 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsDapperRepository.cs @@ -74,8 +74,21 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report } - - public virtual List GetSalesStockSum(string version) + + public virtual List GetSalesStock(string locCode) + { + string str = " select SUM(Qty) Qty,PartCode SapCode from TS_STOCK_DETAIL where AreaCode='SALE' and LocCode='{0}' group by PartCode "; + str=string.Format(str, locCode); + + var _list = DbConnection.Query(str); + return _list.ToList(); + + + } + + + + public virtual List GetSalesStockSum(string version) { // string str = // "SELECT A\n" + diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQCarSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQCarSettledDetailDiffExportService.cs index 2a9290e1..d5a1b0f8 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQCarSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQCarSettledDetailDiffExportService.cs @@ -66,7 +66,7 @@ namespace SettleAccount.Job.Services.Report //不包含备品--求和出库 var _ls_sum = _dapperRepository.GetHQCarSettledDetailDiffSumReportList(version, materialCode, begin, end, materialGroup); //按照零件号汇总数量，有一列显示寄售库数量 - var stockList = _wmsDapper.GetSalesStock(); + var stockList = _wmsDapper.GetSalesStock("PLJS"); var queryStockList = from itm in _ls_sum join itm1 in stockList on itm.SAP编码 equals itm1.SapCode into temp1 from tm1 in temp1.DefaultIfEmpty() diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSharePartSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSharePartSettledDetailDiffExportService.cs index 7cc4697a..71a4577f 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSharePartSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSharePartSettledDetailDiffExportService.cs @@ -66,7 +66,7 @@ namespace SettleAccount.Job.Services.Report var _ls_sum = _dapperRepository.GetSharePartSumSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup); //按照零件号汇总数量，有一列显示寄售库数量 - var stockList = _wmsDapper.GetSalesStock(); + var stockList = _wmsDapper.GetSalesStock("BJJS"); var queryStockList = from itm in _ls_sum join itm1 in stockList on itm.Sap编码 equals itm1.SapCode into temp1 from tm1 in temp1.DefaultIfEmpty() diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs index 9c208f57..59b6503d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs @@ -51,7 +51,7 @@ namespace SettleAccount.Job.Services.Report var _reversels_withcode = _dapper.GetReverseWithCodeSettleSparePartReportList(purchaseOrderNo, version, sapCode, matialCode, beginTime, endTime); - var stockList = _wmsDapper.GetSalesStock(); + var stockList = _wmsDapper.GetSalesStock("BJJS"); //针对无单号备件，求和汇总显示 var _forwardls_nocode = _dapper.GetNoCodeSettleSparePartReportList(purchaseOrderNo, version, sapCode, matialCode, beginTime, endTime);