diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 0d472f88..34472647 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 142bc3ee..a5daf6f7 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1460,10 +1460,9 @@ namespace WMS.Web.Domain.Services.Public //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 //2.审核状态：已审核 - //3.未出库数量>0 - //4.日期>=系统上线之日 + //3.单据类型:标准 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 - param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C'"; + param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString = param.FilterString + " and FSrcStockId in (" + srt.Substring(1, srt.Length - 2) + ")"; @@ -1537,10 +1536,9 @@ namespace WMS.Web.Domain.Services.Public //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 //2.审核状态：已审核 - //3.未出库数量>0 - //4.日期>=系统上线之日 - //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 - param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C'"; + //3.单据类型:标准 + //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 + param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183'"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; @@ -1614,10 +1612,9 @@ namespace WMS.Web.Domain.Services.Public //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 //2.审核状态：已审核 - //3.未出库数量>0 - //4.日期>=系统上线之日 - //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID - param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FAffairType='Dassembly'"; + //3.单据类型:标准 + //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID + param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; @@ -1691,10 +1688,9 @@ namespace WMS.Web.Domain.Services.Public //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 //2.审核状态：已审核 - //3.未出库数量>0 - //4.日期>=系统上线之日 - //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 - param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C'"; + //3.单据类型:标准 + //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 + param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9'"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; @@ -1768,10 +1764,9 @@ namespace WMS.Web.Domain.Services.Public //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 //2.审核状态：已审核 - //3.未出库数量>0 - //4.日期>=系统上线之日 - //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID - param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FAffairType='Assembly'"; + //3.单据类型:标准 + //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID + param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 177976bd..21e32446 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -320,7 +320,9 @@ namespace WMS.Web.Repositories var list = await _context.OutStockTask.Include(x => x.Details) .Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") || EF.Functions.Like(f.SourceBillNo, "%" + billNo + "%")) && - (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)).ToListAsync(); + (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)) + .OrderByDescending(o => o.Id) + .ToListAsync(); var response = _mapper.Map>(list); //获取物料信息 显示物料三件套 foreach (var r in response.SelectMany(s => s.details)) @@ -371,6 +373,7 @@ namespace WMS.Web.Repositories var entitys = await _context.OutStockTask .Include(s => s.Details) .Where(w => billNos.Contains(w.BillNo)) + .OrderByDescending(o => o.Id) .ToListAsync(); return entitys.Clone(); @@ -418,6 +421,7 @@ namespace WMS.Web.Repositories .Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") || EF.Functions.Like(f.SourceBillNo, "%" + billNo + "%")) && (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)) + .OrderByDescending(o => o.Id) .Select(s => s.BillNo) .ToListAsync(); }