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

调整出库任务单增加组织

Browse Source
This commit is contained in:
18942506660
2024-08-10 14:33:03 +08:00
parent 7965b3b05c
commit a1db49cd0b
3 changed files with 21 additions and 4 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.

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

@@ -26,6 +26,8 @@ using WMS.Web.Core.Dto.Erp;
using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Caching.Memory;
using System.Reflection; using System.Reflection;
using WMS.Web.Domain.Services; using WMS.Web.Domain.Services;
using SkiaSharp;
using Google.Protobuf.Collections;
namespace WMS.Web.Api.Controllers namespace WMS.Web.Api.Controllers
{ {
@@ -89,9 +91,22 @@ namespace WMS.Web.Api.Controllers
[Route("hj")] [Route("hj")]
public async Task<string> TestHJ() public async Task<string> TestHJ()
{ {
//List<string> list = new List<string>();
//list.Add("GD-02-15");
//list.Add("GD-01-15");
//list.Add("AB-02-23");
//list.Add("AB-01-23");
//list.Add("AB-01-15");
//list.Add("AB-1-06");
//list.Add("AB-3-15");
//list.Add("C-3-15");
//List<string> list2 = new List<string>();
//list.ForEach(f => list2.Add(f.Replace("-0", "-")));
//var ss = list2.OrderBy(s => s).ToList();
//await _inStockTaskService.ErpDel(); //await _inStockTaskService.ErpDel();
//await _outStockTaskService.BillQueryForMisDeliveryOutStock(true, new List<string>() { "QTCK026812" }); //await _outStockTaskService.BillQueryForMisDeliveryOutStock(true, new List<string>() { "QTCK026812" });
await _inStockTaskService.SysnMiscellaneous(new List<string>() { "QTRK028204" }, true); //await _inStockTaskService.SysnMiscellaneous(new List<string>() { "QTRK028204" }, true);
// List<int> boxIds = new List<int>(); // List<int> boxIds = new List<int>();

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

@@ -523,16 +523,18 @@ namespace WMS.Web.Repositories
public async Task<List<string>> GetOutStockTaskNosByNo(string billNo, string stockCode) public async Task<List<string>> GetOutStockTaskNosByNo(string billNo, string stockCode)
{ {
var split = stockCode.Split("_$");
var res = await _context.OutStockTask.Include(x => x.Details.Where(w => w.IsRepeal != true)).ThenInclude(s => s.ErpDetails) var res = await _context.OutStockTask.Include(x => x.Details.Where(w => w.IsRepeal != true)).ThenInclude(s => s.ErpDetails)
.Where(f => EF.Functions.Like(f.BillNo, "%" + billNo + "%") && .Where(f => EF.Functions.Like(f.BillNo, "%" + billNo + "%") &&
(f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait) && f.StockCode.Equals(stockCode)) (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait) && f.StockCode.Equals(split[0]) && f.OrgCode.Equals(split[1]))
.OrderByDescending(o => o.Id) .OrderByDescending(o => o.Id)
.Select(s => s.BillNo) .Select(s => s.BillNo)
.ToListAsync(); .ToListAsync();
var ress = await _context.OutStockTask.Include(x => x.Details.Where(w => w.IsRepeal != true)).ThenInclude(s => s.ErpDetails) var ress = await _context.OutStockTask.Include(x => x.Details.Where(w => w.IsRepeal != true)).ThenInclude(s => s.ErpDetails)
.Where(f => (f.Details.SelectMany(s => s.ErpDetails).Where(w => EF.Functions.Like(w.SourceBillNo, "%" + billNo + "%")).Any()) && .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) && f.StockCode.Equals(stockCode)) (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait) && f.StockCode.Equals(split[0]) && f.OrgCode.Equals(split[1]))
.OrderByDescending(o => o.Id) .OrderByDescending(o => o.Id)
.Select(s => s.BillNo) .Select(s => s.BillNo)
.ToListAsync(); .ToListAsync();