From 61da0c1c82b73f53888aaa713cd887559275461d Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 22 Nov 2023 11:46:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 17 ++++++++++++++++-
.../SaveChangeBoxRecordRequest.cs | 5 ++---
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 084d92b1..bf59cb5e 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -435,11 +435,26 @@
目标箱子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; }
///
/// 目标箱组织编码
From c919b1a94b78eb5ad26707ad27312aa5cefac85b Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 22 Nov 2023 11:50:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E7=AE=B1=E5=AF=B9=E5=BA=94=E7=9A=84=E4=BB=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs | 5 +++++
src/WMS.Web.Domain/Services/OutStockService.cs | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
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);