diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs
index 044623d5..4b96d126 100644
--- a/src/WMS.Web.Api/Controllers/SysConfigController.cs
+++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs
@@ -198,19 +198,20 @@ 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)
                 return Result<List<UcStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
 
             List<UcStockResponse> list = new List<UcStockResponse>();
-            if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD"))
+            //if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD"))
+            //{
+            //var subs = await _erpService.BillQueryForSubStock(number,orgCode);
+            var subs = await _erpService.BillQueryForSubStock(null, null);
+            foreach (var s in subs.Data.Skip(0).Take(10))//.Where(w => w.Name.Contains(name)
             {
-                var subs = await _erpService.BillQueryForSubStock(number);
-                foreach (var s in subs.Data.Where(w => EF.Functions.Like(w.Name, "%" + name + "%")))
-                {
                     list.Add(new UcStockResponse()
                     {
                         Id = s.Id,
@@ -219,7 +220,7 @@ namespace WMS.Web.Api.Controllers
                         Disable = false
                     });
                 }
-            }
+            //}
             return Result<List<UcStockResponse>>.ReSuccess(list);
         }
 
diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 8a51758e..9016008d 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -46,7 +46,7 @@ namespace WMS.Web.Api.Controllers
         [Route("hj")]
         public async Task<string> TestHJ()
         {
-            var c = await _erpService.BillQueryForCustomer();
+            var c = await _erpService.BillQueryForSubStock(null,null);
             //var bc2 = await _erpService.BillQueryForMisDeliveryOutStock(null, DateTime.Now.AddDays(-10)); 
             //var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10));
             //var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-1));
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 0fd8d41c..77147ada 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..d83d8d0d 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);
 
@@ -1159,6 +1159,7 @@ namespace WMS.Web.Domain.Services.Public
                     foreach (var item in result)
                     {
                         var lis = new ErpStockDto();
+                        if (item[0] == "0") continue;
                         lis.Id = int.Parse(item[0]);
                         lis.Name = item[1];
                         lis.Code = item[2];