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

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

@@ -53,5 +53,10 @@ public partial class WmsCarryCode
     /// </summary>
     [SugarColumn(IsIgnore = true)]
     public decimal? sign_qty { get; set; }
+    /// <summary>
+    /// 业务类型
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public string? biz_type { get; set; }
 
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatOutstockC.cs

@@ -0,0 +1,77 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities.Entity;
+
+/// <summary>
+/// 原材料材料出库载具表
+/// </summary>
+[SugarTable("wms_rawmat_outstock_c")]
+public partial class WmsRawmatOutstockC : BaseEntity<string>
+{
+    public WmsRawmatOutstockC()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 原材料材料出库单id
+    /// </summary>
+    public string? bill_id { get; set; }
+
+    /// <summary>
+    /// 载具ID
+    /// </summary>
+    public string? carry_id { get; set; }
+
+    /// <summary>
+    /// 载具编号
+    /// </summary>
+    public string? carry_code { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 终点库位id
+    /// </summary>
+    public string? endlocation_id { get; set; }
+
+    /// <summary>
+    /// 终点库位编码
+    /// </summary>
+    public string? endlocation_code { get; set; }
+
+    /// <summary>
+    /// 起点库位id
+    /// </summary>
+    public string? startlocation_id { get; set; }
+
+    /// <summary>
+    /// 起点库位编码
+    /// </summary>
+    public string? startlocation_code { get; set; }
+
+    /// <summary>
+    /// 原材料材料出库明细id
+    /// </summary>
+    public string? mat_bill_id { get; set; }
+
+    /// <summary>
+    /// 载具数量
+    /// </summary>
+    public decimal? qty { get; set; }
+
+    /// <summary>
+    /// 签收数量
+    /// </summary>
+    public decimal? sign_qty { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatOutstockD.cs

@@ -0,0 +1,127 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities.Entity;
+
+/// <summary>
+/// 材料出库单(子表)
+/// </summary>
+[SugarTable("wms_rawmat_outstock_d")]
+public partial class WmsRawmatOutstockD : BaseEntity<string>
+{
+    public WmsRawmatOutstockD()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 主表id
+    /// </summary>
+    public string? bill_id { 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? material_id { get; set; }
+
+    /// <summary>
+    /// 物料编码
+    /// </summary>
+    public string? material_code { get; set; }
+
+    /// <summary>
+    /// 物料名称
+    /// </summary>
+    public string? material_name { get; set; }
+
+    /// <summary>
+    /// 规格型号
+    /// </summary>
+    public string? material_specification { get; set; }
+
+    /// <summary>
+    /// 批号
+    /// </summary>
+    public string? batchno { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    public decimal? qty { get; set; }
+
+    /// <summary>
+    /// 抽检载具id
+    /// </summary>
+    public string? carry_id { get; set; }
+
+    /// <summary>
+    /// 抽检载具编码
+    /// </summary>
+    public string? carry_code { get; set; }
+
+    /// <summary>
+    /// 抽检出库库位id
+    /// </summary>
+    public string? location_id { get; set; }
+
+    /// <summary>
+    /// 抽检出库库位
+    /// </summary>
+    public DateTime? location_code { get; set; }
+
+    /// <summary>
+    /// 抽检出库时间
+    /// </summary>
+    public DateTime? outstock_time { get; set; }
+
+    /// <summary>
+    /// 抽检确认时间
+    /// </summary>
+    public DateTime? check_time { get; set; }
+
+    /// <summary>
+    /// 抽检入库时间
+    /// </summary>
+    public DateTime? instock_time { get; set; }
+
+    /// <summary>
+    /// 单位
+    /// </summary>
+    public string? unit { get; set; }
+
+    /// <summary>
+    /// erp_line_pk
+    /// </summary>
+    public string? erp_line_pk { get; set; }
+
+    /// <summary>
+    /// 行号
+    /// </summary>
+    public string? lineno { get; set; }
+
+    /// <summary>
+    /// 实际出库数量
+    /// </summary>
+    public decimal? actual_outstock_qty { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatOutstockH.cs

@@ -0,0 +1,87 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities.Entity;
+
+/// <summary>
+/// 材料出库(主表)
+/// </summary>
+[SugarTable("wms_rawmat_outstock_h")]
+public partial class WmsRawmatOutstockH : BaseEntity<string>
+{
+    public WmsRawmatOutstockH()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <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? bill_code { get; set; }
+
+    /// <summary>
+    /// 出库仓库id
+    /// </summary>
+    public string? warehouse_id { get; set; }
+
+    /// <summary>
+    /// 出库类型
+    /// </summary>
+    public string? outstock_type { get; set; }
+
+    /// <summary>
+    /// 领料部门
+    /// </summary>
+    public string? department { get; set; }
+
+    /// <summary>
+    /// erp_pk
+    /// </summary>
+    public string? erp_pk { get; set; }
+
+    /// <summary>
+    /// erp_bill_code
+    /// </summary>
+    public string? erp_bill_code { get; set; }
+
+    /// <summary>
+    /// 流程任务Id
+    /// </summary>
+    public string? f_flowtaskid { get; set; }
+
+    /// <summary>
+    /// 流程引擎Id
+    /// </summary>
+    public string? f_flowid { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? remark { get; set; }
+
+    /// <summary>
+    /// 下发状态
+    /// </summary>
+    public string? issuance_status { get; set; }
+
+}

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

@@ -155,4 +155,9 @@ public partial class WmsSaleH : BaseEntity<string>, IPurchaseAndSaleAuitEntity
     /// </summary>
     public string? erp_bill_code { get; set; }
 
+    /// <summary>
+    /// erp仓库类型
+    /// </summary>
+    public string? erp_wh_type { get; set; }
+
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs

@@ -104,5 +104,21 @@ public partial class WmsTransferInstockD : BaseEntity<string>
     /// </summary>
     public string? pi_code { get; set; }
 
+
+
+    /// <summary>
+    /// 库存地点
+    /// </summary>
+    public string? stock_location { get; set; }
+
+    /// <summary>
+    /// erp_line_pk
+    /// </summary>
+    public string? erp_line_pk { get; set; }
+
+    /// <summary>
+    /// 行号
+    /// </summary>
+    public string? lineno { get; set; }
 }
 

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockH.cs

@@ -75,5 +75,46 @@ public partial class WmsTransferInstockH : BaseEntity<string>
     /// </summary>
     public string? status { get; set; }
 
+
+
+    /// <summary>
+    /// 出库组织id
+    /// </summary>
+    public string? outstockorg_id { get; set; }
+
+    /// <summary>
+    /// 出库组织编号
+    /// </summary>
+    public string? outstockorg_code { get; set; }
+
+    /// <summary>
+    /// 出库组织名称
+    /// </summary>
+    public string? outstockorg_name { get; set; }
+
+    /// <summary>
+    /// erp_pk
+    /// </summary>
+    public string? erp_pk { get; set; }
+
+    /// <summary>
+    /// erp_bill_code
+    /// </summary>
+    public string? erp_bill_code { get; set; }
+
+    /// <summary>
+    /// 部门编码
+    /// </summary>
+    public string? dept_code { get; set; }
+
+    /// <summary>
+    /// 业务员编码
+    /// </summary>
+    public string? biller { get; set; }
+
+    /// <summary>
+    /// erp仓库类型
+    /// </summary>
+    public string? erp_wh_type { get; set; }
 }