From c8fca2351954310572835f91d75dfe0721acfabc Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Thu, 26 Oct 2023 09:37:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9D=B6=E5=AD=97=E6=AE=B5=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/appsettings.json                 |  3 ++-
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml       |  5 +++++
 src/WMS.Web.Core/Dto/Erp/ErpBillQueryParamDto.cs | 11 +++++++++--
 src/WMS.Web.Domain/Options/ErpOptions.cs         |  5 +++++
 src/WMS.Web.Domain/Services/Public/ErpService.cs |  3 ++-
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/WMS.Web.Api/appsettings.json b/src/WMS.Web.Api/appsettings.json
index 525e0e8f..1d7b35aa 100644
--- a/src/WMS.Web.Api/appsettings.json
+++ b/src/WMS.Web.Api/appsettings.json
@@ -38,7 +38,8 @@
     "EndpointAddress": "http://119.23.206.129/k3cloud/ERPGW.asmx",
     "UserName": "mes",
     "Password": "A1B2C3Dh.",
-    "ErpId": "ce20210909"
+    "ErpId": "ce20210909",
+    "PurchaseInstockFieldKeys": "FBillNo,FUOM"
   },
   "Qiniu": {
     "AccessKey": "dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms",
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 8fb9455b..0f3e3a8a 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -282,6 +282,11 @@
             erp-Id
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Options.ErpOptions.PurchaseInstockFieldKeys">
+            <summary>
+            采购入库：字段
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Options.SoaOptions.Url">
             <summary>
             单点系统地址
diff --git a/src/WMS.Web.Core/Dto/Erp/ErpBillQueryParamDto.cs b/src/WMS.Web.Core/Dto/Erp/ErpBillQueryParamDto.cs
index dd05a23d..86ab3e98 100644
--- a/src/WMS.Web.Core/Dto/Erp/ErpBillQueryParamDto.cs
+++ b/src/WMS.Web.Core/Dto/Erp/ErpBillQueryParamDto.cs
@@ -9,14 +9,21 @@ namespace WMS.Web.Core.Dto.Erp
     /// </summary>
     public class ErpBillQueryParamDto
     {
+        public ErpBillQueryParamDto() { }
+
+        public ErpBillQueryParamDto(string formId) 
+        {
+            this.FormId = formId;
+        }
+
         /// <summary>
         /// 业务对象表单Id（必录）
         /// </summary>
-        public string FormId { get; set; } = "STK_InStock";
+        public string FormId { get; set; }
         /// <summary>
         /// 需查询的字段key集合，字符串类型，格式："key1,key2,..."（必录） 注（查询单据体内码,需加单据体Key和下划线,如：FEntryKey_FEntryId）
         /// </summary>
-        public string FieldKeys { get; set; } = "FBillNo,FUOM";
+        public string FieldKeys { get; set; } 
         /// <summary>
         /// 过滤条件，数组类型，如：[{"Left":"(","FieldName":"Field1","Compare":"=","Value":"111","Right":")","Logic":"AND"},{"Left":"(","FieldName":"Field2","Compare":"=","Value":"222","Right":")","Logic":""}]
         /// </summary>
diff --git a/src/WMS.Web.Domain/Options/ErpOptions.cs b/src/WMS.Web.Domain/Options/ErpOptions.cs
index 7eff5cc5..f44dc918 100644
--- a/src/WMS.Web.Domain/Options/ErpOptions.cs
+++ b/src/WMS.Web.Domain/Options/ErpOptions.cs
@@ -28,5 +28,10 @@ namespace WMS.Web.Domain.Options
         /// erp-Id
         /// </summary>
         public string ErpId { get; set; }
+
+        /// <summary>
+        /// 采购入库：字段
+        /// </summary>
+        public string PurchaseInstockFieldKeys { get; set; }
     }
 }
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index d76fc55a..381f38c5 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -14,6 +14,7 @@ using WMS.Web.Core.Internal.Results;
 using WMS.Web.Domain.IService.Public;
 using WMS.Web.Domain.Options;
 using WMS.Web.Domain.Values;
+using WMS.Web.Domain.Values.Erp;
 
 namespace WMS.Web.Domain.Services.Public
 {
@@ -68,7 +69,7 @@ namespace WMS.Web.Domain.Services.Public
             ERPGWSoapClient client = new ERPGWSoapClient(binding, address);
             var token_result = await client.ValidateSystemAsync(this._erpOptions.UserName, this._erpOptions.Password, this._erpOptions.ErpId, "");
             var query = new ErpBillQueryDto(token_result.AccessToken);
-            var param = new ErpBillQueryParamDto();
+            var param = new ErpBillQueryParamDto(FormIdParam.STK_InStock.ToString());
             query.Data = JsonConvert.SerializeObject(param);
             var json = JsonConvert.SerializeObject(query);
             var result_json = await client.ExecuteBillQueryAsync(json);