diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryInfoOutput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryInfoOutput.cs
new file mode 100644
index 00000000..279ad345
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryInfoOutput.cs
@@ -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
+{
+ ///
+ /// 载具信息输出类
+ ///
+ public class CarryInfoOutput
+ {
+ ///
+ /// 租户ID
+ ///
+ public string? tenant_id { get; set; }
+
+ ///
+ /// 所属组织ID
+ ///
+ public string? org_id { get; set; }
+
+ ///
+ /// 载具编号
+ ///
+ public string carry_code { get; set; } = string.Empty;
+
+ ///
+ /// 载具名称
+ ///
+ public string carry_name { get; set; } = string.Empty;
+
+ ///
+ /// 状态
+ ///
+ public int status { get; set; }
+
+ ///
+ /// 载具状态
+ ///
+ public string carry_status { get; set; }
+
+ ///
+ /// 载具分类ID
+ ///
+ public string carrystd_id { get; set; } = string.Empty;
+
+ ///
+ /// 载具库位ID
+ ///
+ public string? location_id { get; set; }
+
+ ///
+ /// 载具库位编号
+ ///
+ public string? location_code { get; set; }
+
+ ///
+ /// 是否锁定
+ ///
+ public int is_lock { get; set; }
+
+ ///
+ /// 出库类型
+ ///
+ public string out_status { get; set; }
+
+ ///
+ /// 是否检验
+ ///
+ public int is_check { get; set; }
+
+ ///
+ /// 来源单据ID
+ ///
+ public string? source_id { get; set; }
+
+ ///
+ /// 来源单据代码
+ ///
+ public string? source_code { get; set; }
+
+ ///
+ /// 创建用户
+ ///
+ public string create_id { get; set; } = string.Empty;
+
+ ///
+ /// 创建时间
+ ///
+ public DateTime create_time { get; set; } = DateTime.Now;
+
+ ///
+ /// 最后修改人员ID
+ ///
+ public string? modify_id { get; set; }
+
+ ///
+ /// 最后修改时间
+ ///
+ public DateTime? modify_time { get; set; }
+
+ ///
+ /// 扩展字段
+ ///
+ public string? extras { get; set; }
+
+ ///
+ /// 时间戳(用于并发控制)
+ ///
+ public DateTime? timestamp { get; set; }
+
+ ///
+ /// 打包号
+ ///
+ public string? bale_num { get; set; }
+
+ ///
+ /// 齐套搭配方案ID
+ ///
+ public string? collocation_scheme_id { get; set; }
+
+ ///
+ /// 齐套搭配方案编号
+ ///
+ public string? collocation_scheme_code { get; set; }
+ ///
+ /// 载具明细列表
+ ///
+ public List carryDetails { get; set; }=new List();
+ ///
+ /// 载具条码列表
+ ///
+ public List carryCodes { get; set; } = new List();
+ ///
+ /// 载具无聊分拣明细
+ ///
+ public List carryMats { get; set; } = new List();
+
+ }
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
index d7c079df..26f9547e 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
@@ -18,6 +18,7 @@ using Tnb.Common.Utils;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.WarehouseMgr.Entities.Dto;
+using Tnb.WarehouseMgr.Entities.Dto.Outputs;
using Tnb.WarehouseMgr.Entities.Enums;
using Tnb.WarehouseMgr.Interfaces;
@@ -35,11 +36,11 @@ namespace Tnb.WarehouseMgr
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
public WmsCarryService(
- ISqlSugarRepository repository,
- IUserManager userManager,
- IBillRullService billRullService,
+ ISqlSugarRepository repository,
+ IUserManager userManager,
+ IBillRullService billRullService,
IRunService runService,
- IVisualDevService visualDevService )
+ IVisualDevService visualDevService)
{
_db = repository.AsSugarClient();
_userManager = userManager;
@@ -49,6 +50,23 @@ namespace Tnb.WarehouseMgr
OverideFuncs.CreateAsync = ExchangeCarry;
}
+ ///
+ /// 根据载具ID获取载具信息
+ ///
+ ///
+ ///
+ [HttpGet]
+ public async Task GetCarryInfoById([FromRoute] string carryId)
+ {
+ var carryOutPut = await _db.Queryable().Where(it => it.id == carryId).Select().FirstAsync();
+ if (carryOutPut == null) throw new AppFriendlyException("找不到载具", 500);
+ carryOutPut.carryDetails = await _db.Queryable().Where(it=>it.carry_id == carryId).ToListAsync();
+ carryOutPut.carryCodes = await _db.Queryable().Where(it => it.carry_id == carryId).ToListAsync();
+ carryOutPut.carryMats = await _db.Queryable().Where(it => it.carry_id == carryId).ToListAsync();
+ return carryOutPut;
+ }
+
+
///
/// 更换载具
///
@@ -63,7 +81,7 @@ namespace Tnb.WarehouseMgr
///
private async Task ExchangeCarry(VisualDevModelDataCrInput input)
{
-
+
var isOk = false;
try