库存报表，日志完善

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs

@@ -166,6 +166,10 @@ public class ModuleConsts
     /// </summary>
     public const string MODULE_WMSSTOCKREPORT_ID = "27895417124373";
     /// <summary>
+    /// 模块标识-载具库存报表 todo
+    /// </summary>
+    public const string MODULE_WMSCARRYSTOCKREPORT_ID = "MODULE_WMSCARRYSTOCKREPORT_ID";
+    /// <summary>
     /// 模块标识-载具台账
     /// </summary>
     public const string MODULE_WMSCARRY_ID = "26038721525029";

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs

@@ -41,6 +41,21 @@
         /// </summary>
         public const string WAREHOUSE_ZZXBK_ID = "26257716248101";
 
+        /// <summary>
+        /// 四楼包材库
+        /// </summary>
+        public const string WAREHOUSE_BCK_ID = "35410826423061";
+        /// <summary>
+        /// 四楼待灭菌仓
+        /// </summary>
+        public const string WAREHOUSE_DMJC_ID = "35412479754517";
+        /// <summary>
+        /// 四楼灭菌仓
+        /// </summary>
+        public const string WAREHOUSE_MJC_ID = "35412482304021";
+
+
+
         /// <summary>
         /// 长管出库
         /// </summary>

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/CarryStockInput.cs

@@ -0,0 +1,8 @@
+using JNPF.Common.Filter;
+
+namespace Tnb.WarehouseMgr.Entities.Dto
+{
+    public class CarryStockInput : PageInputBase
+    {
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs

@@ -139,5 +139,9 @@ public partial class WmsCarryH : BaseEntity<string>
     /// 配送工位
     /// </summary>
     public string? work_station { get; set; }
-    
+
+    /// <summary>
+    /// 入库时间
+    /// </summary>
+    public DateTime? instock_time { get; set; }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryStockReportH.cs

@@ -0,0 +1,257 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 载具库存集合
+/// </summary>
+public partial class WmsCarryStockReport
+{
+    public int 序号 { get; set; }
+    ///// <summary>
+    ///// 所属组织
+    ///// </summary>
+    //public string? 组织 { get; set; }
+
+    /// <summary>
+    /// 载具ID
+    /// </summary>
+    public string? carry_id { get; set; }
+
+    /// <summary>
+    /// 载具编码
+    /// </summary>
+    public string? 载具编码 { get; set; }
+
+    /// <summary>
+    /// 载具名称
+    /// </summary>
+    public string? 载具名称 { get; set; }
+
+    /// <summary>
+    /// 子载具编码
+    /// </summary>
+    public string? 子载具编码 { get; set; }
+
+    /// <summary>
+    /// 子载具名称
+    /// </summary>
+    public string? 子载具名称 { get; set; }
+
+    /// <summary>
+    /// 物料ID
+    /// </summary>
+    public string? material_id { get; set; }
+
+    /// <summary>
+    /// 物料编码
+    /// </summary>
+    public string? 物料编码 { get; set; }
+
+    /// <summary>
+    /// 物料名称
+    /// </summary>
+    public string? 物料名称 { get; set; }
+
+    /// <summary>
+    /// 仓库名称
+    /// </summary>
+    public string? 仓库名称 { get; set; }
+
+    /// <summary>
+    /// 库位编码
+    /// </summary>
+    public string? 库位编码 { get; set; }
+
+    /// <summary>
+    /// 库位名称
+    /// </summary>
+    public string? 库位名称 { get; set; }
+
+    /// <summary>
+    /// 载具状态
+    /// </summary>
+    public string? 载具状态 { get; set; }
+
+    /// <summary>
+    /// 库位状态
+    /// </summary>
+    public string? 库位状态 { get; set; }
+
+    /// <summary>
+    /// 载具类型
+    /// </summary>
+    public string? 载具类型 { get; set; }
+
+    /// <summary>
+    /// 入库时间
+    /// </summary>
+    public string? 入库时间 { get; set; }
+
+    /// <summary>
+    /// 条码
+    /// </summary>
+    public string? 条码 { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    public string? 批次 { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    public decimal? 数量 { get; set; }
+
+    /// <summary>
+    /// 单位
+    /// </summary>
+    public string? 单位 { get; set; }
+
+    /// <summary>
+    /// 操作用户
+    /// </summary>
+    public string? 操作用户 { get; set; }
+
+    /// <summary>
+    /// 绑定时间
+    /// </summary>
+    public string? 绑定时间 { get; set; }
+
+}
+
+/// <summary>
+/// 载具库存报表
+/// </summary>
+public partial class WmsCarryStockReportH
+{
+    public int 序号 { get; set; }
+    ///// <summary>
+    ///// 所属组织
+    ///// </summary>
+    //public string? 组织 { get; set; }
+
+    ///// <summary>
+    ///// 载具ID
+    ///// </summary>
+    //public string? carry_id { get; set; }
+
+    /// <summary>
+    /// 载具编码
+    /// </summary>
+    public string? 载具编码 { get; set; }
+
+    /// <summary>
+    /// 载具名称
+    /// </summary>
+    public string? 载具名称 { get; set; }
+
+    /// <summary>
+    /// 仓库名称
+    /// </summary>
+    public string? 仓库名称 { get; set; }
+
+    /// <summary>
+    /// 库位编码
+    /// </summary>
+    public string? 库位编码 { get; set; }
+
+    /// <summary>
+    /// 库位名称
+    /// </summary>
+    public string? 库位名称 { get; set; }
+
+    /// <summary>
+    /// 载具状态
+    /// </summary>
+    public string? 载具状态 { get; set; }
+
+    /// <summary>
+    /// 库位状态
+    /// </summary>
+    public string? 库位状态 { get; set; }
+
+    /// <summary>
+    /// 载具类型
+    /// </summary>
+    public string? 载具类型 { get; set; }
+
+    /// <summary>
+    /// 入库时间
+    /// </summary>
+    public string? 入库时间 { get; set; }
+
+    public List<WmsCarryStockReportCode> Details { get; set; }
+}
+
+
+/// <summary>
+/// 载具库存报表条码表
+/// </summary>
+public partial class WmsCarryStockReportCode
+{
+    public int 序号 { get; set; }
+    ///// <summary>
+    ///// 载具ID
+    ///// </summary>
+    //public string? carry_id { get; set; }
+
+    /// <summary>
+    /// 载具编码
+    /// </summary>
+    public string? 载具编码 { get; set; }
+
+    /// <summary>
+    /// 载具名称
+    /// </summary>
+    public string? 载具名称 { get; set; }
+
+    ///// <summary>
+    ///// 物料ID
+    ///// </summary>
+    //public string? material_id { get; set; }
+
+    /// <summary>
+    /// 物料编号
+    /// </summary>
+    public string? 物料编号 { get; set; }
+
+    /// <summary>
+    /// 物料名称
+    /// </summary>
+    public string? 物料名称 { get; set; }
+
+    /// <summary>
+    /// 条码编号
+    /// </summary>
+    public string? 条码 { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    public string? 批次 { get; set; }
+
+    /// <summary>
+    /// 条码数量
+    /// </summary>
+    public decimal? 数量 { get; set; }
+
+    /// <summary>
+    /// 单位
+    /// </summary>
+    public string? 单位 { get; set; }
+
+    ///// <summary>
+    ///// 操作用户
+    ///// </summary>
+    //public string? 创建用户 { get; set; }
+
+    /// <summary>
+    /// 绑定时间
+    /// </summary>
+    public string? 绑定时间 { get; set; }
+
+}
+