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

修复bug

Browse Source
This commit is contained in:
18942506660
2024-03-06 17:20:36 +08:00
parent bab923ad2b
commit da0b1cba16
3 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,22 @@ namespace WMS.Web.Api.Controllers
[Route("hj")] [Route("hj")]
public async Task<string> TestHJ() public async Task<string> TestHJ()
{ {
var st= await _erpService.BillQueryForDeliveryNoticeOutStock(); //var list = await _outStockTaskRepositories.GetEntityList(new List<int> { 14321 });
//list[0].Details[0].ErpDetails[0].AccruedQty = 2;
//list[0].Details[0].ErpDetails.Add(new OutStockTaskErpDetails()
//{
// Erp_DetailId = 1
//});
//list[0].Details.Add(new OutStockTaskDetails()
//{
// AccruedQty = 2
//});
//var b = await _outStockTaskRepositories.EditEntityList(list);
//List<string> s = new List<string>();
//s.Add("XSCKD10629693");
//var st = await _outStockTaskService.BillQueryForSalOutStock(true, s);
return ""; return "";
} }
@@ -118,7 +133,7 @@ namespace WMS.Web.Api.Controllers
// t.BarCode = item.BarCode; // t.BarCode = item.BarCode;
// list.Add(t); // list.Add(t);
//} //}
var tt = JsonConvert.SerializeObject(result); var tt = JsonConvert.SerializeObject(result);
return tt; return tt;
@@ -160,11 +175,13 @@ namespace WMS.Web.Api.Controllers
var materials = materials_result.Data.ToList(); var materials = materials_result.Data.ToList();
var mL = materials.Where(f => f.MaterialNumber.Contains(number)) var mL = materials.Where(f => f.MaterialNumber.Contains(number))
.Select(s=>new { .Select(s => new
Id=s.MaterialId, {
Number=s.MaterialNumber, Id = s.MaterialId,
name=s.MaterialName }).ToList(); Number = s.MaterialNumber,
foreach(var m in mL) name = s.MaterialName
}).ToList();
foreach (var m in mL)
{ {
mList.Add((m.Id, m.Number, m.name)); mList.Add((m.Id, m.Number, m.name));
} }
@@ -196,7 +213,7 @@ namespace WMS.Web.Api.Controllers
List<int> mIds = materials.Where(w => materialNumbers.Contains(w.MaterialNumber)).Select(s => s.MaterialId).ToList(); List<int> mIds = materials.Where(w => materialNumbers.Contains(w.MaterialNumber)).Select(s => s.MaterialId).ToList();
int jn = 3; int jn = 3;
if (mIds.Count() <= 0) if (mIds.Count() <= 0)
mIds= materials.Skip((new Random()).Next(1000, 10000)).Take(4).Select(s => s.MaterialId).ToList(); mIds = materials.Skip((new Random()).Next(1000, 10000)).Take(4).Select(s => s.MaterialId).ToList();
jn = mIds.Count() - 1; jn = mIds.Count() - 1;
List<OpsBoxResponse> list = new List<OpsBoxResponse>(); List<OpsBoxResponse> list = new List<OpsBoxResponse>();
for (int i = 0; i < number; i++) for (int i = 0; i < number; i++)
@@ -278,10 +295,10 @@ namespace WMS.Web.Api.Controllers
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("lst")] [Route("lst")]
public string Lst() public string Lst()
{ {
var successStr = "tongfei test lst->数据库链接地址：" + _options.DBConnectionString+"，单点项目链接地址："+_options.SingleBaseUrl; var successStr = "tongfei test lst->数据库链接地址：" + _options.DBConnectionString + "，单点项目链接地址：" + _options.SingleBaseUrl;
return successStr; return successStr;
} }
/// <summary> /// <summary>

8
src/WMS.Web.Domain/Mappers/OutStockMapper.cs
View File

@@ -13,10 +13,10 @@ namespace WMS.Web.Domain.Mappers
{ {
public OutStockMapper() public OutStockMapper()
{ {
CreateMap<OutStockTask, OutStockTask>() CreateMap<OutStockTask, OutStockTask>();
.ForMember(x => x.Details, opt => opt.Ignore()); //.ForMember(x => x.Details, opt => opt.Ignore());
CreateMap<OutStockTaskDetails, OutStockTaskDetails>() CreateMap<OutStockTaskDetails, OutStockTaskDetails>();
.ForMember(x => x.ErpDetails, opt => opt.Ignore()); //.ForMember(x => x.ErpDetails, opt => opt.Ignore());
CreateMap<OutStockTaskErpDetails, OutStockTaskErpDetails>(); CreateMap<OutStockTaskErpDetails, OutStockTaskErpDetails>();
CreateMap<OutStock, OutStock>() CreateMap<OutStock, OutStock>()

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

@@ -131,8 +131,8 @@ namespace WMS.Web.Repositories
.Where(f => list.Contains(f.Id)).ToListAsync(); .Where(f => list.Contains(f.Id)).ToListAsync();
_mapper.ToMapList(entitys, res); _mapper.ToMapList(entitys, res);
_mapper.ToMapList(entitys.SelectMany(s => s.Details).ToList(), res.SelectMany(s => s.Details).ToList()); //_mapper.ToMapList(entitys.SelectMany(s => s.Details).ToList(), res.SelectMany(s => s.Details).ToList());
_mapper.ToMapList(entitys.SelectMany(s => s.Details).SelectMany(s => s.ErpDetails).ToList(), res.SelectMany(s => s.Details).SelectMany(s => s.ErpDetails).ToList()); // _mapper.ToMapList(entitys.SelectMany(s => s.Details).SelectMany(s => s.ErpDetails).ToList(), res.SelectMany(s => s.Details).SelectMany(s => s.ErpDetails).ToList());
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
if (_transaction != null) if (_transaction != null)
_transaction.Commit(); _transaction.Commit();
@@ -195,8 +195,8 @@ namespace WMS.Web.Repositories
if (res == null) return null; if (res == null) return null;
_mapper.Map(entity, res); _mapper.Map(entity, res);
_mapper.ToMapList(entity.Details, res.Details); //_mapper.ToMapList(entity.Details, res.Details);
_mapper.ToMapList(entity.Details.SelectMany(s => s.ErpDetails).ToList(), res.Details.SelectMany(s => s.ErpDetails).ToList()); //_mapper.ToMapList(entity.Details.SelectMany(s => s.ErpDetails).ToList(), res.Details.SelectMany(s => s.ErpDetails).ToList());
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
if (_transaction != null) if (_transaction != null)