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

调整盘点结构

Browse Source
This commit is contained in:
18942506660
2023-12-07 11:31:06 +08:00
parent c5b8ec76be
commit 2086901e48
7 changed files with 112 additions and 128 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.

53
src/WMS.Web.Domain/Entitys/TakeStock.cs
View File

@@ -41,51 +41,6 @@ namespace WMS.Web.Domain.Entitys
[Column("SuccessSync")] [Column("SuccessSync")]
public SyncStatus SuccessSync { get; set; } = SyncStatus.Fail; public SyncStatus SuccessSync { get; set; } = SyncStatus.Fail;
/// <summary> /// <summary>
/// 箱Id
/// </summary>
[Column("BoxId")]
public int BoxId { get; set; }
/// <summary>
/// 物料ID
/// </summary>
[Column("MaterialId")]
public int MaterialId { get; set; }
/// <summary>
/// 组织编码
/// </summary>
[Column("OrgCode")]
public string OrgCode { get; set; }
/// <summary>
/// 仓库
/// </summary>
[Column("StockCode")]
public string StockCode { get; set; }
/// <summary>
/// 仓位
/// </summary>
[Column("SubStockId")]
public int SubStockId { get; set; }
/// <summary>
/// 子仓库(跟金蝶交互字段)
/// </summary>
[Column("Erp_SubStockId")]
public int Erp_SubStockId { get; set; }
/// <summary>
/// 系统库存
/// </summary>
[Column("BeforeQty")]
public decimal BeforeQty { get; set; }
/// <summary>
/// 盘点数量
/// </summary>
[Column("AfterQty")]
public decimal AfterQty { get; set; }
/// <summary>
/// 盈亏数量
/// </summary>
[Column("FinalQty")]
public decimal FinalQty { get; set; }
/// <summary>
/// 盘点结果类型：1为盘盈，2位盘亏 /// 盘点结果类型：1为盘盈，2位盘亏
/// 盘点数量-系统库存 大于0为盘盈 小于0为盘亏 /// 盘点数量-系统库存 大于0为盘盈 小于0为盘亏
/// </summary> /// </summary>
@@ -102,16 +57,16 @@ namespace WMS.Web.Domain.Entitys
[Column("ErpSyncId")] [Column("ErpSyncId")]
public string ErpSyncId { get; set; } public string ErpSyncId { get; set; }
/// <summary> /// <summary>
/// 序列号 /// 明细
/// </summary> /// </summary>
[Column("SerialNumbers")] public List<TakeStockDetails> Details { get; set; } = new List<TakeStockDetails>();
public List<string> SerialNumbers { get; set; } = new List<string>();
/// <summary> /// <summary>
/// 创建 /// 创建
/// </summary> /// </summary>
/// <param name="creatorId"></param> /// <param name="creatorId"></param>
public void Create(int creatorId) public void Create(int creatorId, TakeStockType resultType)
{ {
this.ResultType = resultType;
this.CreatorId = creatorId; this.CreatorId = creatorId;
this.Date = DateTime.Now; this.Date = DateTime.Now;
} }

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

@@ -36,39 +36,44 @@ namespace WMS.Web.Domain.Entitys
[Column("MaterialId")] [Column("MaterialId")]
public int MaterialId { get; set; } public int MaterialId { get; set; }
/// <summary> /// <summary>
/// 仓库ID /// 组织编码
/// </summary> /// </summary>
[Column("StockId")] [Column("OrgCode")]
public int StockId { get; set; } public string OrgCode { get; set; }
/// <summary> /// <summary>
/// 仓位ID /// 仓库
/// </summary>
[Column("StockCode")]
public string StockCode { get; set; }
/// <summary>
/// 仓位
/// </summary> /// </summary>
[Column("SubStockId")] [Column("SubStockId")]
public int SubStockId { get; set; } public int SubStockId { get; set; }
/// <summary> /// <summary>
/// 盘点前数量（wms系统数量） /// 子仓库(跟金蝶交互字段)
/// </summary>
[Column("Erp_SubStockId")]
public int Erp_SubStockId { get; set; }
/// <summary>
/// 系统库存
/// </summary> /// </summary>
[Column("BeforeQty")] [Column("BeforeQty")]
public decimal BeforeQty { get; set; } public decimal BeforeQty { get; set; }
/// <summary> /// <summary>
/// 盘点实际数量（实际仓库数量） /// 盘点数量
/// </summary> /// </summary>
[Column("AfterQty")] [Column("AfterQty")]
public decimal AfterQty { get; set; } public decimal AfterQty { get; set; }
/// <summary> /// <summary>
/// 盘点后数量 /// 盈亏数量
/// </summary> /// </summary>
[Column("FinalQty")] [Column("FinalQty")]
public decimal FinalQty { get; set; } public decimal FinalQty { get; set; }
/// <summary> /// <summary>
/// 盘点结果类型：1为盘盈，2位盘亏 /// 序列号
/// </summary> /// </summary>
[Column("ResultType")] [Column("SerialNumbers")]
public TakeStockType ResultType { get; set; } = TakeStockType.Profit; public List<string> SerialNumbers { get; set; } = new List<string>();
/// <summary>
/// 备注
/// </summary>
[Column("Remark")]
public string Remark { get; set; }
} }
} }

9
src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
View File

@@ -15,12 +15,9 @@ namespace WMS.Web.Domain.Mappers
CreateMap<TakeStock, TakeStock>(); CreateMap<TakeStock, TakeStock>();
CreateMap<SaveTakeStockRequest, TakeStockDetails>() CreateMap<SaveTakeStockRequest, TakeStockDetails>()
.ForMember(x => x.ResultType, ops => ops.MapFrom(x => (x.AfterQty - x.BeforeQty) > 0 ? TakeStockType.Profit : TakeStockType.Loss)) .ForMember(x => x.FinalQty, ops => ops.MapFrom(x => Math.Abs(x.AfterQty - x.BeforeQty)))
.ForMember(x => x.FinalQty, ops => ops.MapFrom(x => Math.Abs(x.AfterQty - x.BeforeQty))); .ForMember(x => x.Erp_SubStockId, ops => ops.MapFrom(x => x.Erp_SubStockId ?? 0));
CreateMap<SaveTakeStockRequest, TakeStock>() CreateMap<SaveTakeStockRequest, TakeStock>();
.ForMember(x => x.ResultType, ops => ops.MapFrom(x => (x.AfterQty - x.BeforeQty) > 0 ? TakeStockType.Profit : TakeStockType.Loss))
.ForMember(x => x.FinalQty, ops => ops.MapFrom(x => Math.Abs(x.AfterQty - x.BeforeQty)))
.ForMember(x => x.Erp_SubStockId, ops => ops.MapFrom(x => x.Erp_SubStockId ?? 0));
} }
} }
} }

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

@@ -64,14 +64,36 @@ namespace WMS.Web.Domain.Services
/// <returns></returns> /// <returns></returns>
public async Task<Result> Save(List<SaveTakeStockRequest> dto, LoginInDto loginInfo) public async Task<Result> Save(List<SaveTakeStockRequest> dto, LoginInDto loginInfo)
{ {
_logger.LogInformation($"盘点保存:{JsonConvert.SerializeObject(dto)} 盘点人:{loginInfo.UserInfo.StaffId}" ); _logger.LogInformation($"盘点保存:{JsonConvert.SerializeObject(dto)} 盘点人:{loginInfo.UserInfo.StaffId}");
List<TakeStock> list = _mapper.Map<List<TakeStock>>(dto); List<TakeStock> list = new List<TakeStock>();
foreach (var entity in list) var profitList = dto.Where(w => w.AfterQty >= w.BeforeQty).ToList();//盘盈
var lossList = dto.Where(w => w.AfterQty < w.BeforeQty).ToList();//盘亏
if (profitList.Count() > 0)
{ {
var subStock = await _transactionRepositories.GetSubUcStockAsync(entity.SubStockId, loginInfo.UserInfo.CompanyId); TakeStock takeStock = new TakeStock();
entity.Create(loginInfo.UserInfo.StaffId); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Profit);
entity.OrgCode = subStock?.ErpOrgCode; takeStock.Details = _mapper.Map<List<TakeStockDetails>>(dto);
entity.StockCode = subStock?.StockCode; foreach(var d in takeStock.Details)
{
var subStock = await _transactionRepositories.GetSubUcStockAsync(d.SubStockId, loginInfo.UserInfo.CompanyId);
d.OrgCode = subStock?.ErpOrgCode;
d.StockCode = subStock?.StockCode;
}
list.Add(takeStock);
}
if (lossList.Count() > 0)
{
TakeStock takeStock = new TakeStock();
takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Loss);
takeStock.Details = _mapper.Map<List<TakeStockDetails>>(dto);
foreach (var d in takeStock.Details)
{
var subStock = await _transactionRepositories.GetSubUcStockAsync(d.SubStockId, loginInfo.UserInfo.CompanyId);
d.OrgCode = subStock?.ErpOrgCode;
d.StockCode = subStock?.StockCode;
}
list.Add(takeStock);
} }
IDbContextTransaction _transaction = _transactionRepositories.GetTransaction(); IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
@@ -125,33 +147,38 @@ namespace WMS.Web.Domain.Services
{ {
//获取金蝶仓库仓位编码 //获取金蝶仓库仓位编码
//var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId); //var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId); //var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
var materials = materials_result.Data.ToList(); var materials = materials_result.Data.ToList();
var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, entity.MaterialId);
var res = await _erpService.BillQueryForStock(); var res = await _erpService.BillQueryForStock();
var resSub = await _erpService.BillQueryForSubStock(); var resSub = await _erpService.BillQueryForSubStock();
var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索 var stock = res.Data.FirstOrDefault(f => f.Code == entity.Details[0].StockCode);//需要根据单点code搜索
var subStock = resSub.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
if (stock == null) return Result.ReFailure(ResultCodes.ErpStockNoData); if (stock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
//组装dto //组装dto
#region 组装dto #region 组装dto
//子仓库 ORICO_JD：1000008 GD：1000005 HD：1000007 AD：1000004 //子仓库 ORICO_JD：1000008 GD：1000005 HD：1000007 AD：1000004
List<ErpTakeStockDetailsSaveDto> detils = new List<ErpTakeStockDetailsSaveDto>(); List<ErpTakeStockDetailsSaveDto> detils = new List<ErpTakeStockDetailsSaveDto>();
detils.Add(new ErpTakeStockDetailsSaveDto() foreach (var d in entity.Details)
{ {
FOwnerid = new ErpNumberDto(stock.OrgCode.ToString()), var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, d.SubStockId);
FKeeperId = new ErpNumberDto(stock.OrgCode.ToString()), var subStock = resSub.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
MaterialId = new ErpNumberDto(_erpBasicDataExtendService.GetMaterialNumber(materials, entity.MaterialId)), var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialId);
UnitId = new ErpNumberDto(unitNumber), //物料带出来 detils.Add(new ErpTakeStockDetailsSaveDto()
StockId = new ErpNumberDto(stock.Code), {
SubStockId = new ErpSubStockDto(stock.Code, resSub.Data.FirstOrDefault(f => f.Id == entity.Erp_SubStockId)?.Code), FOwnerid = new ErpNumberDto(stock.OrgCode.ToString()),
BeforeQty = entity.BeforeQty, FKeeperId = new ErpNumberDto(stock.OrgCode.ToString()),
AfterQty = entity.AfterQty, MaterialId = new ErpNumberDto(_erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId)),
FinalQty = entity.ResultType == TakeStockType.Profit ? entity.FinalQty : 0, UnitId = new ErpNumberDto(unitNumber), //物料带出来
LossQty = entity.ResultType == TakeStockType.Loss ? entity.FinalQty : 0, StockId = new ErpNumberDto(stock.Code),
Fnote = entity.ResultType == TakeStockType.Loss ? "wms盘亏单同步" : "wms盘盈单同步" SubStockId = new ErpSubStockDto(stock.Code, resSub.Data.FirstOrDefault(f => f.Id == d.Erp_SubStockId)?.Code),
}); BeforeQty = d.BeforeQty,
AfterQty = d.AfterQty,
FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0,
LossQty = entity.ResultType == TakeStockType.Loss ? d.FinalQty : 0,
Fnote = entity.ResultType == TakeStockType.Loss ? "wms盘亏单同步" : "wms盘盈单同步"
});
}
ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto() ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto()
{ {
BillNo = entity.BillNo, BillNo = entity.BillNo,

16
src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs
View File

@@ -161,19 +161,19 @@ namespace WMS.Web.Repositories.Configuration
ent.ToTable("t_wms_takestock"); ent.ToTable("t_wms_takestock");
ent.HasKey(x => x.Id); ent.HasKey(x => x.Id);
//ent.HasMany(p => p.Details) ent.HasMany(p => p.Details)
// .WithOne() .WithOne()
// .HasForeignKey(p => p.Fid) .HasForeignKey(p => p.Fid)
// .OnDelete(DeleteBehavior.Cascade); .OnDelete(DeleteBehavior.Cascade);
ent.Property(f => f.SerialNumbers).HasConversion(
v => JsonConvert.SerializeObject(v),
v => JsonConvert.DeserializeObject<List<string>>(v));
}); });
builder.Entity<TakeStockDetails>(ent => builder.Entity<TakeStockDetails>(ent =>
{ {
ent.ToTable("t_wms_takestock_details"); ent.ToTable("t_wms_takestock_details");
ent.HasKey(x => x.Id); ent.HasKey(x => x.Id);
ent.Property(f => f.SerialNumbers).HasConversion(
v => JsonConvert.SerializeObject(v),
v => JsonConvert.DeserializeObject<List<string>>(v));
}); });
#endregion #endregion

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

@@ -173,44 +173,44 @@ namespace WMS.Web.Repositories
return (new List<TakeStockQueryInfoResponse>(), 0); return (new List<TakeStockQueryInfoResponse>(), 0);
var subStocks = subStock_result.Data.ToList(); var subStocks = subStock_result.Data.ToList();
var query = _context.TakeStock var query = _context.TakeStockDetails
//.GroupJoin(_context.TakeStock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders }) .GroupJoin(_context.TakeStock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
//.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order }) .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
.OrderByDescending(o => o.Id) .OrderByDescending(o => o.detail.Id)
.Where(adv => 1 == 1); .Where(adv => 1 == 1);
if (dto.ResultType != null) if (dto.ResultType != null)
query = query.Where(w => w.ResultType == (TakeStockType)dto.ResultType); query = query.Where(w => w.order.ResultType == (TakeStockType)dto.ResultType);
if (!string.IsNullOrEmpty(dto.BillNo)) if (!string.IsNullOrEmpty(dto.BillNo))
query = query.Where(w => EF.Functions.Like(w.BillNo, "%" + dto.BillNo + "%")); query = query.Where(w => EF.Functions.Like(w.order.BillNo, "%" + dto.BillNo + "%"));
if (!string.IsNullOrEmpty(dto.StockCode)) if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.StockCode == dto.StockCode); query = query.Where(w => w.detail.StockCode == dto.StockCode);
if (dto.DateBeginDate != null) if (dto.DateBeginDate != null)
query = query.Where(w => w.Date >= dto.DateBeginDate); query = query.Where(w => w.order.Date >= dto.DateBeginDate);
if (dto.DateEndDate != null) if (dto.DateEndDate != null)
query = query.Where(w => w.Date <= dto.DateEndDate); query = query.Where(w => w.order.Date <= dto.DateEndDate);
//组装 //组装
int total = await query.CountAsync(); int total = await query.CountAsync();
var list = await query.Select(s => new TakeStockQueryInfoResponse() var list = await query.Select(s => new TakeStockQueryInfoResponse()
{ {
#region dto组装 #region dto组装
Id = s.Id, Id = s.order.Id,
BillNo = s.BillNo, BillNo = s.order.BillNo,
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId), Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode + s.OrgCode), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId), SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.detail.SubStockId),
Erp_SubStock= _erpBasicDataExtendService.GetStockName(subStocks, s.Erp_SubStockId), Erp_SubStock= _erpBasicDataExtendService.GetStockName(subStocks, s.detail.Erp_SubStockId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
BeforeQty = s.BeforeQty, BeforeQty = s.detail.BeforeQty,
AfterQty = s.AfterQty, AfterQty = s.detail.AfterQty,
FinalQty = s.FinalQty, FinalQty = s.detail.FinalQty,
ResultType = s.ResultType.GetRemark(), ResultType = s.order.ResultType.GetRemark(),
Remark = s.Remark, Remark = s.order.Remark,
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.CreatorId), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
Date = s.Date.DateToStringSeconds(), Date = s.order.Date.DateToStringSeconds(),
SuccessSync = s.SuccessSync== SyncStatus.Success ? "成功":"失败", SuccessSync = s.order.SuccessSync== SyncStatus.Success ? "成功":"失败",
#endregion #endregion
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();