18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接口优化

Browse Source
This commit is contained in:
tongfei
2023-11-09 17:07:39 +08:00
parent a931f74f5a
commit 23eb185242
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/WMS.Web.Api/Controllers/InStockTaskController.cs
View File

@@ -90,8 +90,8 @@ namespace WMS.Web.Api.Controllers
/// </summary> /// </summary>
/// <param name="code"></param> /// <param name="code"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpGet]
[Route("InStockTask/{code}")] [Route("GetSourceOrder/{code}")]
public async Task<ResultList<InStockTaskBillNoQueryResponse>> InStockTask([FromRoute] string code) public async Task<ResultList<InStockTaskBillNoQueryResponse>> InStockTask([FromRoute] string code)
{ {
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);

22
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -122,7 +122,7 @@ namespace WMS.Web.Domain.Services.Public
//3.单据类型：标准采购订单和标准委外订单 //3.单据类型：标准采购订单和标准委外订单
//4.明细关闭状态：正常 //4.明细关闭状态：正常
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
param.FilterString = "FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "' and FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'"; param.FilterString = " FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'";
param.FilterString = param.FilterString + " and FSOSTOCKID.FNumber in ("; param.FilterString = param.FilterString + " and FSOSTOCKID.FNumber in (";
var str = ""; var str = "";
@@ -140,8 +140,24 @@ namespace WMS.Web.Domain.Services.Public
//根据原订单号查询 //根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0) if (sourceBillNos != null && sourceBillNos.Count() > 0)
{ {
var srt_b = JsonConvert.SerializeObject(sourceBillNos); param.FilterString = param.FilterString + " and FBillNo in (";
param.FilterString = param.FilterString + " and FBillNo in (" + srt_b.Substring(1, srt_b.Length - 2) + ")";
var bill_str = "";
int bill_index = 0;
//var srt_b = JsonConvert.SerializeObject(sourceBillNos);
foreach (var bill in sourceBillNos)
{
bill_index++;
if (bill_index == sourceBillNos.Count)
bill_str = bill_str + $"'{bill}'";
else
bill_str = bill_str + $"'{bill}'" + ",";
}
param.FilterString = param.FilterString + bill_str + ")";
}//注意：当有单据编号的查询的时候，时间条件去掉；不然就查不到数据了
else
{
param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
} }
query.Data = JsonConvert.SerializeObject(param); query.Data = JsonConvert.SerializeObject(param);