diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index a64527a0..913644d8 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.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index db3496cf..202b67e9 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -120,6 +120,19 @@ namespace WMS.Web.Api.Controllers
return "";
}
+ ///
+ /// 手动同步老ops箱信息
+ ///
+ ///
+ [HttpGet]
+ [Route("RefreshOpsBox")]
+ public async Task RefreshOpsBox()
+ {
+ if (!_env.IsDevelopment()) return "";
+ var result = await _boxService.Sync();
+ return "";
+ }
+
[HttpGet]
[Route("tf")]
public async Task TestTF()
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 21ee1e66..e6f164b1 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -579,6 +579,12 @@
+
+
+ 手动同步老ops箱信息
+
+
+
根据物料Id获取物料编码
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 79d4cbaa..675bb9bf 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -339,13 +339,23 @@ namespace WMS.Web.Repositories
var materials = materials_result.Data.ToList();
List ids = new List();
-
- 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 list = new List();
+ 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);
foreach (var r in response)
{
@@ -448,13 +458,21 @@ namespace WMS.Web.Repositories
public async Task> 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;
}
///