wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化wms项目目录结构

Browse Source
This commit is contained in:
DEVICE8\12494
2023-06-13 08:41:24 +08:00
parent 4b818980de
commit 27a335bdcf
26 changed files with 564 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Consts
{
public class WmsWareHouseConst
{
/// <summary>
/// 出入库单据状态TypeID
/// </summary>
public const string WMS_INSTOCK_D_BILL_STATUS_TYPEID = "25065133038101";
}
}

0
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ExChangeCarryInput.cs → WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/ExChangeCarryInput.cs
View File

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/InOutStockApplyforUpInput.cs → WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/InOutStockApplyforUpInput.cs
View File

@@ -14,6 +14,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto
{
// bill_line,location_id,delivery_date,carry_id,carry_code
/// <summary>
/// 出入库明细Id
/// </summary>
public string id { get; set; }
/// <summary>
/// 出入库申请类型 1、入库 2、出库
/// </summary>
public EnumInOutStockType inoutStockType { get; set; }

0
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/CarryCodeDetailOutput.cs → WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryCodeDetailOutput.cs
View File

16
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/InStockDetailOutput.cs → WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/InStockDetailOutput.cs
View File

@@ -14,6 +14,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto
/// <summary>
/// 入库单明细Id
/// </summary>
public string id { get; set; }
/// <summary>
/// 入库单Id
/// </summary>
public string bill_id { get; set; }
/// <summary>
/// 单位id
@@ -52,6 +56,14 @@ namespace Tnb.WarehouseMgr.Entities.Dto
/// </summary>
public decimal? tax_price { get; set; }
/// <summary>
/// 不含税金额
/// </summary>
public decimal? amount { get; set; }
/// <summary>
/// 含税金额
/// </summary>
public decimal? all_amount { get; set; }
/// <summary>
/// 已打印数量
/// </summary>
public int print_qty { get; set; }
@@ -60,6 +72,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto
/// </summary>
public int scan_qty { get; set; }
/// <summary>
/// 物品代码
/// </summary>
public string material_code { get; set; } = string.Empty;
/// <summary>
/// 条码明细
/// </summary>
public List<WmsInstockCode> CodeDetails { get; set; }

155
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/OutStockDetailOutput.cs Normal file
View File

@@ -0,0 +1,155 @@
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 OutStockDetailOutput
{
/// <summary>
/// 出库单明细Id
/// </summary>
public string id { get; set; }
/// <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? location_id { get; set; }
/// <summary>
/// 物品ID
/// </summary>
public string? material_id { get; set; }
/// <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? unit_code { get; set; }
/// <summary>
/// 出库需求数量
/// </summary>
public decimal pr_qty { get; set; }
/// <summary>
/// 实际出库数量
/// </summary>
public decimal qty { get; set; }
/// <summary>
/// 要求出库日期（销售出库为交期）
/// </summary>
public DateTime? delivery_date { get; set; }
/// <summary>
/// 发料仓库
/// </summary>
public string? warehouse_id { get; set; }
/// <summary>
/// 不含税单价
/// </summary>
public decimal? price { get; set; }
/// <summary>
/// 含税单价
/// </summary>
public decimal? tax_price { get; set; }
/// <summary>
/// 不含税金额
/// </summary>
public decimal? amount { get; set; }
/// <summary>
/// 含税金额
/// </summary>
public decimal? all_amount { get; set; }
/// <summary>
/// 来源单据ID
/// </summary>
public string? source_id { get; set; }
/// <summary>
/// 来源单单据类型
/// </summary>
public int? source_type { get; set; }
/// <summary>
/// 来源单据行号
/// </summary>
public int? source_line { get; set; }
/// <summary>
/// 来源单据明细ID
/// </summary>
public string? source_detail_id { get; set; }
/// <summary>
/// 生产工单号
/// </summary>
public string? mo_code { get; set; }
/// <summary>
/// 生产工单BOM明细Id
/// </summary>
public string? mo_bom_detail_id { get; set; }
/// <summary>
/// 生产工单行号
/// </summary>
public int? mo_line { get; set; }
/// <summary>
/// 打印数量
/// </summary>
public decimal? print_qty { get; set; }
/// <summary>
/// 扫描数量
/// </summary>
public decimal? scan_qty { get; set; }
/// <summary>
/// 备注
/// </summary>
public string? remark { get; set; }
/// <summary>
/// 批次
/// </summary>
public string? code_batch { get; set; }
/// <summary>
/// 条码明细
/// </summary>
public List<WmsOutstockCode> CodeDetails { get; set; }
}
}

0
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/InOutStockDetailQuery.cs → WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/InOutStockDetailQuery.cs
View File

33
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/InStockStrategyQuery.cs Normal file
View File

@@ -0,0 +1,33 @@
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 InStockStrategyQuery
{
/// <summary>
/// 仓库Id
/// </summary>
public string warehouse_id { get; set; }
/// <summary>
/// 物料Id
/// </summary>
public string material_id { get; set; }
/// <summary>
/// 批次
/// </summary>
public string code_batch { get; set; }
/// <summary>
/// 业务类型s
/// </summary>
public int BllType { get; set; }
public int Size { get; set; }
}
}

12
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/OutStockStrategyQuery.cs Normal file
View File

@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto
{
internal class OutStockStrategyQuery
{
}
}

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockD.cs
View File

@@ -27,7 +27,7 @@ public partial class WmsInstockD : BaseEntity<string>
/// <summary>
/// 执行状态
/// </summary>
public string line_status { get; set; } = string.Empty;
public string line_status { get; set; }
/// <summary>
/// 物品ID

27
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockD.cs
View File

@@ -17,32 +17,27 @@ public partial class WmsOutstockD : BaseEntity<string>
/// <summary>
/// 所属组织ID
/// </summary>
public string org_id { get; set; } = string.Empty;
public string? org_id { get; set; }
/// <summary>
/// 出库单ID
/// </summary>
public string bill_id { get; set; } = string.Empty;
/// <summary>
/// 行号
/// </summary>
public int bill_line { get; set; }
/// <summary>
/// 明细状态
/// </summary>
public int line_status { get; set; }
public string line_status { get; set; } = string.Empty;
/// <summary>
/// 库位ID
/// </summary>
public string location_id { get; set; } = string.Empty;
public string? location_id { get; set; }
/// <summary>
/// 物品ID
/// </summary>
public string material_id { get; set; } = string.Empty;
public string? material_id { get; set; }
/// <summary>
/// 物品代码
@@ -57,7 +52,7 @@ public partial class WmsOutstockD : BaseEntity<string>
/// <summary>
/// 单位代码
/// </summary>
public string unit_code { get; set; } = string.Empty;
public string? unit_code { get; set; }
/// <summary>
/// 出库需求数量
@@ -72,12 +67,12 @@ public partial class WmsOutstockD : BaseEntity<string>
/// <summary>
/// 要求出库日期（销售出库为交期）
/// </summary>
public DateTime delivery_date { get; set; } = DateTime.Now;
public DateTime? delivery_date { get; set; }
/// <summary>
/// 发料仓库
/// </summary>
public string warehouse_id { get; set; } = string.Empty;
public string? warehouse_id { get; set; }
/// <summary>
/// 不含税单价
@@ -137,12 +132,12 @@ public partial class WmsOutstockD : BaseEntity<string>
/// <summary>
/// 打印数量
/// </summary>
public decimal print_qty { get; set; }
public decimal? print_qty { get; set; }
/// <summary>
/// 扫描数量
/// </summary>
public decimal scan_qty { get; set; }
public decimal? scan_qty { get; set; }
/// <summary>
/// 备注
@@ -162,12 +157,12 @@ public partial class WmsOutstockD : BaseEntity<string>
/// <summary>
/// 创建用户
/// </summary>
public string create_id { get; set; } = string.Empty;
public string? create_id { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime create_time { get; set; } = DateTime.Now;
public DateTime? create_time { get; set; }
/// <summary>
/// 修改用户

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPointH.cs
View File

@@ -108,5 +108,8 @@ public partial class WmsPointH : BaseEntity<string>
/// 时间戳(用于并发控制)
/// </summary>
public DateTime? timestamp { get; set; }
/// <summary>
/// 楼层
/// </summary>
public int floor { get; set; }
}

18
WarehouseMgr/Tnb.WarehouseMgr.Entities/Mapper/Mapper.cs Normal file
View File

@@ -0,0 +1,18 @@
using Mapster;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto;
namespace Tnb.WarehouseMgr.Entities.Mapper
{
public class Mapper : IRegister
{
public void Register(TypeAdapterConfig config)
{
//config.ForType<InOutStockApplyforUpInput, WmsInstockD>()
// .Map(dest => dest.id, src => src.bill_id);
//config.ForType<InOutStockApplyforUpInput, WmsOutstockD>()
// .Map(dest => dest.id, src => src.bill_id);
}
}
}