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
2024-01-19 11:34:56 +08:00
parent 2ad21857b1 c70b62ab99
commit 7a955cd0de
4 changed files with 44 additions and 7 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.

13
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -120,6 +120,19 @@ namespace WMS.Web.Api.Controllers
return "";
}
/// <summary>
/// 手动同步老ops箱信息
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("RefreshOpsBox")]
public async Task<string> RefreshOpsBox()
{
if (!_env.IsDevelopment()) return "";
var result = await _boxService.Sync();
return "";
}
[HttpGet]
[Route("tf")]
public async Task<string> TestTF()

6
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
View File

@@ -579,6 +579,12 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.TestController.RefreshOpsBox">
<summary>
手动同步老ops箱信息
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.TestController.GetMaterial(System.Collections.Generic.List{System.Int32})">
<summary>
根据物料Id获取物料编码

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

@@ -339,13 +339,23 @@ namespace WMS.Web.Repositories
var materials = materials_result.Data.ToList();
List<int> ids = new List<int>();
var list = await _context.OutStockTask.Include(x => x.Details).ThenInclude(s => s.ErpDetails)
.Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") ||
f.Details.SelectMany(s => s.ErpDetails).Where(w => EF.Functions.Like(w.SourceBillNo, "%" + billNo + "%")).Any()) &&
List<OutStockTask> list = new List<OutStockTask>();
var list1 = await _context.OutStockTask.Include(x => x.Details).ThenInclude(s => s.ErpDetails)
.Where(f => EF.Functions.Like(f.BillNo, "%" + billNo + "%") &&
(f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait))
.OrderByDescending(o => o.Id)
.ToListAsync();
if (list1 != null && list1.Count() > 0)
list.AddRange(list1);
var list2 = await _context.OutStockTask.Include(x => x.Details).ThenInclude(s => s.ErpDetails)
.Where(f => (f.Details.SelectMany(s => s.ErpDetails).Where(w => EF.Functions.Like(w.SourceBillNo, "%" + billNo + "%")).Any()) &&
(f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait))
.OrderByDescending(o => o.Id)
.ToListAsync();
if (list2 != null && list2.Count() > 0)
list.AddRange(list2);
var response = _mapper.Map<List<GetOutStockTaskByNoResponse>>(list);
foreach (var r in response)
{
@@ -448,13 +458,21 @@ namespace WMS.Web.Repositories
public async Task<List<string>> GetOutStockTaskNosByNo(string billNo)
{
return await _context.OutStockTask.Include(x => x.Details).ThenInclude(s => s.ErpDetails)
.Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") ||
f.Details.SelectMany(s => s.ErpDetails).Where(w => EF.Functions.Like(w.SourceBillNo, "%" + billNo + "%")).Any()) &&
var res = await _context.OutStockTask.Include(x => x.Details).ThenInclude(s => s.ErpDetails)
.Where(f => EF.Functions.Like(f.BillNo, "%" + billNo + "%") &&
(f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait))
.OrderByDescending(o => o.Id)
.Select(s => s.BillNo)
.ToListAsync();
var ress = await _context.OutStockTask.Include(x => x.Details).ThenInclude(s => s.ErpDetails)
.Where(f => (f.Details.SelectMany(s => s.ErpDetails).Where(w => EF.Functions.Like(w.SourceBillNo, "%" + billNo + "%")).Any()) &&
(f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait))
.OrderByDescending(o => o.Id)
.Select(s => s.BillNo)
.ToListAsync();
res.AddRange(ress);
return res;
}
/// <summary>