From 8ef4ce8efa482094f6769b0b97732364c9180225 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Fri, 11 Oct 2024 10:41:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2      | Bin 275696 -> 275696 bytes
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml      |   5 +++++
 .../GetOutStockTaskByNoResponse.cs            |   4 ++++
 .../OutStockTaskRepositories.cs               |   2 ++
 4 files changed, 11 insertions(+)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index 0c639b4269da38c79eb25698982346482376a5a5..be4a42b59d13fe93334033f8694013508bba3db0 100644
GIT binary patch
delta 4521
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

delta 4682
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
E0<HfzdH?_b

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index a2cb2285..b2159569 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -5139,6 +5139,11 @@
             主键 订单编号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskByNoResponse.Type">
+            <summary>
+            单据类型 1 销售出库,2 其他出库,3 直接调拨出库,4 分步式调出,5 组装拆卸出库
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskByNoResponse.BillNo">
             <summary>
             单据编号
diff --git a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs
index a1c76f5e..b86de670 100644
--- a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs
+++ b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs
@@ -14,6 +14,10 @@ namespace WMS.Web.Core.Dto.OutStockTask
         /// </summary>
         public int Id { get; set; }
         /// <summary>
+        /// 单据类型 1 销售出库,2 其他出库,3 直接调拨出库,4 分步式调出,5 组装拆卸出库
+        /// </summary>
+        public int Type { get; set; }
+        /// <summary>
         /// 单据编号
         /// </summary>
         public string BillNo { get; set; }
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 7f4c7989..63c855c5 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -440,6 +440,7 @@ namespace WMS.Web.Repositories
             foreach (var r in response)
             {
                 var entity = list.FirstOrDefault(f => f.Id == r.Id);
+                r.Type = (int)entity.Type;
                 r.OrgCode = entity.OrgCode;
                 r.StockCode = entity.StockCode;
                 r.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode);
@@ -473,6 +474,7 @@ namespace WMS.Web.Repositories
             if (entity == null) return new GetOutStockTaskByNoResponse();
 
             var response = _mapper.Map<GetOutStockTaskByNoResponse>(entity);
+            response.Type = (int)entity.Type;
             response.OrgCode = entity.OrgCode;
             response.StockCode = entity.StockCode;
             response.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode);