diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 2e0f0e78..43821269 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1862,11 +1862,6 @@ 组织ID - - - 物料ID - - 物料名称 @@ -3053,9 +3048,9 @@ - + - 仓位ID + 仓位编码 @@ -3073,9 +3068,9 @@ 非采购上架明细-箱库存处理对象 - + - 物料ID + 物料编码 @@ -3113,9 +3108,9 @@ 出库明细-箱库存变更请求对象 - + - 物料ID + 物料编码 @@ -3138,9 +3133,9 @@ 仓库编码 - + - 仓位ID + 仓位编码 @@ -3158,9 +3153,9 @@ 采购上架明细-箱库存处理对象 - + - 物料ID + 物料编码 @@ -3338,9 +3333,9 @@ 明细 - + - 物料ID + 物料编码 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index fc1d3130..bd470c62 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1161,11 +1161,6 @@ 供应商ID - - - 物料ID - - 物料编码 @@ -1191,11 +1186,6 @@ ID - - - 物料ID - - 物料编码 @@ -1236,11 +1226,6 @@ ID - - - 物料ID - - 物料编码 diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs index c5ecccd4..55371f2f 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs @@ -23,11 +23,6 @@ namespace WMS.Web.Core.Dto.InStockTask /// public int OrgId { get; set; } - /// - /// 物料ID - /// - public int MaterialId { get; set; } - /// /// 物料名称 /// diff --git a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryNoPurchaseGenerateDto.cs b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryNoPurchaseGenerateDto.cs index d29bfc3e..3686208f 100644 --- a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryNoPurchaseGenerateDto.cs +++ b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryNoPurchaseGenerateDto.cs @@ -20,9 +20,9 @@ namespace WMS.Web.Core.Dto.Inventory public string StockCode { get; set; } /// - /// 仓位ID + /// 仓位编码 /// - public int SubStockId { get; set; } + public string SubStockCode { get; set; } /// /// 箱IDS @@ -41,9 +41,9 @@ namespace WMS.Web.Core.Dto.Inventory public class BoxInventoryNoPurchaseDetailsGenerateDto { /// - /// 物料ID + /// 物料编码 /// - public int MaterialId { get; set; } + public string MaterialNumber { get; set; } /// /// 数量 /// diff --git a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryOutStockGenerateDto.cs b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryOutStockGenerateDto.cs index 2b06f635..de619dd0 100644 --- a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryOutStockGenerateDto.cs +++ b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryOutStockGenerateDto.cs @@ -30,9 +30,9 @@ namespace WMS.Web.Core.Dto.Inventory public class BoxInventoryOutStockDetailsGenerateDto { /// - /// 物料ID + /// 物料编码 /// - public int MaterialId { get; set; } + public string MaterialNumber { get; set; } /// /// 数量 /// diff --git a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryPurchaseGenerateDto.cs b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryPurchaseGenerateDto.cs index d2daeac9..27cc7488 100644 --- a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryPurchaseGenerateDto.cs +++ b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryPurchaseGenerateDto.cs @@ -16,9 +16,9 @@ namespace WMS.Web.Core.Dto.Inventory public string StockCode { get; set; } /// - /// 仓位ID + /// 仓位编码 /// - public int SubStockId { get; set; } + public string SubStockCode { get; set; } /// /// 箱IDS @@ -37,9 +37,9 @@ namespace WMS.Web.Core.Dto.Inventory public class BoxInventoryPurchaseDetailsGenerateDto { /// - /// 物料ID + /// 物料编码 /// - public int MaterialId { get; set; } + public string MaterialNumber { get; set; } /// /// 数量 /// diff --git a/src/WMS.Web.Core/Dto/Inventory/BoxTaskGenerateDto.cs b/src/WMS.Web.Core/Dto/Inventory/BoxTaskGenerateDto.cs index cf2aba82..d6b99df8 100644 --- a/src/WMS.Web.Core/Dto/Inventory/BoxTaskGenerateDto.cs +++ b/src/WMS.Web.Core/Dto/Inventory/BoxTaskGenerateDto.cs @@ -31,9 +31,9 @@ namespace WMS.Web.Core.Dto.Inventory public class BoxTaskDetailsGenerateDto { /// - /// 物料ID + /// 物料编码 /// - public int MaterialId { get; set; } + public string MaterialNumber { get; set; } /// /// 数量 /// diff --git a/src/WMS.Web.Core/Dto/Inventory/SerialNumbersBoxInventoryDto.cs b/src/WMS.Web.Core/Dto/Inventory/SerialNumbersBoxInventoryDto.cs index 86bcaf07..348fce1b 100644 --- a/src/WMS.Web.Core/Dto/Inventory/SerialNumbersBoxInventoryDto.cs +++ b/src/WMS.Web.Core/Dto/Inventory/SerialNumbersBoxInventoryDto.cs @@ -13,10 +13,7 @@ namespace WMS.Web.Core.Dto.Inventory /// 序列号 /// public string SerialNumber { get; set; } - ///// - ///// 物料ID - ///// - //public int MaterialId { get; set; } + /// /// 物料编码 /// diff --git a/src/WMS.Web.Domain/Entitys/InStockTotalDetails.cs b/src/WMS.Web.Domain/Entitys/InStockTotalDetails.cs index 1ef1a4aa..0aedaa34 100644 --- a/src/WMS.Web.Domain/Entitys/InStockTotalDetails.cs +++ b/src/WMS.Web.Domain/Entitys/InStockTotalDetails.cs @@ -35,10 +35,6 @@ namespace WMS.Web.Domain.Entitys /// public int SupplierId { get; set; } - /// - /// 物料ID - /// - public int MaterialId { get; set; } /// /// 物料编码 /// diff --git a/src/WMS.Web.Domain/Entitys/InventoryDetails.cs b/src/WMS.Web.Domain/Entitys/InventoryDetails.cs index 381f20a6..b52451ce 100644 --- a/src/WMS.Web.Domain/Entitys/InventoryDetails.cs +++ b/src/WMS.Web.Domain/Entitys/InventoryDetails.cs @@ -16,10 +16,7 @@ namespace WMS.Web.Domain.Entitys /// ID /// public int Id { get; set; } - /// - /// 物料ID - /// - public int MaterialId { get; set; } + /// /// 物料编码 /// diff --git a/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs b/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs index 198e3168..e2ec8464 100644 --- a/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs +++ b/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs @@ -17,10 +17,7 @@ namespace WMS.Web.Domain.Entitys /// ID /// public int Id { get; set; } - /// - /// 物料ID - /// - public int MaterialId { get; set; } + /// /// 物料编码 ///