diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index eaf189f0..bf59cb5e 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -437,12 +437,12 @@
- 目标箱的仓库(可为空:当目标箱不需要上架时候)
+ 目标箱的仓库或重新上架选择仓位对应的仓库
- 仓位
+ 目标箱仓位或重新上架选择仓位
@@ -1230,11 +1230,6 @@
单据ID(等同-入库任务单ID)
-
-
- 仓库编码
-
-
箱号集合
diff --git a/src/WMS.Web.Core/Dto/ChangeBoxRecord/SaveChangeBoxRecordRequest.cs b/src/WMS.Web.Core/Dto/ChangeBoxRecord/SaveChangeBoxRecordRequest.cs
index 17c4cc07..2c7ff7f8 100644
--- a/src/WMS.Web.Core/Dto/ChangeBoxRecord/SaveChangeBoxRecordRequest.cs
+++ b/src/WMS.Web.Core/Dto/ChangeBoxRecord/SaveChangeBoxRecordRequest.cs
@@ -20,19 +20,18 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord
[Required(ErrorMessage = "目标箱子不能为空")]
public int DestBoxId { get; set; }
///
- /// 目标箱的仓库(可为空:当目标箱不需要上架时候)
+ /// 目标箱的仓库或重新上架选择仓位对应的仓库
///
[Required(ErrorMessage = "仓库不能为空")]
public string StockCode { get; set; }
///
- /// 仓位
+ /// 目标箱仓位或重新上架选择仓位
///
[Required(ErrorMessage = "仓位不能为空")]
public string SubStockId { get; set; }
///
/// 原箱组织编码
///
- [Required(ErrorMessage = "原箱组织不能为空")]
public string SrcBoxOrgCode { get; set; }
///
/// 目标箱组织编码
diff --git a/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs b/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
index ff690802..34743998 100644
--- a/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
+++ b/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
@@ -41,6 +41,11 @@ namespace WMS.Web.Core.Dto.OutStock
[Required(ErrorMessage = "箱不能为空")]
public int BoxId { get; set; }
///
+ /// 仓位不能为空
+ ///
+ [Required(ErrorMessage = "箱不能为空")]
+ public int SubStockId { get; set; }
+ ///
/// 序列号集
///
public List SerialNumbers { get; set; } = new List();
diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs
index d47bbed5..f6942c4d 100644
--- a/src/WMS.Web.Domain/Services/OutStockService.cs
+++ b/src/WMS.Web.Domain/Services/OutStockService.cs
@@ -115,7 +115,7 @@ namespace WMS.Web.Domain.Services
BoxId = boxId,
InventoryInOutMethod = dto.Method,
StockCode = outStockTask.StockCode,
- SubStockId = 0,// outStockTask.Details.First().SubStockId,
+ SubStockId = dto.Details.FirstOrDefault(f => f.BoxId == boxId)?.SubStockId ?? 0,// outStockTask.Details.First().SubStockId,
Details = inventoryDetail
};
inventoryList.Add(inventory);