From 65b6bb31ce1acc9d0830afa19c7152de23040b26 Mon Sep 17 00:00:00 2001
From: alex <whitebig@126.com>
Date: Mon, 26 Jun 2023 16:43:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BD=BD=E5=85=B7ID=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/Outputs/CarryInfoOutput.cs            | 142 ++++++++++++++++++
 .../Tnb.WarehouseMgr/WmsCarryService.cs       |  28 +++-
 2 files changed, 165 insertions(+), 5 deletions(-)
 create mode 100644 WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryInfoOutput.cs

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
+{
+    /// <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>();
+
+    }
+}
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<WmsCarryH> repository, 
-            IUserManager userManager, 
-            IBillRullService billRullService, 
+            ISqlSugarRepository<WmsCarryH> 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;
         }
 
+        /// <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>
@@ -63,7 +81,7 @@ namespace Tnb.WarehouseMgr
         /// <exception cref="ArgumentNullException"></exception>
         private async Task<dynamic> ExchangeCarry(VisualDevModelDataCrInput input)
         {
-           
+
 
             var isOk = false;
             try