Merge remote-tracking branch 'origin/dev' into dev

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

@@ -152,5 +152,9 @@ public class ModuleConsts
     /// 模块标识-任务执行
     /// </summary>
     public const string MODULE_WMSDISTASK_ID = "26128621455141";
+    /// <summary>
+    /// 模块标识-盘点任务       
+    /// </summary>
+    public const string MODULE_WMSCHECKTASK_ID = "27582377555221";
 
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckstockCode.cs

@@ -0,0 +1,102 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 盘点任务明细表
+/// </summary>
+[SugarTable("wms_checkstock_code")]
+public partial class WmsCheckstockCode : BaseEntity<string>
+{
+    public WmsCheckstockCode()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 盘点任务ID
+    /// </summary>
+    public string? checkstock_id { get; set; }
+
+    /// <summary>
+    /// 盘点任务物料明细ID
+    /// </summary>
+    public string? checkstock_d_id { get; set; }
+
+    /// <summary>
+    /// 载具ID
+    /// </summary>
+    public string? carry_id { get; set; }
+
+    /// <summary>
+    /// 载具编号
+    /// </summary>
+    public string? carry_code { get; set; }
+
+    /// <summary>
+    /// 物料ID
+    /// </summary>
+    public string? material_id { get; set; }
+
+    /// <summary>
+    /// 物料编号
+    /// </summary>
+    public string? material_code { get; set; }
+
+    /// <summary>
+    /// 条码编号
+    /// </summary>
+    public string? barcode { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    public string? code_batch { get; set; }
+
+    /// <summary>
+    /// 条码数量
+    /// </summary>
+    public int? codeqty { get; set; }
+
+    /// <summary>
+    /// 单位ID
+    /// </summary>
+    public string? unit_id { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? remark { get; set; }
+
+    /// <summary>
+    /// 扩展
+    /// </summary>
+    public string? extras { get; set; }
+
+    /// <summary>
+    /// 时间戳
+    /// </summary>
+    public string? timestamp { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckstockD.cs

@@ -0,0 +1,102 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 盘点任务子表
+/// </summary>
+[SugarTable("wms_checkstock_d")]
+public partial class WmsCheckstockD : BaseEntity<string>
+{
+    public WmsCheckstockD()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 盘点任务ID
+    /// </summary>
+    public string? checkstock_id { get; set; }
+
+    /// <summary>
+    /// 物料ID
+    /// </summary>
+    public string? material_id { get; set; }
+
+    /// <summary>
+    /// 物料编号
+    /// </summary>
+    public string? material_code { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    public string? code_batch { get; set; }
+
+    /// <summary>
+    /// 库位ID
+    /// </summary>
+    public string? location_id { get; set; }
+
+    /// <summary>
+    /// 库位编号
+    /// </summary>
+    public string? location_code { get; set; }
+
+    /// <summary>
+    /// 载具ID
+    /// </summary>
+    public string? carry_id { get; set; }
+
+    /// <summary>
+    /// 载具编号
+    /// </summary>
+    public string? carry_code { get; set; }
+
+    /// <summary>
+    /// 理论库存数量
+    /// </summary>
+    public decimal? pr_qty { get; set; }
+
+    /// <summary>
+    /// 已盘点数量
+    /// </summary>
+    public decimal? qty { get; set; }
+
+    /// <summary>
+    /// 扩展
+    /// </summary>
+    public string? extras { get; set; }
+
+    /// <summary>
+    /// 时间戳
+    /// </summary>
+    public DateTime? timestamp { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+    /// <summary>
+    /// 结算状态
+    /// </summary>
+    public string? closing_status { get; set; }
+
+}

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

@@ -0,0 +1,18 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 盘点任务子表
+/// </summary>
+public partial class WmsCheckstockD
+{
+    /// <summary>
+    /// 条码数量
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public decimal codeqty { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckstockH.cs

@@ -0,0 +1,107 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 盘点任务主表
+/// </summary>
+[SugarTable("wms_checkstock_h")]
+public partial class WmsCheckstockH : BaseEntity<string>
+{
+    public WmsCheckstockH()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 所属组织
+    /// </summary>
+    public string? org_id { get; set; }
+
+    /// <summary>
+    /// 单号
+    /// </summary>
+    public string? checkstock_code { get; set; }
+
+    /// <summary>
+    /// 盘点计划ID
+    /// </summary>
+    public string? checkplan_id { get; set; }
+
+    /// <summary>
+    /// 仓库ID
+    /// </summary>
+    public string? warehouse_id { get; set; }
+
+    /// <summary>
+    /// 盘点状态
+    /// </summary>
+    public string? status { get; set; }
+
+    /// <summary>
+    /// 盘点类型
+    /// </summary>
+    public string? checkstock_type { get; set; }
+
+    /// <summary>
+    /// 盘点种类
+    /// </summary>
+    public string? handle_kinds { get; set; }
+
+    /// <summary>
+    /// 盘点开始时间
+    /// </summary>
+    public DateTime? check_start_date { get; set; }
+
+    /// <summary>
+    /// 盘点结束时间
+    /// </summary>
+    public DateTime? check_end_date { get; set; }
+
+    /// <summary>
+    /// 盘点人ID
+    /// </summary>
+    public string? checkstock_id { get; set; }
+
+    /// <summary>
+    /// 扩展
+    /// </summary>
+    public string? extras { get; set; }
+
+    /// <summary>
+    /// 时间戳
+    /// </summary>
+    public DateTime? timestamp { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+    /// <summary>
+    /// 流程任务Id
+    /// </summary>
+    public string? f_flowtaskid { get; set; }
+
+    /// <summary>
+    /// 流程引擎Id
+    /// </summary>
+    public string? f_flowid { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumCheckType.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Enums
+{
+    public enum EnumCheckType
+    {
+        /// <summary>
+        /// 全库盘点
+        /// </summary>
+        全库盘点 = 0,
+        /// <summary>
+        /// 物料盘点
+        /// </summary>
+        物料盘点,
+        /// <summary>
+        /// 批次盘点
+        /// </summary>
+        批次盘点,
+    }
+}