diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index de4e6f0f..0dbd5055 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -90,7 +90,7 @@ namespace WMS.Web.Domain.Services.Public
         /// 查单据类型的值
         /// </summary>
         /// <returns></returns>
-        public async Task<ResultList<ErpBaseDto>> BillQueryForBillType() 
+        public async Task<ResultList<ErpBaseDto>> BillQueryForBillType()
         {
             try
             {
@@ -107,7 +107,7 @@ namespace WMS.Web.Domain.Services.Public
                 var param = new ErpBillQueryParamDto("BOS_BillType");
                 param.FieldKeys = "FBILLTYPEID,FNumber,FName";
                 param.Limit = 10000;
-                param.FilterString = "";               
+                param.FilterString = "";
                 query.Data = JsonConvert.SerializeObject(param);
                 var json = JsonConvert.SerializeObject(query);
 
@@ -122,8 +122,8 @@ namespace WMS.Web.Domain.Services.Public
                     var lis = new ErpBaseDto();
                     lis.Id = item[0];
                     lis.Number = item[1];
-                    lis.Name =item[2];
-                    
+                    lis.Name = item[2];
+
                     erp_list.Add(lis);
                 }
                 return ResultList<ErpBaseDto>.ReSuccess(erp_list);
@@ -352,7 +352,7 @@ namespace WMS.Web.Domain.Services.Public
         /// </summary>
         /// <param name="sourceBillNos"></param>
         /// <returns></returns>
-        public async Task<ResultList<ErpInStockResultDto>> BillQueryForTransferDirect(List<string> sourceBillNos = null) 
+        public async Task<ResultList<ErpInStockResultDto>> BillQueryForTransferDirect(List<string> sourceBillNos = null)
         {
             try
             {
@@ -456,7 +456,7 @@ namespace WMS.Web.Domain.Services.Public
         /// </summary>
         /// <param name="sourceBillNos"></param>
         /// <returns></returns>
-        public async Task<ResultList<ErpInStockResultDto>> BillQueryForTransferin(List<string> sourceBillNos = null) 
+        public async Task<ResultList<ErpInStockResultDto>> BillQueryForTransferin(List<string> sourceBillNos = null)
         {
             try
             {
@@ -560,7 +560,7 @@ namespace WMS.Web.Domain.Services.Public
         /// </summary>
         /// <param name="sourceBillNos"></param>
         /// <returns></returns>
-        public async Task<ResultList<ErpInStockResultDto>> BillQueryForAssembledApp_Assembly(List<string> sourceBillNos = null) 
+        public async Task<ResultList<ErpInStockResultDto>> BillQueryForAssembledApp_Assembly(List<string> sourceBillNos = null)
         {
             try
             {
@@ -1187,7 +1187,7 @@ namespace WMS.Web.Domain.Services.Public
             {
                 var token_result = await this.Init();
                 if (!token_result.IsSuccess)
-                    return Result<string>.ReFailure(token_result.Message,token_result.Status);
+                    return Result<string>.ReFailure(token_result.Message, token_result.Status);
                 var query = new ErpBillQueryDto(token_result.Data);
                 var param = new ErpSave<T>(formId, dto);
                 query.Data = JsonConvert.SerializeObject(param);
@@ -1396,15 +1396,26 @@ namespace WMS.Web.Domain.Services.Public
                 param.FilterString = "FDocumentStatus='C' and FRemainOutQty>=0";
                 param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
                 param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")";
-                
+                for (int i = 0; i < stocks.Count(); i++)
+                {
+                    if (i == 0)
+                    {
+                        param.FilterString += " and (";
+                        param.FilterString += $"(FStockID.FNumber='{stocks[0].Code}' and FDeliveryOrgID.FNumber='{stocks[0].ErpOrgCode}')";
+                    }else
+                        param.FilterString += $" or (FStockID.FNumber='{stocks[0].Code}' and FDeliveryOrgID.FNumber='{stocks[0].ErpOrgCode}')";
+                    if (i==stocks.Count()-1) param.FilterString += ")";
+
+                }
+
                 //根据原订单号查询
                 if (sourceBillNos != null && sourceBillNos.Count() > 0)
                 {
                     var srt_b = string.Join(",", sourceBillNos.Select(x => $"'{x}'"));
-                    param.FilterString +=  " and FBillNo in (" + srt_b + ")";
+                    param.FilterString += " and FBillNo in (" + srt_b + ")";
                 }
                 else//没有指定单号搜索 则带时间范围
-                    param.FilterString +=  " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'";
+                    param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'";
 
                 query.Data = JsonConvert.SerializeObject(param);
                 var json = JsonConvert.SerializeObject(query);
@@ -1430,7 +1441,7 @@ namespace WMS.Web.Domain.Services.Public
                     lis.CreateTime = Convert.ToDateTime(item[9]);
                     lis.Type = (int)OutStockType.Sal;
                     lis.Erp_DetailId = Convert.ToInt32(item[10]);
-                    lis.OrgCode= item[11];
+                    lis.OrgCode = item[11];
                     erp_list.Add(lis);
                 }
                 return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReSuccess(erp_list);
@@ -1636,8 +1647,20 @@ namespace WMS.Web.Domain.Services.Public
                 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID
                 param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'";
                 //string srt = JsonConvert.SerializeObject(stocks_codes);
-                param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
-                param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
+                //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
+                //param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
+                for (int i = 0; i < stocks.Count(); i++)
+                {
+                    if (i == 0)
+                    {
+                        param.FilterString += " and (";
+                        param.FilterString += $"(FStockID.FNumber='{stocks[0].Code}' and FStockOrgId.FNumber='{stocks[0].ErpOrgCode}')";
+                    }
+                    else
+                        param.FilterString += $" or (FStockID.FNumber='{stocks[0].Code}' and FStockOrgId.FNumber='{stocks[0].ErpOrgCode}')";
+                    if (i == stocks.Count() - 1) param.FilterString += ")";
+
+                }
                 //根据原订单号查询
                 if (sourceBillNos != null && sourceBillNos.Count() > 0)
                 {
@@ -1796,8 +1819,22 @@ namespace WMS.Web.Domain.Services.Public
                 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID
                 param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'";
                 //string srt = JsonConvert.SerializeObject(stocks_codes);
-                param.FilterString += " and FStockIDSETY.FNumber in (" + stocks_codes + ")";
-                param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
+                //param.FilterString += " and FStockIDSETY.FNumber in (" + stocks_codes + ")";
+                //param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
+
+                for (int i = 0; i < stocks.Count(); i++)
+                {
+                    if (i == 0)
+                    {
+                        param.FilterString += " and (";
+                        param.FilterString += $"(FStockIDSETY.FNumber='{stocks[0].Code}' and FStockOrgId.FNumber='{stocks[0].ErpOrgCode}')";
+                    }
+                    else
+                        param.FilterString += $" or (FStockIDSETY.FNumber='{stocks[0].Code}' and FStockOrgId.FNumber='{stocks[0].ErpOrgCode}')";
+                    if (i == stocks.Count() - 1) param.FilterString += ")";
+
+                }
+
                 //根据原订单号查询
                 if (sourceBillNos != null && sourceBillNos.Count() > 0)
                 {