diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 935fcdbd..decf6cbc 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -35,7 +35,7 @@ namespace WMS.Web.Api.Controllers [Route("hj")] public async Task TestHJ() { - //var res = await this._erpService.BillQueryForDeliveryNoticeOutStock(); + var res = await this._erpService.BillQueryForDeliveryNoticeOutStock(); //var result= await this._erpService.BillQueryForPurchaseInStock(); //var result = await this._erpService.BillQueryForOrg(); var result = await this._erpService.BillQueryForMaterial(); diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index b5ae19ff..4e789263 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -394,25 +394,13 @@ namespace WMS.Web.Domain.Services.Public //5.仓库:wms系统的仓库值---现在这个没有加,因为还单点没有和金蝶同步 param.FilterString = "FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "' and FDocumentStatus='C' and FRemainOutQty>=0"; //string srt = JsonConvert.SerializeObject(stocks_codes); - //param.FilterString = param.FilterString + " and FStockID in (" + srt.Substring(1, srt.Length - 1) + ")"; - //param.FilterString = param.FilterString + " and FSOSTOCKID.FNumber in ("; - - //var str = ""; - //int index = 0; - //foreach (var scode in stocks_codes) - //{ - // index++; - // if (index == stocks_codes.Count) - // str = str + $"'{scode}'"; - // else - // str = str + $"'{scode}'" + ","; - //} - //param.FilterString = param.FilterString + str + ")"; + //param.FilterString = param.FilterString + " and FStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; + //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) { - var srt = JsonConvert.SerializeObject(sourceBillNos); - param.FilterString = param.FilterString + " and FBillNo in (" + srt.Substring(1, srt.Length - 1) + ")"; + var srt_b = JsonConvert.SerializeObject(sourceBillNos); + param.FilterString = param.FilterString + " and FBillNo in (" + srt_b.Substring(1, srt_b.Length - 2) + ")"; } query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query);