Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

2023-12-11 13:53:04 +08:00
parent 0dd220ee4f 67206206e4
commit d61989417f
12 changed files with 1150 additions and 2 deletions
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/AllotInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/AllotInput.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
+{
+    public class AllotInput
+    {
+        /// <summary>
+        /// 起始库位ID
+        /// </summary>
+        public string startlocation { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 目标库位ID
+        /// </summary>
+        public string endlocation { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 单据状态
+        /// </summary>
+        public string status { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 业务类型：
+        /// </summary>
+        public string biz_type { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 所属仓库
+        /// </summary>
+        public string warehouse { get; set; } = string.Empty;
+    }
+}
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/PurchaseArriveInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/PurchaseArriveInput.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
+{
+    public class PurchaseArriveInput
+    {
+        /// <summary>
+        /// 入库仓库
+        /// </summary>
+        public string? warehouse { get; set; }
+
+        /// <summary>
+        /// 供应商代码
+        /// </summary>
+        public string? supplier_code { get; set; }
+
+        /// <summary>
+        /// 来源单据ID
+        /// </summary>
+        public string? source_id { get; set; }
+
+        /// <summary>
+        /// 来源单据代码
+        /// </summary>
+        public string? source_code { get; set; }
+
+        /// <summary>
+        /// 供货日期
+        /// </summary>
+        public DateTime delivery_date { get; set; } = DateTime.Now;
+ 
+        /// <summary>
+        /// 运输方式
+        /// </summary>
+        public string? shipping_method { get; set; }
+        public List<PurchaseArriveDetail> details { get; set; }
+    }
+    public class PurchaseArriveDetail
+    {
+        /// <summary>
+        /// 物品代码
+        /// </summary>
+        public string material_code { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 采购数量
+        /// </summary>
+        public decimal purchase_qty { get; set; }
+
+        /// <summary>
+        /// 已到货数量
+        /// </summary>
+        public decimal purchase_prqty { get; set; }
+
+        /// <summary>
+        /// 批次
+        /// </summary>
+        public string? code_batch { get; set; }
+
+        /// <summary>
+        /// 本次到货数量
+        /// </summary>
+        public decimal purchase_arriveqty { get; set; }
+
+        /// <summary>
+        /// 箱号
+        /// </summary>
+        public string? container_no { get; set; }
+    }
+}
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/PurchaseReturnInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/PurchaseReturnInput.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
+{
+    public class PurchaseReturnInput
+    {  /// <summary>
+       /// 入库仓库
+       /// </summary>
+        public string? warehouse { get; set; }
+
+        /// <summary>
+        /// 供应商代码
+        /// </summary>
+        public string? supplier_code { get; set; }
+
+        /// <summary>
+        /// 来源单据ID
+        /// </summary>
+        public string? source_id { get; set; }
+
+        /// <summary>
+        /// 来源单据代码
+        /// </summary>
+        public string? source_code { get; set; }
+
+        /// <summary>
+        /// 供货日期
+        /// </summary>
+        public DateTime delivery_date { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 运输方式
+        /// </summary>
+        public string? shipping_method { get; set; }
+        public List<PurchaseReturnDetail> details { get; set; }
+    }
+    public class PurchaseReturnDetail
+    {
+        /// <summary>
+        /// 物品代码
+        /// </summary>
+        public string material_code { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 采购数量
+        /// </summary>
+        public decimal purchase_qty { get; set; }
+
+        /// <summary>
+        /// 已到货数量
+        /// </summary>
+        public decimal purchase_prqty { get; set; }
+
+        /// <summary>
+        /// 批次
+        /// </summary>
+        public string? code_batch { get; set; }
+
+        /// <summary>
+        /// 本次到货数量
+        /// </summary>
+        public decimal purchase_arriveqty { get; set; }
+
+        /// <summary>
+        /// 箱号
+        /// </summary>
+        public string? container_no { get; set; }
+    }
+}
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/SaleOutInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/SaleOutInput.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Org.BouncyCastle.Crypto;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
+{
+    public class SaleOutInput
+    {
+        /// <summary>
+        /// 仓库
+        /// </summary>
+        public string? warehouse { get; set; }
+
+        /// <summary>
+        /// 客户代码
+        /// </summary>
+        public string? customer_code { get; set; }
+
+        /// <summary>
+        /// 来源单据ID
+        /// </summary>
+        public string? source_id { get; set; }
+
+        /// <summary>
+        /// 来源单据代码
+        /// </summary>
+        public string? source_code { get; set; }
+
+        /// <summary>
+        /// 供货日期
+        /// </summary>
+        public DateTime ship_date { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 运输方式
+        /// </summary>
+        public string? shipping_method { get; set; }
+
+        public List<SaleOutDetail> details { get; set; }
+    }
+    public class SaleOutDetail
+    {
+        /// <summary>
+        /// 物品代码
+        /// </summary>
+        public string material_code { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 批次
+        /// </summary>
+        public string? code_batch { get; set; }
+
+        /// <summary>
+        /// 箱号
+        /// </summary>
+        public string? container_no { get; set; }
+
+        /// <summary>
+        /// 本次发货数量
+        /// </summary>
+        public decimal purchase_arriveqty { get; set; }
+      
+        /// <summary>
+        ///已 发货数量
+        /// </summary>
+        public decimal purchase_prqty { get; set; }
+     
+        /// <summary>
+        /// 发货数量
+        /// </summary>
+        public decimal purchase_qty { get; set; }
+    }
+}
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAllot.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAllot.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities
+{
+
+    /// <summary>
+    /// 库内转移
+    /// </summary>
+    [SugarTable("wms_allot")]
+    public partial class WmsAllot : BaseEntity<string>
+    {
+        public WmsAllot()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        public string? tenant_id { get; set; }
+
+        /// <summary>
+        /// 所属组织ID
+        /// </summary>
+        public string? org_id { get; set; }
+
+        /// <summary>
+        /// 起始库位ID
+        /// </summary>
+        public string startlocation_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 目标库位ID
+        /// </summary>
+        public string endlocation_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 单号
+        /// </summary>
+        public string bill_code { 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 carry_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 载具编号
+        /// </summary>
+        public string carry_code { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 所属仓库
+        /// </summary>
+        public string warehouse_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string create_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime create_time { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 最后修改人员ID
+        /// </summary>
+        public string? modify_id { get; set; }
+
+        /// <summary>
+        /// 最后修改时间
+        /// </summary>
+        public DateTime? modify_time { get; set; }
+
+        /// <summary>
+        /// 扩展字段
+        /// </summary>
+        public string? extras { get; set; }
+
+        /// <summary>
+        /// 时间戳(用于并发控制)
+        /// </summary>
+        public DateTime? timestamp { get; set; }
+
+        /// <summary>
+        /// 流程任务Id
+        /// </summary>
+        public string? f_flowtaskid { get; set; }
+
+        /// <summary>
+        /// 流程引擎Id
+        /// </summary>
+        public string? f_flowid { get; set; }
+
+    }
+
+}