From bc2d8c02780082f563ccf28f1d6c0a035c5b55e3 Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Tue, 21 Nov 2023 15:15:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 15 +++++++++++++++ .../Dto/InStockTask/SourceBillNoQueryResponse.cs | 10 ++++++++++ .../InStockTaskRepositories.cs | 2 ++ 3 files changed, 27 insertions(+) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 8132dd31..35f27489 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -280,6 +280,11 @@ 供应商Id + + + 组织编码 + + 箱号 @@ -1540,6 +1545,16 @@ 已交数量 + + + 收货数量 + + + + + 可入库数量 + + 明细备注 diff --git a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs index 4920147e..95e866c2 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs @@ -71,6 +71,16 @@ namespace WMS.Web.Core.Dto.InStockTask /// public decimal DeliveredQty { get; set; } + /// + /// 收货数量 + /// + public decimal ReceiveQty { get; set; } + + /// + /// 可入库数量 + /// + public decimal AvailableQty { get; set; } + /// /// 明细备注 /// diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index ded643a8..2d562424 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -288,6 +288,8 @@ namespace WMS.Web.Repositories Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), Qty =s.detail.AccruedQty, DeliveredQty=s.detail.DeliveredQty, + ReceiveQty=s.detail.ReceiveQty, + AvailableQty =s.detail.AccruedQty- s.detail.ReceiveQty- s.detail.DeliveredQty, Remark = s.detail.Remark }).ToListAsync(); return list;