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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-14 09:23:28 +08:00
parent ec8b9efe96 de69d0b179
commit 97258f54d7
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

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

@@ -1460,10 +1460,9 @@ namespace WMS.Web.Domain.Services.Public
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
//2.审核状态：已审核 //2.审核状态：已审核
//3.未出库数量>0 //3.单据类型:标准
//4.日期>=系统上线之日
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //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); //string srt = JsonConvert.SerializeObject(stocks_codes);
//param.FilterString = param.FilterString + " and FSrcStockId in (" + srt.Substring(1, srt.Length - 2) + ")"; //param.FilterString = param.FilterString + " and FSrcStockId in (" + srt.Substring(1, srt.Length - 2) + ")";
@@ -1537,10 +1536,9 @@ namespace WMS.Web.Domain.Services.Public
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
//2.审核状态：已审核 //2.审核状态：已审核
//3.未出库数量>0 //3.单据类型:标准
//4.日期>=系统上线之日 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183'";
param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C'";
//string srt = JsonConvert.SerializeObject(stocks_codes); //string srt = JsonConvert.SerializeObject(stocks_codes);
//param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")";
@@ -1614,10 +1612,9 @@ namespace WMS.Web.Domain.Services.Public
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
//2.审核状态：已审核 //2.审核状态：已审核
//3.未出库数量>0 //3.单据类型:标准
//4.日期>=系统上线之日 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'";
param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FAffairType='Dassembly'";
//string srt = JsonConvert.SerializeObject(stocks_codes); //string srt = JsonConvert.SerializeObject(stocks_codes);
//param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")";
@@ -1691,10 +1688,9 @@ namespace WMS.Web.Domain.Services.Public
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
//2.审核状态：已审核 //2.审核状态：已审核
//3.未出库数量>0 //3.单据类型:标准
//4.日期>=系统上线之日 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9'";
param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C'";
//string srt = JsonConvert.SerializeObject(stocks_codes); //string srt = JsonConvert.SerializeObject(stocks_codes);
//param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")";
@@ -1768,10 +1764,9 @@ namespace WMS.Web.Domain.Services.Public
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
//2.审核状态：已审核 //2.审核状态：已审核
//3.未出库数量>0 //3.单据类型:标准
//4.日期>=系统上线之日 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'";
param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FAffairType='Assembly'";
//string srt = JsonConvert.SerializeObject(stocks_codes); //string srt = JsonConvert.SerializeObject(stocks_codes);
//param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")";

6
src/WMS.Web.Repositories/OutStockTaskRepositories.cs
View File

@@ -320,7 +320,9 @@ namespace WMS.Web.Repositories
var list = await _context.OutStockTask.Include(x => x.Details) var list = await _context.OutStockTask.Include(x => x.Details)
.Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") || .Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") ||
EF.Functions.Like(f.SourceBillNo, "%" + 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<GetOutStockTaskByNoResponse>>(list); var response = _mapper.Map<List<GetOutStockTaskByNoResponse>>(list);
//获取物料信息 显示物料三件套 //获取物料信息 显示物料三件套
foreach (var r in response.SelectMany(s => s.details)) foreach (var r in response.SelectMany(s => s.details))
@@ -371,6 +373,7 @@ namespace WMS.Web.Repositories
var entitys = await _context.OutStockTask var entitys = await _context.OutStockTask
.Include(s => s.Details) .Include(s => s.Details)
.Where(w => billNos.Contains(w.BillNo)) .Where(w => billNos.Contains(w.BillNo))
.OrderByDescending(o => o.Id)
.ToListAsync(); .ToListAsync();
return entitys.Clone(); return entitys.Clone();
@@ -418,6 +421,7 @@ namespace WMS.Web.Repositories
.Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") || .Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") ||
EF.Functions.Like(f.SourceBillNo, "%" + billNo + "%")) && EF.Functions.Like(f.SourceBillNo, "%" + billNo + "%")) &&
(f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)) (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait))
.OrderByDescending(o => o.Id)
.Select(s => s.BillNo) .Select(s => s.BillNo)
.ToListAsync(); .ToListAsync();
} }