采购收货，销售发货业务代码提交

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

@@ -1,4 +1,6 @@
-namespace Tnb.WarehouseMgr;
+using System.CodeDom;
+
+namespace Tnb.WarehouseMgr;
 
 public class ModuleConsts
 {
@@ -185,5 +187,8 @@ public class ModuleConsts
     ///   模块标识-PDA寄存出库
     /// </summary>
     public const string MODULE_WMSSCANCODEINSTOCKPDA_ID = "28576495374869";
-
+    /// <summary>
+    /// 模块标识-采购收货
+    /// </summary>
+    public const string MODULE_WMSPURCHASE_ID = "29975280336405";
 }

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

@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Dto
+{
+    /// <summary>
+    /// 采购收货编辑输入参数
+    /// </summary>
+    public class PurchaseAndReceiveUpInput
+    {
+        public string bill_code { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 单据类型
+        /// </summary>
+        public string bill_type { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 单据状态
+        /// </summary>
+        public string status { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 业务类型
+        /// </summary>
+        public string biz_type { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 入库仓库ID
+        /// </summary>
+        public string? warehouse_id { get; set; }
+
+        /// <summary>
+        /// 供应商ID
+        /// </summary>
+        public string? supplier_id { get; set; }
+
+        /// <summary>
+        /// 供应商代码
+        /// </summary>
+        public string? supplier_code { get; set; }
+
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string? supplier_name { get; set; }
+
+        /// <summary>
+        /// 生成类型
+        /// </summary>
+        public string generate_type { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string? remark { get; set; }
+
+        /// <summary>
+        /// 扩展字段
+        /// </summary>
+        public string? extras { get; set; }
+
+        /// <summary>
+        /// 时间戳
+        /// </summary>
+        public DateTime? time_stamp { get; set; }
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string create_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime create_time { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 修改用户
+        /// </summary>
+        public string? modify_id { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? modify_time { get; set; }
+
+        /// <summary>
+        /// 来源单据ID
+        /// </summary>
+        public string? source_id { get; set; }
+
+        /// <summary>
+        /// 来源单据代码
+        /// </summary>
+        public string? source_code { get; set; }
+
+        /// <summary>
+        /// 流程任务Id
+        /// </summary>
+        public string? f_flowtaskid { get; set; }
+
+        /// <summary>
+        /// 流程引擎Id
+        /// </summary>
+        public string? f_flowid { get; set; }
+
+        /// <summary>
+        /// 供货日期
+        /// </summary>
+        public DateTime delivery_date { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 审核员
+        /// </summary>
+        public string? auditor_id { get; set; }
+
+        /// <summary>
+        /// 运输方式
+        /// </summary>
+        public string? shipping_method { get; set; }
+
+        /// <summary>
+        /// 审核状态
+        /// </summary>
+        public int? audit_status { get; set; }
+
+        public List<WmsPurchaseD> details { get; set; } = new();
+    }
+}

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

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Entity.Constraints
+{
+    /// <summary>
+    /// 采购收货、销售发货 接口约束
+    /// </summary>
+    public interface IPurchaseAndSaleEntity
+    {
+        public string material_id { get; set; }
+        /// <summary>
+        /// 已到货数量
+        /// </summary>
+        public decimal purchase_prqty { get; set; }
+        /// <summary>
+        /// 采购数量
+        /// </summary>
+        public decimal purchase_qty { get; set; }
+        /// <summary>
+        /// 本次到货数量
+        /// </summary>
+        public decimal purchase_arriveqty { get; set; }
+        /// <summary>
+        /// 执行状态
+        /// </summary>
+        public string line_status { get; set; }
+        public string modify_id { get; set; }
+        public DateTime? modify_time { get; set; }
+    }
+}

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

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Entity.Constraints
+{
+    public interface IPurchaseAndSaleQueryEntity
+    {
+        public string bill_id { get; set; }
+        public string material_name { get; set; }
+        public string material_id { get; set; }
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockH.cs

@@ -208,5 +208,8 @@ public partial class WmsInstockH : BaseEntity<string>
     /// 流程引擎Id
     /// </summary>
     public string? f_flowid { get; set; }
-
+    /// <summary>
+    /// 采购单号
+    /// </summary>
+    public string purchase_code { get; set; }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseD.cs

@@ -0,0 +1,102 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 采购收货明细表
+/// </summary>
+[SugarTable("wms_purchase_d")]
+public partial class WmsPurchaseD : BaseEntity<string>
+{
+    public WmsPurchaseD()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 采购收货单ID
+    /// </summary>
+    public string bill_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 执行状态
+    /// </summary>
+    public string line_status { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 物品ID
+    /// </summary>
+    public string material_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 物品代码
+    /// </summary>
+    public string material_code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 单位ID
+    /// </summary>
+    public string unit_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 采购数量
+    /// </summary>
+    public decimal purchase_qty { get; set; }
+
+    /// <summary>
+    /// 已到货数量
+    /// </summary>
+    public decimal purchase_prqty { get; set; }
+
+    /// <summary>
+    /// 扩展字段
+    /// </summary>
+    public string? extras { get; set; }
+
+    /// <summary>
+    /// 时间戳
+    /// </summary>
+    public DateTime? time_stamp { 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? code_batch { get; set; }
+
+    /// <summary>
+    /// 流程任务Id
+    /// </summary>
+    public string? f_flowtaskid { get; set; }
+
+    /// <summary>
+    /// 流程引擎Id
+    /// </summary>
+    public string? f_flowid { get; set; }
+
+    /// <summary>
+    /// 本次到货数量
+    /// </summary>
+    public decimal purchase_arriveqty { get; set; }
+
+}

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

@@ -0,0 +1,20 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+using Tnb.WarehouseMgr.Entities.Entity.Constraints;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 采购收货明细表
+/// </summary>
+public partial class WmsPurchaseD : IPurchaseAndSaleEntity, IPurchaseAndSaleQueryEntity
+{
+    /// <summary>
+    /// 物料名称
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public string material_name { get; set; }
+}
+
+

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseH.cs

@@ -0,0 +1,147 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 采购收货主表
+/// </summary>
+[SugarTable("wms_purchase_h")]
+public partial class WmsPurchaseH : BaseEntity<string>
+{
+    public WmsPurchaseH()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 租户ID
+    /// </summary>
+    public string? tenant_id { get; set; }
+
+    /// <summary>
+    /// 所属组织ID
+    /// </summary>
+    public string? org_id { get; set; }
+
+    /// <summary>
+    /// 采购收货单号
+    /// </summary>
+    public string bill_code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 单据类型
+    /// </summary>
+    public string bill_type { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 单据状态
+    /// </summary>
+    public string status { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 业务类型
+    /// </summary>
+    public string biz_type { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 入库仓库ID
+    /// </summary>
+    public string? warehouse_id { get; set; }
+
+    /// <summary>
+    /// 供应商ID
+    /// </summary>
+    public string? supplier_id { get; set; }
+
+    /// <summary>
+    /// 供应商代码
+    /// </summary>
+    public string? supplier_code { get; set; }
+
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    public string? supplier_name { get; set; }
+
+    /// <summary>
+    /// 生成类型
+    /// </summary>
+    public string generate_type { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? remark { get; set; }
+
+    /// <summary>
+    /// 扩展字段
+    /// </summary>
+    public string? extras { get; set; }
+
+    /// <summary>
+    /// 时间戳
+    /// </summary>
+    public DateTime? time_stamp { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string create_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime create_time { get; set; } = DateTime.Now;
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+    /// <summary>
+    /// 来源单据ID
+    /// </summary>
+    public string? source_id { get; set; }
+
+    /// <summary>
+    /// 来源单据代码
+    /// </summary>
+    public string? source_code { get; set; }
+
+    /// <summary>
+    /// 流程任务Id
+    /// </summary>
+    public string? f_flowtaskid { get; set; }
+
+    /// <summary>
+    /// 流程引擎Id
+    /// </summary>
+    public string? f_flowid { get; set; }
+
+    /// <summary>
+    /// 供货日期
+    /// </summary>
+    public DateTime delivery_date { get; set; } = DateTime.Now;
+
+    /// <summary>
+    /// 审核员
+    /// </summary>
+    public string? auditor_id { get; set; }
+
+    /// <summary>
+    /// 运输方式
+    /// </summary>
+    public string? shipping_method { get; set; }
+
+    /// <summary>
+    /// 审核状态
+    /// </summary>
+    public int? audit_status { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSaleD.cs

@@ -0,0 +1,88 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 销售发货明细表
+/// </summary>
+[SugarTable("wms_sale_d")]
+public partial class WmsSaleD : BaseEntity<string>
+{
+    public WmsSaleD()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 销售发货单ID
+    /// </summary>
+    public string bill_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 执行状态
+    /// </summary>
+    public string line_status { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 物品ID
+    /// </summary>
+    public string material_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 物品代码
+    /// </summary>
+    public string material_code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 单位ID
+    /// </summary>
+    public string unit_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 扩展字段
+    /// </summary>
+    public string? extras { get; set; }
+
+    /// <summary>
+    /// 时间戳
+    /// </summary>
+    public DateTime? time_stamp { 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? code_batch { get; set; }
+
+    /// <summary>
+    /// 流程任务Id
+    /// </summary>
+    public string? f_flowtaskid { get; set; }
+
+    /// <summary>
+    /// 流程引擎Id
+    /// </summary>
+    public string? f_flowid { get; set; }
+
+
+}

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

@@ -0,0 +1,33 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+using Tnb.WarehouseMgr.Entities.Entity.Constraints;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 销售发货明细表
+/// </summary>
+public partial class WmsSaleD : IPurchaseAndSaleEntity, IPurchaseAndSaleQueryEntity
+{
+    /// <summary>
+    /// 物料名称
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public string material_name { get; set; }
+    /// <summary>
+    /// 本次发货数量
+    /// </summary>
+    [SugarColumn(ColumnName = "sale_sendqty")]
+    public decimal purchase_arriveqty { get; set; }
+    /// <summary>
+    ///已 发货数量
+    /// </summary>
+    [SugarColumn(ColumnName = "sale_prqty")]
+    public decimal purchase_prqty { get; set; }
+    /// <summary>
+    /// 发货数量
+    /// </summary>
+    [SugarColumn(ColumnName = "sale_qty")]
+    public decimal purchase_qty { get; set; }
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSaleH.cs

@@ -0,0 +1,147 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 销售发货主表
+/// </summary>
+[SugarTable("wms_sale_h")]
+public partial class WmsSaleH : BaseEntity<string>
+{
+    public WmsSaleH()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 租户ID
+    /// </summary>
+    public string? tenant_id { get; set; }
+
+    /// <summary>
+    /// 所属组织ID
+    /// </summary>
+    public string? org_id { get; set; }
+
+    /// <summary>
+    /// 销售发货单号
+    /// </summary>
+    public string bill_code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 单据类型
+    /// </summary>
+    public string bill_type { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 单据状态
+    /// </summary>
+    public string status { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 业务类型
+    /// </summary>
+    public string biz_type { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 出库仓库ID
+    /// </summary>
+    public string? warehouse_id { get; set; }
+
+    /// <summary>
+    /// 客户ID
+    /// </summary>
+    public string? customer_id { get; set; }
+
+    /// <summary>
+    /// 客户代码
+    /// </summary>
+    public string? customer_code { get; set; }
+
+    /// <summary>
+    /// 客户名称
+    /// </summary>
+    public string? customer_name { get; set; }
+
+    /// <summary>
+    /// 生成类型
+    /// </summary>
+    public string generate_type { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? remark { get; set; }
+
+    /// <summary>
+    /// 扩展字段
+    /// </summary>
+    public string? extras { get; set; }
+
+    /// <summary>
+    /// 时间戳
+    /// </summary>
+    public DateTime? time_stamp { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string create_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime create_time { get; set; } = DateTime.Now;
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+    /// <summary>
+    /// 来源单据ID
+    /// </summary>
+    public string? source_id { get; set; }
+
+    /// <summary>
+    /// 来源单据代码
+    /// </summary>
+    public string? source_code { get; set; }
+
+    /// <summary>
+    /// 流程任务Id
+    /// </summary>
+    public string? f_flowtaskid { get; set; }
+
+    /// <summary>
+    /// 流程引擎Id
+    /// </summary>
+    public string? f_flowid { get; set; }
+
+    /// <summary>
+    /// 供货日期
+    /// </summary>
+    public DateTime ship_date { get; set; } = DateTime.Now;
+
+    /// <summary>
+    /// 审核员
+    /// </summary>
+    public string? auditor_id { get; set; }
+
+    /// <summary>
+    /// 运输方式
+    /// </summary>
+    public string? shipping_method { get; set; }
+
+    /// <summary>
+    /// 审核状态
+    /// </summary>
+    public int? audit_status { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Mapper/Mapper.cs

@@ -1,4 +1,5 @@
-using Mapster;
+using JNPF.Common.Security;
+using Mapster;
 using Tnb.WarehouseMgr.Entities.Consts;
 using Tnb.WarehouseMgr.Entities.Dto.Inputs;
 using Tnb.WarehouseMgr.Entities.Dto.Outputs;
@@ -21,6 +22,9 @@ namespace Tnb.WarehouseMgr.Entities.Mapper
                   .Map(dest => dest.qc_status, src => src.is_check == 0 ? "不合格" : "合格");
             config.ForType<WmsCarryCode, CarryCodeQueryOutput>()
                   .Map(dest => dest.check_conclusion, src => GenericEnumDicionary<EnumCheckConclusion>.GetEnumDesc(src.check_conclusion));
+            config.ForType<WmsPurchaseD, WmsInstockD>()
+                  .Map(dest => dest.id, src => SnowflakeIdHelper.NextId())
+                  .Map(dest => dest.pr_qty, src => src.purchase_arriveqty);
         }
     }
 }