根据明细Id获取出入库明细信息，新增仓库翻译

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/IInOutStockCode.cs

@@ -3,6 +3,6 @@
     public interface IInOutStockCode
     {
         string bill_d_id { get; set; }
-
+        //string line_status { get; set; }
     }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/IInOutStockDetail.cs

@@ -5,6 +5,12 @@ namespace Tnb.WarehouseMgr.Entities
     public interface IInOutStockDetail<TStockCode> where TStockCode : BaseEntity<string>, new()
     {
         string? line_status { get; set; }
+        /// <summary>
+        /// 仓库Id
+        /// </summary>
+        string? warehouse_id { get; set; }
+
+
         List<TStockCode> CodeDetails { get; set; }
     }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/IInOutStockHEntity.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Entity.Constraints
+{
+    public interface IInOutStockHEntity
+    {
+        string warehouse_id { get; set; }
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.cs

@@ -39,10 +39,6 @@ public partial class WmsInstockCode : BaseEntity<string>, IInOutStockCode
     /// </summary>
     public int? bill_d_line { get; set; }
 
-    /// <summary>
-    /// 明细状态
-    /// </summary>
-    public string line_status { get; set; }
 
     /// <summary>
     /// 物品ID

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.part.cs

@@ -5,5 +5,9 @@ namespace Tnb.WarehouseMgr.Entities;
 /// </summary>
 public partial class WmsInstockCode : IInOutStockCode
 {
+    /// <summary>
+    /// 明细状态
+    /// </summary>
+    public string line_status { get; set; }
 
 }

WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs

@@ -148,7 +148,7 @@ namespace Tnb.WarehouseMgr
             {
                 EnumInOutStockType.In => await FetchInOutStockCodesById<WmsInstockD, InStockDetailOutput, WmsInstockCode>(input.bill_d_id),
                 EnumInOutStockType.Out => await FetchInOutStockCodesById<WmsOutstockD, OutStockDetailOutput, WmsOutstockCode>(input.bill_d_id),
-                _ => throw new ArgumentOutOfRangeException(nameof(input.inoutStockType), $"Not expected EnumInOutStockType value: {input.inoutStockType}"),
+                _ => throw new NotImplementedException(),
             };
             return result ?? Enumerable.Empty<dynamic>();
         }
@@ -706,7 +706,7 @@ namespace Tnb.WarehouseMgr
             {
                 await _db.Ado.BeginTranAsync();
 
-                _ = await _db.Updateable<WmsDistaskH>().SetColumns(it => new WmsDistaskH { status = WmsWareHouseConst.TASK_BILL_STATUS_RUNING_ID,act_start_date = DateTime.Now }).Where(it => input.disTaskIds.Contains(it.id)).ExecuteCommandAsync();
+                _ = await _db.Updateable<WmsDistaskH>().SetColumns(it => new WmsDistaskH { status = WmsWareHouseConst.TASK_BILL_STATUS_RUNING_ID, act_start_date = DateTime.Now }).Where(it => input.disTaskIds.Contains(it.id)).ExecuteCommandAsync();
                 //清空载具库位数据
                 var carryAndLocIds = await _db.Queryable<WmsDistaskH>().Where(it => input.disTaskIds.Contains(it.id)).Select(it => new { it.carry_id, it.startlocation_id }).ToListAsync();
                 if (carryAndLocIds?.Count > 0)
@@ -741,7 +741,7 @@ namespace Tnb.WarehouseMgr
                 await _db.Ado.BeginTranAsync();
 
                 //更新任务执行表，单据状态为 完成
-                _ = await _db.Updateable<WmsDistaskH>().SetColumns(it => new WmsDistaskH { status = WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID,act_end_date = DateTime.Now }).Where(it => input.disTaskIds.Contains(it.id)).ExecuteCommandAsync();
+                _ = await _db.Updateable<WmsDistaskH>().SetColumns(it => new WmsDistaskH { status = WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID, act_end_date = DateTime.Now }).Where(it => input.disTaskIds.Contains(it.id)).ExecuteCommandAsync();
                 List<WmsDistaskH> disTasks = await _db.Queryable<WmsDistaskH>().InnerJoin<WmsCarryH>((a, b) => a.carry_id == b.id).Where(a => input.disTaskIds.Contains(a.id)).Select((a, b) => new WmsDistaskH { carry_status = b.carry_status }, true).ToListAsync();
                 if (disTasks?.Count > 0)
                 {
@@ -1256,8 +1256,13 @@ namespace Tnb.WarehouseMgr
                     {
                         CodeDetails = SqlFunc.Subqueryable<TStockCode>().Where(it => it.bill_d_id == a.id).ToList(),
                     }, true)
-                    .Mapper(it => it.line_status = it.line_status != null && dic.ContainsKey(key: it.line_status) ? dic[it.line_status]?.ToString() : "")
+                    .Mapper(it =>
+                    {
+                        it.line_status = it.line_status != null && dic.ContainsKey(key: it.line_status) ? dic[it.line_status]?.ToString() : "";
+                        it.warehouse_id = _db.Queryable<BasWarehouse>().Single(y => y.id == it.warehouse_id)?.whname ?? "";
+                    })
                     .ToListAsync();
+
             return data;
         }
         #endregion