下升降机扫码优化 八工位入库优化 库存报表

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsStockReportCode.cs

@@ -19,15 +19,15 @@ public partial class WmsStockReportCode : BaseEntity<string>
     /// </summary>
     public string? report_id { get; set; }
 
-    /// <summary>
-    /// 载具ID
-    /// </summary>
-    public string? carry_id { get; set; }
+    ///// <summary>
+    ///// 载具ID
+    ///// </summary>
+    //public string? carry_id { get; set; }
 
-    /// <summary>
-    /// 载具编号
-    /// </summary>
-    public string? carry_code { get; set; }
+    ///// <summary>
+    ///// 载具编号
+    ///// </summary>
+    //public string? carry_code { get; set; }
 
     /// <summary>
     /// 物料ID
@@ -52,7 +52,7 @@ public partial class WmsStockReportCode : BaseEntity<string>
     /// <summary>
     /// 条码数量
     /// </summary>
-    public decimal? codeqty { get; set; }
+    public decimal codeqty { get; set; }
 
     /// <summary>
     /// 单位ID
@@ -84,4 +84,36 @@ public partial class WmsStockReportCode : BaseEntity<string>
     /// </summary>
     public DateTime? time_stamp { get; set; }
 
+    /// <summary>
+    /// 规格型号
+    /// </summary>
+    public string? material_specification { get; set; }
+    /// <summary>
+    /// 箱号
+    /// </summary>
+    public string? container_no { get; set; }
+    /// <summary>
+    /// 供应商编码
+    /// </summary>
+    public string? supplier_code { get; set; }
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    public string? supplier_name { get; set; }
+
+    /// <summary>
+    /// 仓库ID
+    /// </summary>
+    public string? warehouse_id { get; set; }
+
+    /// <summary>
+    /// 仓库编码
+    /// </summary>
+    public string? warehouse_code { get; set; }
+
+    /// <summary>
+    /// 仓库名称
+    /// </summary>
+    public string? warehouse_name { get; set; }
+
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsStockReportH.cs

@@ -29,45 +29,86 @@ public partial class WmsStockReportH : BaseEntity<string>
     /// </summary>
     public string? material_code { get; set; }
 
+    /// <summary>
+    /// 规格型号
+    /// </summary>
+    public string? material_specification { get; set; }
+    /// <summary>
+    /// 箱号
+    /// </summary>
+    public string? container_no { get; set; }
+    /// <summary>
+    /// 供应商编码
+    /// </summary>
+    public string? supplier_code { get; set; }
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    public string? supplier_name { get; set; }
+
     /// <summary>
     /// 仓库ID
     /// </summary>
     public string? warehouse_id { get; set; }
 
     /// <summary>
-    /// 现有库存
+    /// 仓库编码
     /// </summary>
-    public decimal? existing_stock_qty { get; set; }
+    public string? warehouse_code { get; set; }
 
     /// <summary>
-    /// 最大库存
+    /// 仓库名称
     /// </summary>
-    public int? max_stock { get; set; }
+    public string? warehouse_name { get; set; }
 
     /// <summary>
-    /// 安全库存
+    /// 单位ID
     /// </summary>
-    public int? safe_stock { get; set; }
+    public string unit_id { get; set; } = string.Empty;
 
     /// <summary>
-    /// 最小库存
+    /// 单位代码
     /// </summary>
-    public int? min_stock { get; set; }
-
+    public string unit_code { get; set; } = string.Empty;
     /// <summary>
-    /// 库存有效期(天)
+    /// 批次
     /// </summary>
-    public int? storage_valid_day { get; set; }
+    public string code_batch { get; set; } = string.Empty;
 
-    /// <summary>
-    /// 预警提前期(天)
-    /// </summary>
-    public int? early_warn_day { get; set; }
+    ///// <summary>
+    ///// 现有库存
+    ///// </summary>
+    //public decimal? existing_stock_qty { get; set; }
 
-    /// <summary>
-    /// 过期预警数量
-    /// </summary>
-    public decimal? expired_warning_qty { get; set; }
+    ///// <summary>
+    ///// 最大库存
+    ///// </summary>
+    //public int? max_stock { get; set; }
+
+    ///// <summary>
+    ///// 安全库存
+    ///// </summary>
+    //public int? safe_stock { get; set; }
+
+    ///// <summary>
+    ///// 最小库存
+    ///// </summary>
+    //public int? min_stock { get; set; }
+
+    ///// <summary>
+    ///// 库存有效期(天)
+    ///// </summary>
+    //public int? storage_valid_day { get; set; }
+
+    ///// <summary>
+    ///// 预警提前期(天)
+    ///// </summary>
+    //public int? early_warn_day { get; set; }
+
+    ///// <summary>
+    ///// 过期预警数量
+    ///// </summary>
+    //public decimal? expired_warning_qty { get; set; }
 
     /// <summary>
     /// 创建用户
@@ -79,35 +120,35 @@ public partial class WmsStockReportH : BaseEntity<string>
     /// </summary>
     public DateTime? create_time { get; set; }
 
-    /// <summary>
-    /// 修改用户
-    /// </summary>
-    public string? modify_id { get; set; }
+    ///// <summary>
+    ///// 修改用户
+    ///// </summary>
+    //public string? modify_id { get; set; }
 
-    /// <summary>
-    /// 修改时间
-    /// </summary>
-    public DateTime? modify_time { get; set; }
+    ///// <summary>
+    ///// 修改时间
+    ///// </summary>
+    //public DateTime? modify_time { get; set; }
 
-    /// <summary>
-    /// 扩展
-    /// </summary>
-    public string? extras { get; set; }
+    ///// <summary>
+    ///// 扩展
+    ///// </summary>
+    //public string? extras { get; set; }
 
-    /// <summary>
-    /// 时间戳
-    /// </summary>
-    public DateTime? timestamp { get; set; }
+    ///// <summary>
+    ///// 时间戳
+    ///// </summary>
+    //public DateTime? timestamp { get; set; }
 
-    /// <summary>
-    /// 流程任务Id
-    /// </summary>
-    public string? f_flowtaskid { get; set; }
+    ///// <summary>
+    ///// 流程任务Id
+    ///// </summary>
+    //public string? f_flowtaskid { get; set; }
 
-    /// <summary>
-    /// 流程引擎Id
-    /// </summary>
-    public string? f_flowid { get; set; }
+    ///// <summary>
+    ///// 流程引擎Id
+    ///// </summary>
+    //public string? f_flowid { get; set; }
 
 }
 

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

@@ -11,13 +11,13 @@ public partial class WmsStockReportH
     /// 物料名称
     /// </summary>
     [SugarColumn(IsIgnore = true)]
-    public string mater_name { get; set; }
-    /// <summary>
-    /// 明细列表
-    /// </summary>
-    [SugarColumn(IsIgnore = true)]
-    public List<WmsStockReportCode> Details { get; set; }
-    [SugarColumn(IsIgnore = true)]
+    public string material_name { get; set; }
+    ///// <summary>
+    ///// 明细列表
+    ///// </summary>
+    //[SugarColumn(IsIgnore = true)]
+    //public List<WmsStockReportCode> Details { get; set; }
+    //[SugarColumn(IsIgnore = true)]
     public decimal codeqty { get; set; }
 
 }