diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs
index 45cb1100..469f2b30 100644
--- a/src/WMS.Web.Api/Controllers/SysConfigController.cs
+++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs
@@ -215,9 +215,9 @@ namespace WMS.Web.Api.Controllers
             if (!number.Substring(0, 2).Equals("HD") && !number.Substring(0, 2).Equals("GD"))
                 return Result<List<UcStockResponse>>.ReSuccess(list);
 
-            var subs = await _erpService.BillQueryForSubStock(number, orgCode);
+            var subs = await _erpService.BillQueryForSubStock();
             //var subs = await _erpService.BillQueryForSubStock(null, null);
-            list = subs.Data.Where(w => w.Name.Contains(name)).Select(s => new UcStockResponse()
+            list = subs.Data.Where(w => w.Name.Equals(name) && w.OrgCode.Equals(orgCode)).Select(s => new UcStockResponse()
             {
                 Id = s.Id,
                 Code = s.Code,
diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index e1fd661f..dc57c053 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -58,8 +58,9 @@ namespace WMS.Web.Api.Controllers
         {
             OperateRequest dto = new OperateRequest();
             dto.Ids.Add(54);
+            var result = await this._erpService.BillQueryForSubStock();
             //await _outStockService.Sync(dto, null);
-            var b = await _takeStockService.Sync(dto);
+            //var b = await _takeStockService.Sync(dto);
             // List<ErpCustomerDto> list = null;
             //var b= list.FirstOrDefault(f => f.Id == 123);
             //var entity=await  _takeStockRepositories.GetEntityList(new List<int>() {2 });
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index d7fdbaaa..6354fca0 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -3020,7 +3020,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForSubStock(System.String,System.String)">
+        <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForSubStock">
             <summary>
             获取仓位信息信息 根据仓库编码
             </summary>
@@ -4414,7 +4414,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForSubStock(System.String,System.String)">
+        <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForSubStock">
             <summary>
             根据仓库编码获取仓位
             </summary>
diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs
index 981a0b83..b392f1eb 100644
--- a/src/WMS.Web.Domain/IService/Public/IErpService.cs
+++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs
@@ -142,7 +142,7 @@ namespace WMS.Web.Domain.IService.Public
         /// 获取仓位信息信息 根据仓库编码
         /// </summary>
         /// <returns></returns>
-        Task<ResultList<ErpStockDto>> BillQueryForSubStock(string code=null, string orgCode = null);
+        Task<ResultList<ErpStockDto>> BillQueryForSubStock();
         //同步数据(保存提交审核)
         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 a8155555..e16ecc88 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -1240,7 +1240,7 @@ namespace WMS.Web.Domain.Services.Public
         /// </summary>
         /// <param name="code"></param>
         /// <returns></returns>
-        public async Task<ResultList<ErpStockDto>> BillQueryForSubStock(string code = null, string orgCode = null)
+        public async Task<ResultList<ErpStockDto>> BillQueryForSubStock()
         {
             try
             {
@@ -1254,10 +1254,9 @@ namespace WMS.Web.Domain.Services.Public
                         return ResultList<ErpStockDto>.ReFailure(token_result);
                     var query = new ErpBillQueryDto(token_result.Data);
                     var param = new ErpBillQueryParamDto(FormIdParam.BD_STOCK.ToString());
-                    param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId,'0'";
+                    param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId,FUseOrgId.FNumber";
                     param.Limit = 100000;
-                    if (!string.IsNullOrEmpty(code))
-                        param.FilterString = $"FNumber='{code}' and FUseOrgId.FNumber='{orgCode}'";//FNumber='C'
+                    param.FilterString = $"FNumber='HD' or FNumber='GD'";//FNumber='C'
                     query.Data = JsonConvert.SerializeObject(param);
                     var json = JsonConvert.SerializeObject(query);
 
@@ -1272,13 +1271,12 @@ namespace WMS.Web.Domain.Services.Public
                         lis.Id = int.Parse(item[0]);
                         lis.Name = item[1];
                         lis.Code = item[2];
-                        lis.OrgId = Convert.ToInt32(item[3]);
+                        lis.OrgCode = item[3];
                         list.Add(lis);
 
                     }
                     //5.供应商集合进行缓存 只有查询全部的时候才缓存
-                    if (code == null)
-                        _memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
+                    _memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
                     _logger.LogInformation($"子仓库拉取-总条数：{list.Count}");
                     return ResultList<ErpStockDto>.ReSuccess(list);
                 }
@@ -2080,7 +2078,7 @@ namespace WMS.Web.Domain.Services.Public
                 {
                     var lis = new ErpSalOutStockDetailsSaveDto();
                     lis.DetailId = item[1];
-                    lis.Qty =Convert.ToDecimal(item[2]);
+                    lis.Qty = Convert.ToDecimal(item[2]);
                     lis.DeliveryNoticeDetailId = "";
                     erp_list.Details.Add(lis);
                 }