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-18 09:52:46 +08:00
parent b9862b9a20
commit fb4eb5877d
12 changed files with 76 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs
View File

@@ -17,14 +17,22 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord
/// 目标箱子 /// 目标箱子
/// </summary> /// </summary>
public string DestBox { get; set; } public string DestBox { get; set; }
///// <summary>
///// 原仓位ID
///// </summary>
//public int? SrcSubStockId { get; set; }
///// <summary>
///// 现仓位ID
///// </summary>
//public int? DestSubStockId { get; set; }
/// <summary> /// <summary>
/// 原仓位ID /// 原仓位编码
/// </summary> /// </summary>
public int? SrcSubStockId { get; set; } public string SrcSubStockCode { get; set; }
/// <summary> /// <summary>
/// 现仓位ID /// 现仓位编码
/// </summary> /// </summary>
public int? DestSubStockId { get; set; } public string DestSubStockCode { get; set; }
/// <summary> /// <summary>
/// 操作人 /// 操作人
/// </summary> /// </summary>

12
src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs
View File

@@ -9,14 +9,22 @@ namespace WMS.Web.Core.Dto.MoveBoxRecord
/// </summary> /// </summary>
public class MoveBoxRecordQueryRequest : PaginationBaseRequestDto public class MoveBoxRecordQueryRequest : PaginationBaseRequestDto
{ {
///// <summary>
///// 原仓位编码
///// </summary>
//public int? SrcSubStockId { get; set; }
///// <summary>
///// 目标仓位编码
///// </summary>
//public int? DestSubStockId { get; set; }
/// <summary> /// <summary>
/// 原仓位编码 /// 原仓位编码
/// </summary> /// </summary>
public int? SrcSubStockId { get; set; } public string SrcSubStockCode { get; set; }
/// <summary> /// <summary>
/// 目标仓位编码 /// 目标仓位编码
/// </summary> /// </summary>
public int? DestSubStockId { get; set; } public string DestSubStockCode { get; set; }
/// <summary> /// <summary>
/// 类型：1- 整箱移货上级，2-整箱移货下级 /// 类型：1- 整箱移货上级，2-整箱移货下级
/// </summary> /// </summary>

20
src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs
View File

@@ -54,11 +54,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary> /// </summary>
[Column("DestBoxId")] [Column("DestBoxId")]
public int DestBoxId { get; set; } public int DestBoxId { get; set; }
/// <summary> ///// <summary>
/// 原箱仓位 ///// 原箱仓位
///</summary> /////</summary>
[Column("SrcSubStockId")] //[Column("SrcSubStockId")]
public int SrcSubStockId { get; set; } //public int SrcSubStockId { get; set; }
/// <summary> /// <summary>
/// 原箱仓位 /// 原箱仓位
///</summary> ///</summary>
@@ -69,11 +69,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary> /// </summary>
[Column("DestStockCode")] [Column("DestStockCode")]
public string DestStockCode { get; set; } public string DestStockCode { get; set; }
/// <summary> ///// <summary>
/// 目标箱仓位或重新上架选择仓位 ///// 目标箱仓位或重新上架选择仓位
///</summary> /////</summary>
[Column("DestSubStockId")] //[Column("DestSubStockId")]
public int DestSubStockId { get; set; } //public int DestSubStockId { get; set; }
/// <summary> /// <summary>
/// 目标箱仓位或重新上架选择仓位 /// 目标箱仓位或重新上架选择仓位
///</summary> ///</summary>

20
src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs
View File

@@ -40,16 +40,16 @@ namespace WMS.Web.Domain.Entitys
///</summary> ///</summary>
[Column("StockCode")] [Column("StockCode")]
public string StockCode { get; set; } public string StockCode { get; set; }
/// <summary> ///// <summary>
/// 原仓位Id ///// 原仓位Id
/// </summary> ///// </summary>
[Column("SrcSubStockId")] //[Column("SrcSubStockId")]
public int SrcSubStockId { get; set; } //public int SrcSubStockId { get; set; }
/// <summary> ///// <summary>
/// 目标仓位Id ///// 目标仓位Id
/// </summary> ///// </summary>
[Column("DestSubStockId")] //[Column("DestSubStockId")]
public int DestSubStockId { get; set; } //public int DestSubStockId { get; set; }
/// <summary> /// <summary>
/// 原仓位编码 /// 原仓位编码
/// </summary> /// </summary>

10
src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs
View File

@@ -34,11 +34,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary> /// </summary>
[Column("SerialNumbers")] [Column("SerialNumbers")]
public List<string> SerialNumbers { get; set; } = new List<string>(); public List<string> SerialNumbers { get; set; } = new List<string>();
/// <summary> ///// <summary>
/// 仓位 ///// 仓位
///</summary> /////</summary>
[Column("SubStockId")] //[Column("SubStockId")]
public int SubStockId { get; set; } //public int SubStockId { get; set; }
/// <summary> /// <summary>
/// 仓位 /// 仓位
/// </summary> /// </summary>

10
src/WMS.Web.Domain/Entitys/TakeStockDetails.cs
View File

@@ -50,11 +50,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary> /// </summary>
[Column("StockCode")] [Column("StockCode")]
public string StockCode { get; set; } public string StockCode { get; set; }
/// <summary> ///// <summary>
/// 仓位 ///// 仓位
/// </summary> ///// </summary>
[Column("SubStockId")] //[Column("SubStockId")]
public int SubStockId { get; set; } //public int SubStockId { get; set; }
/// <summary> /// <summary>
/// 仓位 /// 仓位
/// </summary> /// </summary>

4
src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
View File

@@ -168,8 +168,8 @@ namespace WMS.Web.Domain.Services
{ {
ChangeBoxRecord entity = new ChangeBoxRecord(); ChangeBoxRecord entity = new ChangeBoxRecord();
entity.Create(loginInfo.UserInfo.StaffId, d.Qty, d.MaterialNumber, d.SerialNumbers, dt.SrcBoxId, dt.DestBoxId); entity.Create(loginInfo.UserInfo.StaffId, d.Qty, d.MaterialNumber, d.SerialNumbers, dt.SrcBoxId, dt.DestBoxId);
entity.SrcSubStockId = boxi?.SubStockId ?? 0;//原乡仓位需要去拉一下库存获取 //entity.SrcSubStockId = boxi?.SubStockId ?? 0;//原乡仓位需要去拉一下库存获取
entity.SrcSubStockCode = subStock_s?.Code ?? ""; entity.SrcSubStockCode = subStock_s?.Code ?? "";//原乡仓位需要去拉一下库存获取
if (subStock != null) if (subStock != null)
{ {
//entity.DestSubStockId = dt.SubStockId; //entity.DestSubStockId = dt.SubStockId;

8
src/WMS.Web.Domain/Services/TakeStockService.cs
View File

@@ -89,11 +89,11 @@ namespace WMS.Web.Domain.Services
TakeStock takeStock = new TakeStock(); TakeStock takeStock = new TakeStock();
takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Profit); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Profit);
takeStock.Details = _mapper.Map<List<TakeStockDetails>>(profitList); takeStock.Details = _mapper.Map<List<TakeStockDetails>>(profitList);
var subIds = takeStock.Details.Select(s => s.SubStockId).ToList(); var subIds = takeStock.Details.Select(s => s.SubStockCode).ToList();
var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId); var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId);
foreach (var d in takeStock.Details) foreach (var d in takeStock.Details)
{ {
var subStock = subStocks.FirstOrDefault(f => f.Id == d.SubStockId); var subStock = subStocks.FirstOrDefault(f => f.Code == d.SubStockCode);
d.OrgCode = subStock?.ErpOrgCode; d.OrgCode = subStock?.ErpOrgCode;
d.StockCode = subStock?.StockCode; d.StockCode = subStock?.StockCode;
d.SubStockCode = subStock?.Code; d.SubStockCode = subStock?.Code;
@@ -110,11 +110,11 @@ namespace WMS.Web.Domain.Services
TakeStock takeStock = new TakeStock(); TakeStock takeStock = new TakeStock();
takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Loss); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Loss);
takeStock.Details = _mapper.Map<List<TakeStockDetails>>(lossList); takeStock.Details = _mapper.Map<List<TakeStockDetails>>(lossList);
var subIds = takeStock.Details.Select(s => s.SubStockId).ToList(); var subIds = takeStock.Details.Select(s => s.SubStockCode).ToList();
var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId); var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId);
foreach (var d in takeStock.Details) foreach (var d in takeStock.Details)
{ {
var subStock = subStocks.FirstOrDefault(f => f.Id == d.SubStockId); var subStock = subStocks.FirstOrDefault(f => f.Code == d.SubStockCode);
d.OrgCode = subStock?.ErpOrgCode; d.OrgCode = subStock?.ErpOrgCode;
d.StockCode = subStock?.StockCode; d.StockCode = subStock?.StockCode;
d.SubStockCode = subStock?.Code; d.SubStockCode = subStock?.Code;

10
src/WMS.Web.Repositories/BoxRepositories.cs
View File

@@ -68,15 +68,15 @@ namespace WMS.Web.Repositories
var serialList = await _context.SerialNumbers.Where(f => ids.Contains(f.BoxId)).ToListAsync(); var serialList = await _context.SerialNumbers.Where(f => ids.Contains(f.BoxId)).ToListAsync();
//获取物料信息 显示物料三件套 //获取物料信息 显示物料三件套
var mIds = list.SelectMany(s => s.Details).Select(s => s.MaterialId).ToList(); var mIds = list.SelectMany(s => s.Details).Select(s => s.MaterialNumber).ToList();
foreach (var r in resList) foreach (var r in resList)
{ {
foreach (var detail in r.Details) foreach (var detail in r.Details)
{ {
detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, detail.MaterialId); detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, detail.MaterialNumber);
detail.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, detail.MaterialId); detail.MaterialNumber = detail.MaterialNumber;
detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialId); detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialNumber);
detail.SerialNumbers = serialList.Where(w => w.BoxId == r.Id && w.MaterialId == detail.MaterialId).Select(s => s.SerialNumber).ToList(); detail.SerialNumbers = serialList.Where(w => w.BoxId == r.Id && w.MaterialNumber == detail.MaterialNumber).Select(s => s.SerialNumber).ToList();
} }
r.TotalQty = r.Details.Sum(s => s.Qty); r.TotalQty = r.Details.Sum(s => s.Qty);
} }

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

@@ -149,10 +149,10 @@ namespace WMS.Web.Repositories
query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%")); query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%"));
if (!string.IsNullOrEmpty(dto.DestBox)) if (!string.IsNullOrEmpty(dto.DestBox))
query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%")); query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%"));
if (dto.SrcSubStockId != null) if (dto.SrcSubStockCode != null)
query = query.Where(w => w.changeBox.SrcSubStockId == dto.SrcSubStockId); query = query.Where(w => w.changeBox.SrcSubStockCode == dto.SrcSubStockCode);
if (dto.DestSubStockId != null) if (dto.DestSubStockCode != null)
query = query.Where(w => w.changeBox.DestSubStockId == dto.DestSubStockId); query = query.Where(w => w.changeBox.DestSubStockCode == dto.DestSubStockCode);
if (dto.CreateBeginDate != null) if (dto.CreateBeginDate != null)
query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate); query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate);
if (dto.CreateEndDate != null) if (dto.CreateEndDate != null)
@@ -172,8 +172,8 @@ namespace WMS.Web.Repositories
DestBox = s.destBox.BoxBillNo, DestBox = s.destBox.BoxBillNo,
Qty=s.changeBox.Qty, Qty=s.changeBox.Qty,
DestBoxOrg= _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode), DestBoxOrg= _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode),
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.SrcSubStockId), SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.SrcSubStockCode),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.DestSubStockId), DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.DestSubStockCode),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.changeBox.CreatorId), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.changeBox.CreatorId),
CreateTime = s.changeBox.CreateTime.DateToStringSeconds() CreateTime = s.changeBox.CreateTime.DateToStringSeconds()
#endregion #endregion

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

@@ -161,10 +161,10 @@ 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.SrcSubStockCode != null)
query = query.Where(w => w.moveBox.SrcSubStockId == dto.SrcSubStockId); query = query.Where(w => w.moveBox.SrcSubStockCode == dto.SrcSubStockCode);
if (dto.DestSubStockId != null) if (dto.DestSubStockCode != null)
query = query.Where(w => w.moveBox.DestSubStockId == dto.DestSubStockId); query = query.Where(w => w.moveBox.DestSubStockCode == dto.DestSubStockCode);
if (!string.IsNullOrEmpty(dto.Creator)) if (!string.IsNullOrEmpty(dto.Creator))
query = query.Where(w => ids.Contains(w.moveBox.CreatorId)); query = query.Where(w => ids.Contains(w.moveBox.CreatorId));
if (!string.IsNullOrEmpty(dto.Box)) if (!string.IsNullOrEmpty(dto.Box))
@@ -182,8 +182,8 @@ namespace WMS.Web.Repositories
#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, companyId, s.moveBox.SrcSubStockId), SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.SrcSubStockCode),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.DestSubStockId), DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.DestSubStockCode),
Qty = s.moveBox.Qty, Qty = s.moveBox.Qty,
Type = s.moveBox.Type.GetRemark(), Type = s.moveBox.Type.GetRemark(),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.moveBox.CreatorId), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.moveBox.CreatorId),

2
src/WMS.Web.Repositories/TakeStockRepositories.cs
View File

@@ -259,7 +259,7 @@ namespace WMS.Web.Repositories
BillNo = s.order.BillNo, BillNo = s.order.BillNo,
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber), Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.detail.StockCode + s.detail.OrgCode), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.detail.StockCode + s.detail.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockId), SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockCode),
Erp_SubStock = _erpBasicDataExtendService.GetSubStockName(subStocks, s.detail.Erp_SubStockCode), Erp_SubStock = _erpBasicDataExtendService.GetSubStockName(subStocks, s.detail.Erp_SubStockCode),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber),
MaterialNumber = s.detail.MaterialNumber, MaterialNumber = s.detail.MaterialNumber,