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-12-18 15:28:21 +08:00
parent 68751df71f edaa5099ed
commit 53be47e544
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@ namespace WMS.Web.Repositories
_transaction = _context.Database.BeginTransaction(); _transaction = _context.Database.BeginTransaction();
try try
{ {
_context.ChangeBoxRecord.AddRange(list); _context.ChangeBoxRecord.AddRange(list);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
foreach (var item in list) foreach (var item in list)
@@ -123,7 +123,7 @@ namespace WMS.Web.Repositories
if (!string.IsNullOrEmpty(dto.Creator)) if (!string.IsNullOrEmpty(dto.Creator))
{ {
var staffList = await _basicsRepositories.GetStaffListAsync(_loginRepositories.CompanyId); var staffList = await _basicsRepositories.GetStaffListAsync(_loginRepositories.CompanyId);
ids = staffList.Where(w => EF.Functions.Like(w.Name, "%" + dto.Creator + "%")).Select(s => s.Id).ToList(); ids = staffList.Where(w => w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList();
} }
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
@@ -156,7 +156,7 @@ namespace WMS.Web.Repositories
var list = await query.Select(s => new ChangeBoxRecordQueryInfoResponse() var list = await query.Select(s => new ChangeBoxRecordQueryInfoResponse()
{ {
#region dto组装 #region dto组装
BillNo=s.changeBox.BillNo, BillNo = s.changeBox.BillNo,
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.changeBox.MaterialId), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.changeBox.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.changeBox.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.changeBox.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.changeBox.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.changeBox.MaterialId),

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

@@ -18,7 +18,7 @@ using WMS.Web.Repositories.Configuration;
namespace WMS.Web.Repositories namespace WMS.Web.Repositories
{ {
public class MoveBoxRecordRepositories : IAllFielRepositories<MoveBoxRecordQueryRequest>,IMoveBoxRecordRepositories public class MoveBoxRecordRepositories : IAllFielRepositories<MoveBoxRecordQueryRequest>, IMoveBoxRecordRepositories
{ {
private readonly IMapper _mapper; private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider; private readonly IServiceProvider _serviceProvider;
@@ -114,7 +114,7 @@ namespace WMS.Web.Repositories
if (!string.IsNullOrEmpty(dto.Creator)) if (!string.IsNullOrEmpty(dto.Creator))
{ {
var staffList = await _basicsRepositories.GetStaffListAsync(_loginRepositories.CompanyId); var staffList = await _basicsRepositories.GetStaffListAsync(_loginRepositories.CompanyId);
ids = staffList.Where(w => EF.Functions.Like(w.Name, "%" + dto.Creator + "%")).Select(s => s.Id).ToList(); ids = staffList.Where(w => w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList();
} }
var query = _context.MoveBoxRecord var query = _context.MoveBoxRecord
@@ -123,7 +123,7 @@ namespace WMS.Web.Repositories
.OrderByDescending(o => o.moveBox.Id) .OrderByDescending(o => o.moveBox.Id)
.Where(adv => 1 == 1); .Where(adv => 1 == 1);
if(dto.SrcSubStockId!=null) if (dto.SrcSubStockId != null)
query = query.Where(w => w.moveBox.SrcSubStockId == dto.SrcSubStockId); query = query.Where(w => w.moveBox.SrcSubStockId == dto.SrcSubStockId);
if (dto.DestSubStockId != null) if (dto.DestSubStockId != null)
query = query.Where(w => w.moveBox.DestSubStockId == dto.DestSubStockId); query = query.Where(w => w.moveBox.DestSubStockId == dto.DestSubStockId);
@@ -142,7 +142,7 @@ namespace WMS.Web.Repositories
var list = await query.Select(s => new MoveBoxRecordQueryInfoResponse() var list = await query.Select(s => new MoveBoxRecordQueryInfoResponse()
{ {
#region dto组装 #region dto组装
BillNo=s.moveBox.BillNo, BillNo = s.moveBox.BillNo,
Box = s.box.BoxBillNo, Box = s.box.BoxBillNo,
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.SrcSubStockId), SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.SrcSubStockId),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.DestSubStockId), DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.DestSubStockId),