根据载具ID获取相关信息

This commit is contained in:
alex
2023-06-26 16:43:25 +08:00
parent c40dfcd079
commit 65b6bb31ce
2 changed files with 165 additions and 5 deletions

View File

@@ -0,0 +1,142 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto.Outputs
{
/// <summary>
/// 载具信息输出类
/// </summary>
public class CarryInfoOutput
{
/// <summary>
/// 租户ID
/// </summary>
public string? tenant_id { get; set; }
/// <summary>
/// 所属组织ID
/// </summary>
public string? org_id { get; set; }
/// <summary>
/// 载具编号
/// </summary>
public string carry_code { get; set; } = string.Empty;
/// <summary>
/// 载具名称
/// </summary>
public string carry_name { get; set; } = string.Empty;
/// <summary>
/// 状态
/// </summary>
public int status { get; set; }
/// <summary>
/// 载具状态
/// </summary>
public string carry_status { get; set; }
/// <summary>
/// 载具分类ID
/// </summary>
public string carrystd_id { get; set; } = string.Empty;
/// <summary>
/// 载具库位ID
/// </summary>
public string? location_id { get; set; }
/// <summary>
/// 载具库位编号
/// </summary>
public string? location_code { get; set; }
/// <summary>
/// 是否锁定
/// </summary>
public int is_lock { get; set; }
/// <summary>
/// 出库类型
/// </summary>
public string out_status { get; set; }
/// <summary>
/// 是否检验
/// </summary>
public int is_check { get; set; }
/// <summary>
/// 来源单据ID
/// </summary>
public string? source_id { get; set; }
/// <summary>
/// 来源单据代码
/// </summary>
public string? source_code { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string create_id { get; set; } = string.Empty;
/// <summary>
/// 创建时间
/// </summary>
public DateTime create_time { get; set; } = DateTime.Now;
/// <summary>
/// 最后修改人员ID
/// </summary>
public string? modify_id { get; set; }
/// <summary>
/// 最后修改时间
/// </summary>
public DateTime? modify_time { get; set; }
/// <summary>
/// 扩展字段
/// </summary>
public string? extras { get; set; }
/// <summary>
/// 时间戳(用于并发控制)
/// </summary>
public DateTime? timestamp { get; set; }
/// <summary>
/// 打包号
/// </summary>
public string? bale_num { get; set; }
/// <summary>
/// 齐套搭配方案ID
/// </summary>
public string? collocation_scheme_id { get; set; }
/// <summary>
/// 齐套搭配方案编号
/// </summary>
public string? collocation_scheme_code { get; set; }
/// <summary>
/// 载具明细列表
/// </summary>
public List<WmsCarryD> carryDetails { get; set; }=new List<WmsCarryD>();
/// <summary>
/// 载具条码列表
/// </summary>
public List<WmsCarryCode> carryCodes { get; set; } = new List<WmsCarryCode>();
/// <summary>
/// 载具无聊分拣明细
/// </summary>
public List<WmsCarryMat> carryMats { get; set; } = new List<WmsCarryMat>();
}
}

View File

@@ -18,6 +18,7 @@ using Tnb.Common.Utils;
using Tnb.WarehouseMgr.Entities; using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Consts; using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.WarehouseMgr.Entities.Dto; using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Dto.Outputs;
using Tnb.WarehouseMgr.Entities.Enums; using Tnb.WarehouseMgr.Entities.Enums;
using Tnb.WarehouseMgr.Interfaces; using Tnb.WarehouseMgr.Interfaces;
@@ -35,11 +36,11 @@ namespace Tnb.WarehouseMgr
private readonly IRunService _runService; private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService; private readonly IVisualDevService _visualDevService;
public WmsCarryService( public WmsCarryService(
ISqlSugarRepository<WmsCarryH> repository, ISqlSugarRepository<WmsCarryH> repository,
IUserManager userManager, IUserManager userManager,
IBillRullService billRullService, IBillRullService billRullService,
IRunService runService, IRunService runService,
IVisualDevService visualDevService ) IVisualDevService visualDevService)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_userManager = userManager; _userManager = userManager;
@@ -49,6 +50,23 @@ namespace Tnb.WarehouseMgr
OverideFuncs.CreateAsync = ExchangeCarry; OverideFuncs.CreateAsync = ExchangeCarry;
} }
/// <summary>
/// 根据载具ID获取载具信息
/// </summary>
/// <param name="carryId"></param>
/// <returns></returns>
[HttpGet]
public async Task<dynamic> GetCarryInfoById([FromRoute] string carryId)
{
var carryOutPut = await _db.Queryable<WmsCarryH>().Where(it => it.id == carryId).Select<CarryInfoOutput>().FirstAsync();
if (carryOutPut == null) throw new AppFriendlyException("找不到载具", 500);
carryOutPut.carryDetails = await _db.Queryable<WmsCarryD>().Where(it=>it.carry_id == carryId).ToListAsync();
carryOutPut.carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync();
carryOutPut.carryMats = await _db.Queryable<WmsCarryMat>().Where(it => it.carry_id == carryId).ToListAsync();
return carryOutPut;
}
/// <summary> /// <summary>
/// 更换载具 /// 更换载具
/// </summary> /// </summary>
@@ -63,7 +81,7 @@ namespace Tnb.WarehouseMgr
/// <exception cref="ArgumentNullException"></exception> /// <exception cref="ArgumentNullException"></exception>
private async Task<dynamic> ExchangeCarry(VisualDevModelDataCrInput input) private async Task<dynamic> ExchangeCarry(VisualDevModelDataCrInput input)
{ {
var isOk = false; var isOk = false;
try try