From 53abdd58b5028c93a9b0bcf39f05024c3090b1b5 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Sat, 25 Nov 2023 15:59:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/Controllers/SysConfigController.cs     | 6 +++---
 src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml                | 2 +-
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml             | 4 ++--
 src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs | 1 -
 src/WMS.Web.Domain/IService/Public/IErpService.cs      | 2 +-
 src/WMS.Web.Domain/Services/Public/ErpService.cs       | 4 ++--
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs
index c523b01a..42043bfc 100644
--- a/src/WMS.Web.Api/Controllers/SysConfigController.cs
+++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs
@@ -198,8 +198,8 @@ namespace WMS.Web.Api.Controllers
         /// <param name="name">模糊匹配</param>
         /// <returns></returns>
         [HttpGet]
-        [Route("GetErp_SubUcStock/{number}")]
-        public async Task<Result<List<UcStockResponse>>> GetErp_SubUcStock([FromRoute] string number, [FromQuery] string name)
+        [Route("GetErp_SubUcStock/{number}/{orgCode}")]
+        public async Task<Result<List<UcStockResponse>>> GetErp_SubUcStock([FromRoute] string number,[FromRoute] string orgCode, [FromQuery] string name)
         {
             var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
             if (loginInfo == null || loginInfo.UserInfo == null)
@@ -208,7 +208,7 @@ namespace WMS.Web.Api.Controllers
             List<UcStockResponse> list = new List<UcStockResponse>();
             if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD"))
             {
-                var subs = await _erpService.BillQueryForSubStock(number);
+                var subs = await _erpService.BillQueryForSubStock(number,orgCode);
                 foreach (var s in subs.Data.Where(w => w.Name.Contains(name)))
                 {
                     list.Add(new UcStockResponse()
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 6d0db41a..af82acd0 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -481,7 +481,7 @@
             <param name="id">仓库id</param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetErp_SubUcStock(System.String,System.String)">
+        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetErp_SubUcStock(System.String,System.String,System.String)">
             <summary>
             根据仓库获取金蝶子仓库
             </summary>
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index e5c8bd99..7e1bface 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -2741,7 +2741,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForSubStock(System.String)">
+        <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForSubStock(System.String,System.String)">
             <summary>
             获取仓位信息信息 根据仓库编码
             </summary>
@@ -4021,7 +4021,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForSubStock(System.String)">
+        <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForSubStock(System.String,System.String)">
             <summary>
             根据仓库编码获取仓位
             </summary>
diff --git a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
index 461b8e53..ea277685 100644
--- a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
+++ b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
@@ -42,7 +42,6 @@ namespace WMS.Web.Core.Dto.TakeStock
         /// <summary>
         /// 序列号  
         /// </summary>
-        [Required(ErrorMessage = "序列号不能为空")]
         public List<string> SerialNumbers { get; set; } = new List<string>();
         /// <summary>
         /// 备注
diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs
index 403bb89e..9de6d159 100644
--- a/src/WMS.Web.Domain/IService/Public/IErpService.cs
+++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs
@@ -122,7 +122,7 @@ namespace WMS.Web.Domain.IService.Public
         /// 获取仓位信息信息 根据仓库编码
         /// </summary>
         /// <returns></returns>
-        Task<ResultList<ErpStockDto>> BillQueryForSubStock(string code=null);
+        Task<ResultList<ErpStockDto>> BillQueryForSubStock(string code=null, string orgCode = null);
         //同步数据(保存提交审核)
         Task<Result<string>> Save<T>(T dto, string formId);
         //提交
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 21351cd1..47697d93 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -1131,7 +1131,7 @@ namespace WMS.Web.Domain.Services.Public
         /// </summary>
         /// <param name="code"></param>
         /// <returns></returns>
-        public async Task<ResultList<ErpStockDto>> BillQueryForSubStock(string code = null)
+        public async Task<ResultList<ErpStockDto>> BillQueryForSubStock(string code = null,string orgCode=null)
         {
             try
             {
@@ -1148,7 +1148,7 @@ namespace WMS.Web.Domain.Services.Public
                     param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId,'0'";
                     param.Limit = 100000;
                     if (!string.IsNullOrEmpty(code))
-                        param.FilterString = "FNumber='" + code + "'";//FNumber='C'
+                        param.FilterString = $"FNumber='{code}' and FUseOrgId.FNumber='{orgCode}'";//FNumber='C'
                     query.Data = JsonConvert.SerializeObject(param);
                     var json = JsonConvert.SerializeObject(query);