From ff21512df65ba45218c0b168fb8ff22b8041c680 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Fri, 28 Jun 2024 11:46:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E4=BB=93=E8=B0=83=E6=8B=A8?=
=?UTF-8?q?=E5=92=8C=E5=AE=A2=E6=88=B7=E5=82=A8=E4=BD=8D=E8=B0=83=E6=8B=A8?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=96=E6=B6=88=E5=8A=9F=E8=83=BD=EF=BC=8C?=
=?UTF-8?q?=E5=A4=87=E5=93=81=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Inputs/SparePartIssueRequestImportInput.cs | 4 ++--
.../SparePartIssueRequestDetail.cs | 10 +++++-----
.../TransferRequests/TransferRequestManager.cs | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs
index ac1f6ee0e..c9ce65d1a 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs
@@ -17,9 +17,9 @@ public class SparePartIssueRequestImportInput : SfsStoreImportInputBase
public string ItemCode { get; set; }
///
- /// 需求数量
+ /// 需求数量/箱数
///
- [Display(Name = "需求数量")]
+ [Display(Name = "需求数量/箱数")]
[Required(ErrorMessage = "{0}是必填项")]
public decimal Qty { get; set; }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/SparePartIssueRequests/SparePartIssueRequestDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/SparePartIssueRequests/SparePartIssueRequestDetail.cs
index e27b79511..f39ab6ec1 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/SparePartIssueRequests/SparePartIssueRequestDetail.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/SparePartIssueRequests/SparePartIssueRequestDetail.cs
@@ -53,12 +53,12 @@ public class SparePartIssueRequestDetail : SfsStoreDetailWithQtyEntityBase, IHas
public string ProdLine { get; set; }
///
- /// 已发数量
+ /// 已生产任务的数量/箱数
///
public decimal IssuedQty { get; set; }
///
- /// 已收数量
+ /// 已收数量(不是箱数)
///
public decimal ReceivedQty { get; set; }
@@ -68,19 +68,19 @@ public class SparePartIssueRequestDetail : SfsStoreDetailWithQtyEntityBase, IHas
public EnumStatus Status { get; set; }
///
- /// 请求未发 还未发送的数量
+ /// 未生成任务数量/箱数
///
[NotMapped]
public decimal ToBeIssuedQty => Qty - IssuedQty;
///
- /// 已发未收
+ /// 已发未收(无用)
///
[NotMapped]
public decimal ToBeReceivedQty => IssuedQty - ReceivedQty;
///
- /// 请求未收
+ /// 请求未收(无用)
///
[NotMapped]
public decimal NotFinishQty => Qty - ReceivedQty;
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/TransferRequests/TransferRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/TransferRequests/TransferRequestManager.cs
index 375a71e88..aeb19c8d9 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/TransferRequests/TransferRequestManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/TransferRequests/TransferRequestManager.cs
@@ -80,7 +80,7 @@ public class TransferRequestManager : SfsStoreRequestManagerBase CancelAsync(TransferRequest entity)
{
- entity.RequestStatus = EnumRequestStatus.Reviewing;
+ entity.Cancel();
return await Repository.UpdateAsync(entity).ConfigureAwait(false);
}
}