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

增加MES-WMS接口

Browse Source
This commit is contained in:
FanLian
2023-07-07 16:49:39 +08:00
parent 70634df84d
commit 630678ff23
28 changed files with 1042 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
View File

@@ -27,6 +27,17 @@ namespace Tnb.WarehouseMgr.Entities.Consts
/// 预任务生成EnCode
/// </summary>
public const string WMS_PRETASK_H_ENCODE = "PreTaskGen";
/// 齐套出库生成Encode
/// </summary>
public const string WMS_KITTINGOUTSTK_ENCODE = "WmsKittingOutStk";
/// <summary>
/// 空载具出库生成Encode
/// </summary>
public const string WMS_EMPTYOUTSTK_ENCODE = "EptyCarryOutStk";
/// <summary>
/// 空载具入库生成Encode
/// </summary>
public const string WMS_EMPTYINSTK_ENCODE = "EptyCarryInbound";
/// <summary>
/// 载具移入生成Encode
/// </summary>

28
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCarryQueryInput.cs Normal file
View File

@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
{
/// <summary>
/// MES载具查询接口输入
/// </summary>
public class MESCarryQueryInput
{
/// <summary>
/// 组织ID
/// </summary>
public string org_id { get; set; }
/// <summary>
/// 载具编号
/// </summary>
public string carry_code { get; set; }
/// <summary>
/// 齐套搭配方案名称
/// </summary>
public string collocation_scheme_name { get; set; }
}
}

23
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCarryQueryResultInput.cs Normal file
View File

@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
{
/// <summary>
/// MES载具查询返回接口输入
/// </summary>
public class MESCarryQueryResultInput
{
/// <summary>
/// 组织ID
/// </summary>
public string org_id { get; set; }
/// <summary>
/// 载具编号
/// </summary>
public string carry_code { get; set; }
}
}

21
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCarrySignInput.cs Normal file
View File

@@ -0,0 +1,21 @@
namespace Tnb.WarehouseMgr
{
/// <summary>
/// MES载具签收接口输入
/// </summary>
public class MESCarrySignInput
{
/// <summary>
/// 组织ID
/// </summary>
public string? org_id { get; set; }
/// <summary>
/// 载具Id
/// </summary>
public string? carry_id { get; set;}
/// <summary>
/// 创建热Id
/// </summary>
public string? create_id { get; set; }
}
}

26
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCollocationSchemeQueryInput.cs Normal file
View File

@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
{
public class MESCollocationSchemeQueryInput
{
/// <summary>
/// 齐套出库主表
/// </summary>
//public WmsCollocationSchemeH wmsCollocationSchemeH { get; set; }
/// <summary>
/// 产品ID
/// </summary>
public string material_id { get; set; }
/// <summary>
/// 组织ID
/// </summary>
public string org_id { get; set; }
}
}

3
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCreateInstockInput.cs
View File

@@ -6,6 +6,9 @@ using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
{
/// <summary>
/// MES入库输入
/// </summary>
public class MESCreateInstockInput
{
/// <summary>

3
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCreateOutstockInput.cs
View File

@@ -6,6 +6,9 @@ using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
{
/// <summary>
/// MES出库输入
/// </summary>
public class MESCreateOutstockInput
{
/// <summary>

35
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESEmptyCarryInStockInput.cs Normal file
View File

@@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
{
/// <summary>
/// MES空载具入库输入
/// </summary>
public class MESEmptyCarryInStockInput
{
/// <summary>
/// 组织ID
/// </summary>
public string? org_id { get; set; }
/// <summary>
/// 库位编号
/// </summary>
public string? location_code { get; set; }
/// <summary>
/// 载具编号
/// </summary>
public string? carry_code { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string? create_id { get; set; }
/// <summary>
/// 入库仓库
/// </summary>
public string? warehouse_id { get; set; }
}
}

44
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESEmptyCarryOutStkInput.cs Normal file
View File

@@ -0,0 +1,44 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
{
/// <summary>
/// MES空载具出库输入
/// </summary>
public class MESEmptyCarryOutStkInput
{
/// <summary>
/// 组织ID
/// </summary>
public string org_id { get; set; }
/// <summary>
/// 库位编号
/// </summary>
public string location_code { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string? create_id { get; set; }
/// <summary>
/// 入库仓库
/// </summary>
public string? warehouse_id { get; set; }
/// <summary>
/// 载具规格编号
/// </summary>
public string? carrystd_id { get; set; }
/// <summary>
/// 数量
/// </summary>
public int? qty { get; set; }
}
}

140
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESKittingOutStkInput.cs Normal file
View File

@@ -0,0 +1,140 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
{
/// <summary>
/// MES齐套出库输入类
/// </summary>
public class MESKittingOutStkInput
{
/// <summary>
/// 所属组织ID
/// </summary>
public string? org_id { get; set; }
/// <summary>
/// 出库单创建日期
/// </summary>
public DateTime bill_date { get; set; } = DateTime.Now;
/// <summary>
/// 业务类型
/// </summary>
public string biz_type { get; set; } = string.Empty;
/// <summary>
/// 发料仓库ID
/// </summary>
public string warehouse_id { get; set; } = string.Empty;
/// <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>
/// 产品ID
/// </summary>
public string? material_id { get; set; }
/// <summary>
/// 产品编号
/// </summary>
public string? material_code { get; set; }
/// <summary>
/// 齐套搭配方案ID
/// </summary>
public string? collocation_scheme_id { get; set; }
/// <summary>
/// 齐套搭配方案编号
/// </summary>
public string collocation_scheme_code { get; set; } = string.Empty;
/// <summary>
/// 来源单据ID
/// </summary>
public string? source_id { get; set; }
/// <summary>
/// 顺序号
/// </summary>
public int seq { get; set; }
/// <summary>
/// 创建用户ID
/// </summary>
public string? create_id { get; set; }
/// <summary>
/// MES齐套出库明细表输入
/// </summary>
public List<MESKittingOutStkDInput>? wmsKittingoutDs { get; set; }
}
/// <summary>
/// MES齐套出库明细表输入类
/// </summary>
public class MESKittingOutStkDInput
{
/// <summary>
/// 单位ID
/// </summary>
public string unit_id { get; set; } = string.Empty;
/// <summary>
/// 单位编号
/// </summary>
public string? unit_code { 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>
/// 数量（件数）
/// </summary>
public decimal? pr_qty { get; set; }
/// <summary>
/// 箱数
/// </summary>
public int? box { get; set; }
}
}

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SignForDeliveryInput.cs
View File

@@ -22,6 +22,8 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
public string new_carry_code { get; set; }
public string org_id { get; set; }
/// <summary>
/// 任务执行条码表
/// </summary>

146
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryQueryOutput.cs Normal file
View File

@@ -0,0 +1,146 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto.Outputs
{
/// <summary>
/// 载具查询输出类
/// </summary>
public class CarryQueryOutput
{
public string id { get; set; }
/// <summary>
/// 所属组织ID
/// </summary>?
public string? org_id { get; set; }
/// <summary>
/// 载具编号
/// </summary>
public string carry_code { get; set; } = string.Empty;
/// <summary>
/// 载具名称
/// </summary>
public string carry_name { get; set; } = string.Empty;
/// <summary>
/// 载具分类ID
/// </summary>
public string carrystd_id { get; set; } = string.Empty;
/// <summary>
/// 载具库位ID
/// </summary>
public string? location_id { get; set; }
/// <summary>
/// 载具库位编号
/// </summary>
public string? location_code { get; set; }
/// <summary>
/// 来源单据ID
/// </summary>
public string? source_id { get; set; }
/// <summary>
/// 打包号
/// </summary>
public string? bale_num { get; set; }
/// <summary>
/// 齐套搭配方案ID
/// </summary>
public string? collocation_scheme_id { get; set; }
/// <summary>
/// 齐套搭配方案编号
/// </summary>
public string? collocation_scheme_code { get; set; }
/// <summary>
/// 载具条码明细输出
/// </summary>
public List<CarryCodeQueryOutput>? wmsCarryCodes { get; set; }
}
/// <summary>
/// 载具查询明细输出类
/// </summary>
public class CarryCodeQueryOutput
{
/// <summary>
/// 主键ID
/// </summary>
public string id { get; set; }
/// <summary>
/// 所属组织ID
/// </summary>
public string? org_id { get; set; }
/// <summary>
/// 上级载具ID
/// </summary>
public string carry_id { get; set; }
/// <summary>
/// 物品ID
/// </summary>
public string material_id { get; set; } = string.Empty;
/// <summary>
/// 物品代码
/// </summary>
public string material_code { get; set; } = string.Empty;
/// <summary>
/// 条码编号
/// </summary>
public string barcode { get; set; } = string.Empty;
/// <summary>
/// 批次
/// </summary>
public string? code_batch { get; set; }
/// <summary>
/// 条码数量
/// </summary>
public decimal codeqty { get; set; }
/// <summary>
/// 是否出库
/// </summary>
public int is_out { get; set; }
/// <summary>
/// 库位ID
/// </summary>
public string location_id { get; set; } = string.Empty;
/// <summary>
/// 库位编号
/// </summary>
public string location_code { get; set; } = string.Empty;
/// <summary>
/// 单位ID
/// </summary>
public string unit_id { get; set; } = string.Empty;
/// <summary>
/// 单位代码
/// </summary>
public string unit_code { get; set; } = string.Empty;
/// <summary>
/// 仓库ID
/// </summary>
public string? warehouse_id { get; set; }
}
}

112
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CollocationSchemeOutput.cs Normal file
View File

@@ -0,0 +1,112 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto.Outputs
{
/// <summary>
/// 搭配方案输出类
/// </summary>
public class CollocationSchemeOutput
{
/// <summary>
/// 主键
/// </summary>
public string 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_name { get; set; } = string.Empty;
/// <summary>
/// 顺序号
/// </summary>
public int seq { get; set; }
/// <summary>
/// 产品ID
/// </summary>
public string material_id { get; set; } = string.Empty;
/// <summary>
/// 产品代码
/// </summary>
public string material_code { get; set; } = string.Empty;
/// <summary>
/// 配送次数
/// </summary>
public int count { get; set; }
/// <summary>
/// 最低库存
/// </summary>
public int minimum { get; set; }
/// <summary>
/// 库位ID
/// </summary>
public string? location_id { get; set; }
/// <summary>
/// 齐套明细输出
/// </summary>
public List<CollocationSchemeDOutput>? CollocationSchemeDs { get; set; }
public List<WmsCollocationSchemeD> list{ get; set; }
}
public class CollocationSchemeDOutput
{
/// <summary>
/// 主键ID
/// </summary>
public string? id { get; set; }
/// <summary>
/// 所属组织ID
/// </summary>
public string? org_id { get; set; }
/// <summary>
/// 搭配方案ID
/// </summary>
public string bill_id { 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 carrystd_id { get; set; } = string.Empty;
/// <summary>
/// 数量(件数)
/// </summary>
public decimal qty { get; set; }
/// <summary>
/// 箱数
/// </summary>
public int box { get; set; }
}
}

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Mapper/Mapper.cs
View File

@@ -1,6 +1,7 @@
using Mapster;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Dto.Inputs;
namespace Tnb.WarehouseMgr.Entities.Mapper
{
@@ -11,6 +12,10 @@ namespace Tnb.WarehouseMgr.Entities.Mapper
config.ForType<WmsPretaskH, WmsDistaskH>()
.Map(dest => dest.pretask_id, src => src.id)
.Map(dest => dest.pretask_code, src => src.bill_code);
config.ForType<MESCarrySignInput, SignForDeliveryInput>()
.Map(dest => dest.carryId, src => src.carry_id)
;
}
}
}