diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index 952891e0..67d03004 100644
Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 520387c1..2d726695 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -192,8 +192,8 @@ namespace WMS.Web.Domain.Services.Public
                 //3.单据类型：标准采购订单和标准委外订单
                 //4.明细关闭状态：正常
                 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
-                param.FilterString = " FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'";
-
+                //param.FilterString = " FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'";
+                param.FilterString = " FDocumentStatus='C' and FMRPCloseStatus='A'";
                 for (int i = 0; i < stocks.Count(); i++)
                 {
                     if (i == 0)
@@ -316,7 +316,8 @@ namespace WMS.Web.Domain.Services.Public
                 //2.审核状态：已审核
                 //3.单据类型：标准其他入库单；这里要注意了-----------测试端的“单据类型ID”和线上的可能不一样；上线的时候要核对下
                 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
-                param.FilterString = " FDocumentStatus='C' and FBillTypeID='d772ead981e748d69dda1caac7583f8c'";
+                //param.FilterString = " FDocumentStatus='C' and FBillTypeID='d772ead981e748d69dda1caac7583f8c'";
+                param.FilterString = " FDocumentStatus='C'";
                 for (int i = 0; i < stocks.Count(); i++)
                 {
                     if (i == 0)
@@ -426,7 +427,8 @@ namespace WMS.Web.Domain.Services.Public
                 //3.单据类型：标准直接调拨单；这里要注意了-----------测试端的“单据类型ID”和线上的可能不一样；上线的时候要核对下
                 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
                 //当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取
-                param.FilterString = " FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'";
+                //param.FilterString = " FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'";
+                param.FilterString = " FDocumentStatus='C'";
                 param.FilterString += " and FSrcStockId!=FDestStockId";
 
                 for (int i = 0; i < stocks.Count(); i++)
@@ -538,7 +540,8 @@ namespace WMS.Web.Domain.Services.Public
                 //3.单据类型：标准分步式调入单；这里要注意了-----------测试端的“单据类型ID”和线上的可能不一样；上线的时候要核对下
                 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
                 //当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取
-                param.FilterString = " FDocumentStatus='C' and FBillTypeID='e65a4f29743a44b7b67dc8145e1f9c92'";
+                //param.FilterString = " FDocumentStatus='C' and FBillTypeID='e65a4f29743a44b7b67dc8145e1f9c92'";
+                param.FilterString = " FDocumentStatus='C'";
                 param.FilterString += " and FSrcStockId!=FDestStockId";
                 for (int i = 0; i < stocks.Count(); i++)
                 {
@@ -1907,7 +1910,8 @@ namespace WMS.Web.Domain.Services.Public
                 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
                 //6.物料 物料属性=费用或资产或服务的排除 不拉取
                 //7.V01.05.00: 当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取
-                param.FilterString = "FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'";
+                //param.FilterString = "FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'";
+                param.FilterString = "FDocumentStatus='C'";
                 param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)";
                 param.FilterString += " and FSrcStockId!=FDestStockId";
                 //string srt = JsonConvert.SerializeObject(stocks_codes);
@@ -2005,7 +2009,8 @@ namespace WMS.Web.Domain.Services.Public
                 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 
                 //6.物料 物料属性=费用或资产或服务的排除 不拉取
                 //7.V01.05.00: 当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取
-                param.FilterString = "FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183'";
+                //param.FilterString = "FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183'";
+                param.FilterString = "FDocumentStatus='C'";
                 param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)";
                 param.FilterString += " and FSrcStockID!=FDestStockID";
                 //string srt = JsonConvert.SerializeObject(stocks_codes);
@@ -2102,7 +2107,8 @@ namespace WMS.Web.Domain.Services.Public
                 //3.单据类型:标准
                 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID
                 //6.物料 物料属性=费用或资产或服务的排除 不拉取
-                param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'";
+                //param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'";
+                param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly'";
                 param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)";
                 //string srt = JsonConvert.SerializeObject(stocks_codes);
                 //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
@@ -2198,7 +2204,8 @@ namespace WMS.Web.Domain.Services.Public
                 //3.单据类型:标准
                 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
                 //6.物料 物料属性=费用或资产或服务的排除 不拉取
-                param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9'";
+                //param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9'";
+                param.FilterString = "FDocumentStatus='C'";
                 param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)";
                 //string srt = JsonConvert.SerializeObject(stocks_codes);
                 //param.FilterString += " and FStockId.FNumber in (" + stocks_codes + ")";
@@ -2294,7 +2301,8 @@ namespace WMS.Web.Domain.Services.Public
                 //3.单据类型:标准
                 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID
                 //6.物料 物料属性=费用或资产或服务的排除 不拉取
-                param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'";
+                //param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'";
+                param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly'";
                 param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)";
                 //string srt = JsonConvert.SerializeObject(stocks_codes);
                 //param.FilterString += " and FStockIDSETY.FNumber in (" + stocks_codes + ")";
@@ -2396,7 +2404,8 @@ namespace WMS.Web.Domain.Services.Public
                 //4.日期>=系统上线之日
                 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
                 //6.物料 物料属性=费用或资产或服务的排除 不拉取
-                param.FilterString = "FDocumentStatus='C' and FBillTypeID='ad0779a4685a43a08f08d2e42d7bf3e9'";
+                //param.FilterString = "FDocumentStatus='C' and FBillTypeID='ad0779a4685a43a08f08d2e42d7bf3e9'";
+                param.FilterString = "FDocumentStatus='C'";
                 param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)";
                 //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
                 //param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")";