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

erp仓库映射关系、erp同步完善、库存报表添加箱号 批次号查询；载具库存报表添加箱号 批次号查询

Browse Source
This commit is contained in:
马健
2024-08-19 15:42:00 +08:00
parent 3d74fea016
commit 346784ddfc
20 changed files with 255 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,17 +258,17 @@
/// </summary>
public const string BIZTYPE_WMSEMPTYINSTOCK_ID = "26121986416677";
/// <summary>
/// 预任务生成业务类型-签收回库 todo
/// 预任务生成业务类型-签收回库
/// </summary>
public const string BIZTYPE_WmsMaterialSign_ID = "BIZTYPE_WmsMaterialSign_ID";
public const string BIZTYPE_WmsMaterialSign_ID = "36318841764117";
/// <summary>
/// 预任务生成业务类型-载具移入
/// </summary>
public const string BIZTYPE_CARRYMOVEINSTOCK_ID = "26121988909861";
/// <summary>
/// 预任务生成业务类型-成品调拨出库 todo
/// 预任务生成业务类型-成品调拨出库
/// </summary>
public const string BIZTYPE_WmsTransferOutstock_ID = "BIZTYPE_WmsTransferOutstock_ID";
public const string BIZTYPE_WmsTransferOutstock_ID = "36318847981589";
/// <summary>
/// 预任务生成业务类型-库内转移
/// </summary>
@@ -320,19 +320,19 @@
/// <summary>
/// 预任务生成业务类型-调拨出库单(原材料)
/// </summary>
public const string BIZTYPE_WmsRawmatTransferoutstock_ID = "BIZTYPE_WmsRawmatTransferoutstock_ID";
public const string BIZTYPE_WmsRawmatTransferoutstock_ID = "36318854044437";
/// <summary>
/// 预任务生成业务类型-生产退料单 todo
/// 预任务生成业务类型-生产退料单
/// </summary>
public const string BIZTYPE_PRDRETURN_ID = "BIZTYPE_PRDRETURN_ID";
public const string BIZTYPE_PRDRETURN_ID = "36318858573333";
/// <summary>
/// 预任务生成业务类型-包材入库 todo
/// 预任务生成业务类型-包材入库
/// </summary>
public const string BIZTYPE_WMSPACKINSTOCK_ID = "BIZTYPE_WMSPACKINSTOCK_ID";
public const string BIZTYPE_WMSPACKINSTOCK_ID = "36318862414357";
/// <summary>
/// 预任务生成业务类型-包材出库 todo
/// 预任务生成业务类型-包材出库
/// </summary>
public const string BIZTYPE_WMSPACKOUTSTOCK_ID = "BIZTYPE_WMSPACKOUTSTOCK_ID";
public const string BIZTYPE_WMSPACKOUTSTOCK_ID = "36318866547989";
/// <summary>
/// 预任务生成业务类型-载具绑定
/// </summary>
@@ -353,9 +353,9 @@
public const string BIZTYPE_WMSPRDINSTOCK_ID = "34840264160277";
/// <summary>
/// 灭菌入库 todo
/// 灭菌入库
/// </summary>
public const string BIZTYPE_WMSSTERILIZATIONINSTOCKCH_ID = "BIZTYPE_WMSSTERILIZATIONINSTOCKCH_ID";
public const string BIZTYPE_WMSSTERILIZATIONINSTOCKCH_ID = "36318871067413";
/// <summary>
/// 条码打印状态-已完成

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/PurchaseOrderInput.cs
View File

@@ -43,6 +43,11 @@ namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
/// </summary>
public string? erp_pk { get; set; }
/// <summary>
/// erp仓库类型
/// </summary>
public string erp_wh_type { get; set; }
public List<PurchaseOrderDetail> details { get; set; }
}
public class PurchaseOrderDetail

165
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/TransferOrderInput.cs
View File

@@ -1,92 +1,93 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Transactions;
namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
{
public class TransferOrderInput
{
/// <summary>
/// 单号
/// </summary>
public string? transfer_order { get; set; }
/// <summary>
/// 部门编码
/// </summary>
public string? dept_code { get; set; }
/// <summary>
/// 业务员编码
/// </summary>
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Transactions;
namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
{
public class TransferOrderInput
{
/// <summary>
/// 单号
/// </summary>
public string? transfer_order { get; set; }
/// <summary>
/// 部门编码
/// </summary>
public string? dept_code { get; set; }
/// <summary>
/// 业务员编码
/// </summary>
public string? biller { get; set; }
/// <summary>
/// 出库仓库
/// </summary>
/// <summary>
/// 出库仓库
/// </summary>
public string? warehouse_outstock { get; set; }
/// <summary>
/// 入库组织编号
/// </summary>
public string? instockorg_code { get; set; }
/// <summary>
/// 供货日期
/// </summary>
/// <summary>
/// 入库组织编号
/// </summary>
public string? instockorg_code { get; set; }
/// <summary>
/// 供货日期
/// </summary>
public DateTime? ship_date { get; set; }
/// <summary>
/// 主表pk
/// </summary>
/// <summary>
/// 主表pk
/// </summary>
public string? erp_pk { get; set; }
/// <summary>
/// 交易类型
/// </summary>
/// <summary>
/// 交易类型
/// </summary>
public string? transaction_type { get; set; }
public List<TransferOrderInputDetail> details { get; set; }
}
public class TransferOrderInputDetail
{
/// <summary>
/// 行号
/// </summary>
public string? lineno { get; set; }
/// <summary>
/// erp仓库类型
/// <summary>
/// 物品代码
/// </summary>
public string? material_code { get; set; }
/// <summary>
/// 单位代码
/// </summary>
public string? unit_code { get; set; }
/// <summary>
/// 采购数量
/// </summary>
/// </summary>
public string erp_wh_type { get; set; }
public List<TransferOrderInputDetail> details { get; set; }
}
public class TransferOrderInputDetail
{
/// <summary>
/// 行号
/// </summary>
public string? lineno { get; set; }
/// <summary>
/// 物品代码
/// </summary>
public string? material_code { get; set; }
/// <summary>
/// 单位代码
/// </summary>
public string? unit_code { get; set; }
/// <summary>
/// <summary>
/// 批次
/// </summary>
public string? code_batch { get; set; }
/// <summary>
/// 交货日期
/// </summary>
public DateTime? delivery_date { get; set; }
/// <summary>
/// 子表主键
/// </summary>
public string erp_line_pk { get; set; }
}
}
/// 采购数量
/// </summary>
public decimal? qty { get; set; }
/// <summary>
/// 批次
/// </summary>
public string? code_batch { get; set; }
/// <summary>
/// 交货日期
/// </summary>
public DateTime? delivery_date { get; set; }
/// <summary>
/// 子表主键
/// </summary>

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/TransferOutstockInput.cs
View File

@@ -58,6 +58,11 @@ namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
/// </summary>
public string? erp_pk { get; set; }
/// <summary>
/// erp仓库类型
/// </summary>
public string? erp_wh_type { get; set; }
public List<RawMatTransferInstockDetail> details { get; set; }
}
public class RawMatTransferInstockDetail

52
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsErpWarehouserelaH.cs Normal file
View File

@@ -0,0 +1,52 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.WarehouseMgr.Entities.Entity;
/// <summary>
/// ERP仓库映射关系表
/// </summary>
[SugarTable("wms_erp_warehouserela_h")]
public partial class WmsErpWarehouserelaH : BaseEntity<string>
{
public WmsErpWarehouserelaH()
{
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? org_id { get; set; }
/// <summary>
/// erp仓库编码
/// </summary>
public string? erp_warehousecode { get; set; }
/// <summary>
/// wms仓库编码
/// </summary>
public string? wms_warehousecode { get; set; }
}

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

@@ -54,4 +54,9 @@ public partial class WmsMaterialSignH : BaseEntity<string>
/// </summary>
public string? warehouse_instock_id { get; set; }
/// <summary>
/// 业务类型
/// </summary>
public string? biz_type { get; set; }
}

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

@@ -159,9 +159,4 @@ public partial class WmsPurchaseH : BaseEntity<string>, IPurchaseAndSaleAuitEnti
/// erp到货单主表pk
/// </summary>
public string erp_arriveorder_pk { get;set; }
/// <summary>
/// 来源
/// </summary>
public string create_origin { get; set; }
}

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseOrderH.cs
View File

@@ -119,4 +119,8 @@ public partial class WmsPurchaseOrderH : BaseEntity<string>
/// </summary>
public DateTime? ship_date { get; set; }
/// <summary>
/// erp仓库类型
/// </summary>
public string erp_wh_type { get; set; }
}

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferinstockH.cs
View File

@@ -119,4 +119,8 @@ public partial class WmsRawmatTransferinstockH : BaseEntity<string>
/// </summary>
public string? biller { get; set; }
/// <summary>
/// erp仓库类型
/// </summary>
public string? erp_wh_type { get; set; }
}

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

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

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferOrderH.cs
View File

@@ -84,4 +84,8 @@ public partial class WmsTransferOrderH : BaseEntity<string>
/// </summary>
public string? transaction_type { get; set; }
/// <summary>
/// erp仓库类型
/// </summary>
public string erp_wh_type { get; set; }
}

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

@@ -108,4 +108,9 @@ public partial class WmsTransferOutstockH : BaseEntity<string>
/// 调拨订单id
/// </summary>
public string? transfer_order_id { get; set; }
/// <summary>
/// erp仓库类型
/// </summary>
public string erp_wh_type { get; set; }
}