From 9bb1c5088f3cf8b83291d30822441ed1f0b9c95d Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Wed, 8 Nov 2023 11:11:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml            | 10 ++++++++++
 src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs | 11 +++++++++--
 src/WMS.Web.Domain/Services/Public/ErpService.cs    |  6 +++---
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index dd09a194..ce782f00 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -605,6 +605,16 @@
             物料规格型号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpMaterialDto.BaseUnitId">
+            <summary>
+            基本单位
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpMaterialDto.BaseUnitName">
+            <summary>
+            基本单位名称
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.Org.ErpOrgDto">
             <summary>
             金蝶组织-基本信息
diff --git a/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs b/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs
index caad2179..7f8f88f1 100644
--- a/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs
+++ b/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs
@@ -27,7 +27,14 @@ namespace WMS.Web.Core.Dto.Erp
         /// </summary>
         public string Specifications { get; set; }
 
-        public string Status { get; set; }
-        public string UseOrgId { get; set; }
+        /// <summary>
+        /// 基本单位
+        /// </summary>
+        public int BaseUnitId { get; set; }
+
+        /// <summary>
+        /// 基本单位名称
+        /// </summary>
+        public string BaseUnitName { get; set; }
     }
 }
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 8f7242ea..0aaf487a 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -191,7 +191,7 @@ namespace WMS.Web.Domain.Services.Public
                 //3.获取金蝶物料：拼接参数和条件
                 var query = new ErpBillQueryDto(token_result.Data);
                 var param = new ErpBillQueryParamDto(FormIdParam.BD_MATERIAL.ToString());
-                param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FForbidStatus,FUseOrgId";
+                param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName";
                 param.Limit = 10000;
 
                 //查询条件：备注其中的条件值以金蝶的值为准！！！
@@ -229,8 +229,8 @@ namespace WMS.Web.Domain.Services.Public
                         lis.MaterialName = item[1];
                         lis.MaterialNumber = item[2];
                         lis.Specifications = item[3];
-                        lis.Status = item[4];
-                        lis.UseOrgId = item[5];
+                        lis.BaseUnitId = Convert.ToInt32(item[4]);
+                        lis.BaseUnitName = item[5];
                         erp_materials_list.Add(lis);
                     }
                     //4.6页面的叠加