diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index af71ff95..2e0f0e78 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -911,11 +911,6 @@
             供应商
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.Erp.ErpInStockResultDto.MaterialId">
-            <summary>
-            物料ID
-            </summary>
-        </member>
         <member name="P:WMS.Web.Core.Dto.Erp.ErpInStockResultDto.MaterialNumber">
             <summary>
             物料编码
diff --git a/src/WMS.Web.Core/Dto/Erp/ErpInStockResultDto.cs b/src/WMS.Web.Core/Dto/Erp/ErpInStockResultDto.cs
index df9415b2..7e7cc4f8 100644
--- a/src/WMS.Web.Core/Dto/Erp/ErpInStockResultDto.cs
+++ b/src/WMS.Web.Core/Dto/Erp/ErpInStockResultDto.cs
@@ -33,11 +33,6 @@ namespace WMS.Web.Core.Dto.Erp
         /// </summary>
         public int SupplierId { get; set; }
 
-        /// <summary>
-        /// 物料ID
-        /// </summary>
-        public int MaterialId { get; set; }
-
         /// <summary>
         /// 物料编码
         /// </summary>
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index bbd4f310..c64ee64c 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -183,7 +183,7 @@ namespace WMS.Web.Domain.Services.Public
                 //3.获取金蝶采购订单：拼接参数和条件
                 var query = new ErpBillQueryDto(token_result.Data);
                 var param = new ErpBillQueryParamDto(FormIdParam.PUR_PurchaseOrder.ToString());
-                param.FieldKeys = "FBillNo,FSupplierId,FPurchaseOrgId,FMaterialId,FSOSTOCKID,FQty,FEntryNote,FCreateDate,FCHUCHANGPRICE,FSOSTOCKID.FNumber,FStockInQty,FPurchaseOrgId.FNumber,FPOOrderEntry_FEntryID";
+                param.FieldKeys = "FBillNo,FSupplierId,FPurchaseOrgId,FMaterialId.FNumber,FSOSTOCKID,FQty,FEntryNote,FCreateDate,FCHUCHANGPRICE,FSOSTOCKID.FNumber,FStockInQty,FPurchaseOrgId.FNumber,FPOOrderEntry_FEntryID";
                 param.Limit = 10000;
                 //查询条件：备注其中的条件值以金蝶的值为准！！！
                 //1.创建时间在两天前和当天时间之间
@@ -232,7 +232,8 @@ namespace WMS.Web.Domain.Services.Public
                     {
                         var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00");
                         var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                        param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
+                        //param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
+                        param.FilterString = param.FilterString + " and FApproveDate>='" + beginTime + "' and FApproveDate<='" + endTime + "'";
                     }
                 }
 
@@ -251,7 +252,7 @@ namespace WMS.Web.Domain.Services.Public
                     lis.BillNo = item[0];
                     lis.SupplierId = Convert.ToInt32(item[1]);
                     lis.OrgId = Convert.ToInt32(item[2]);
-                    lis.MaterialId = Convert.ToInt32(item[3]);
+                    lis.MaterialNumber =item[3];
                     lis.StockId = Convert.ToInt32(item[4]);
                     lis.Qty = Convert.ToDecimal(item[5]);
                     lis.Remark = item[6];
@@ -300,7 +301,7 @@ namespace WMS.Web.Domain.Services.Public
                 //3.获取金蝶其他入库订单：拼接参数和条件
                 var query = new ErpBillQueryDto(token_result.Data);
                 var param = new ErpBillQueryParamDto(FormIdParam.STK_MISCELLANEOUS.ToString());
-                param.FieldKeys = "FBillNo,FStockOrgId,FMATERIALID,FSTOCKID,FSTOCKID.FNumber,FQty,FCreateDate,FEntryNote,FStockOrgId.FNumber,FEntity_FEntryID";
+                param.FieldKeys = "FBillNo,FStockOrgId,FMATERIALID.FNumber,FSTOCKID,FSTOCKID.FNumber,FQty,FCreateDate,FEntryNote,FStockOrgId.FNumber,FEntity_FEntryID";
                 param.Limit = 10000;
                 //查询条件：备注其中的条件值以金蝶的值为准！！！
                 //1.创建时间在两天前和当天时间之间
@@ -341,7 +342,8 @@ namespace WMS.Web.Domain.Services.Public
                 }//注意：当有单据编号的查询的时候，时间条件去掉；不然就查不到数据了
                 else
                 {
-                    param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
+                    //param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
+                    param.FilterString = param.FilterString + " and FAPPROVEDATE>='" + beginTime + "' and FAPPROVEDATE<='" + endTime + "'";
                 }
 
                 query.Data = JsonConvert.SerializeObject(param);
@@ -358,7 +360,7 @@ namespace WMS.Web.Domain.Services.Public
                     var lis = new ErpInStockResultDto();
                     lis.BillNo = item[0];
                     lis.OrgId = Convert.ToInt32(item[1]);
-                    lis.MaterialId = Convert.ToInt32(item[2]);
+                    lis.MaterialNumber = item[2];
                     lis.StockId = Convert.ToInt32(item[3]);
                     lis.StockCode = item[4];
                     lis.Qty = Convert.ToDecimal(item[5]);
@@ -405,7 +407,7 @@ namespace WMS.Web.Domain.Services.Public
                 //3.获取金蝶直接调拨入库订单：拼接参数和条件
                 var query = new ErpBillQueryDto(token_result.Data);
                 var param = new ErpBillQueryParamDto(FormIdParam.STK_TransferDirect.ToString());
-                param.FieldKeys = "FBillNo,FStockOrgId,FMaterialId,FDestStockId,FDestStockId.FNumber,FQty,FCreateDate,FNoteEntry,FStockOrgId.FNumber,FBillEntry_FEntryID";
+                param.FieldKeys = "FBillNo,FStockOrgId,FMaterialId.FNumber,FDestStockId,FDestStockId.FNumber,FQty,FCreateDate,FNoteEntry,FStockOrgId.FNumber,FBillEntry_FEntryID";
                 param.Limit = 10000;
                 //查询条件：备注其中的条件值以金蝶的值为准！！！
                 //1.创建时间在两天前和当天时间之间
@@ -447,7 +449,8 @@ namespace WMS.Web.Domain.Services.Public
                 }//注意：当有单据编号的查询的时候，时间条件去掉；不然就查不到数据了
                 else
                 {
-                    param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
+                    //param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
+                    param.FilterString = param.FilterString + " and FApproveDate>='" + beginTime + "' and FApproveDate<='" + endTime + "'";
                 }
 
                 query.Data = JsonConvert.SerializeObject(param);
@@ -464,7 +467,7 @@ namespace WMS.Web.Domain.Services.Public
                     var lis = new ErpInStockResultDto();
                     lis.BillNo = item[0];
                     lis.OrgId = Convert.ToInt32(item[1]);
-                    lis.MaterialId = Convert.ToInt32(item[2]);
+                    lis.MaterialNumber = item[2];
                     lis.StockId = Convert.ToInt32(item[3]);
                     lis.StockCode = item[4];
                     lis.Qty = Convert.ToDecimal(item[5]);
@@ -511,7 +514,7 @@ namespace WMS.Web.Domain.Services.Public
                 //3.获取金蝶分步式入库订单：拼接参数和条件
                 var query = new ErpBillQueryDto(token_result.Data);
                 var param = new ErpBillQueryParamDto(FormIdParam.STK_TRANSFERIN.ToString());
-                param.FieldKeys = "FBillNo,FStockOrgID,FMaterialID,FDestStockID,FDestStockID.FNumber,FQty,FCreateDate,FEntryNote,FStockOrgID.FNumber,FSTKTRSINENTRY_FEntryID";
+                param.FieldKeys = "FBillNo,FStockOrgID,FMaterialID.FNumber,FDestStockID,FDestStockID.FNumber,FQty,FCreateDate,FEntryNote,FStockOrgID.FNumber,FSTKTRSINENTRY_FEntryID";
                 param.Limit = 10000;
                 //查询条件：备注其中的条件值以金蝶的值为准！！！
                 //1.创建时间在两天前和当天时间之间
@@ -552,7 +555,8 @@ namespace WMS.Web.Domain.Services.Public
                 }//注意：当有单据编号的查询的时候，时间条件去掉；不然就查不到数据了
                 else
                 {
-                    param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
+                    //param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
+                    param.FilterString = param.FilterString + " and FApproveDate>='" + beginTime + "' and FApproveDate<='" + endTime + "'";
                 }
 
                 query.Data = JsonConvert.SerializeObject(param);
@@ -569,7 +573,7 @@ namespace WMS.Web.Domain.Services.Public
                     var lis = new ErpInStockResultDto();
                     lis.BillNo = item[0];
                     lis.OrgId = Convert.ToInt32(item[1]);
-                    lis.MaterialId = Convert.ToInt32(item[2]);
+                    lis.MaterialNumber = item[2];
                     lis.StockId = Convert.ToInt32(item[3]);
                     lis.StockCode = item[4];
                     lis.Qty = Convert.ToDecimal(item[5]);
@@ -617,7 +621,7 @@ namespace WMS.Web.Domain.Services.Public
                 //3.获取金蝶分步式入库订单：拼接参数和条件
                 var query = new ErpBillQueryDto(token_result.Data);
                 var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString());
-                param.FieldKeys = "FBillNo,FOwnerIdHead,FMaterialID,FStockID,FStockID.FNumber,FQty,FCreateDate,FDescription,FOwnerIdHead.FNumber,FEntity_FEntryID";
+                param.FieldKeys = "FBillNo,FOwnerIdHead,FMaterialID.FNumber,FStockID,FStockID.FNumber,FQty,FCreateDate,FDescription,FOwnerIdHead.FNumber,FEntity_FEntryID";
                 param.Limit = 10000;
                 //查询条件：备注其中的条件值以金蝶的值为准！！！
                 //1.创建时间在两天前和当天时间之间
@@ -659,7 +663,8 @@ namespace WMS.Web.Domain.Services.Public
                 }//注意：当有单据编号的查询的时候，时间条件去掉；不然就查不到数据了
                 else
                 {
-                    param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
+                    //param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
+                    param.FilterString = param.FilterString + " and FAPPROVEDATE>='" + beginTime + "' and FAPPROVEDATE<='" + endTime + "'";
                 }
 
                 query.Data = JsonConvert.SerializeObject(param);
@@ -676,7 +681,7 @@ namespace WMS.Web.Domain.Services.Public
                     var lis = new ErpInStockResultDto();
                     lis.BillNo = item[0];
                     lis.OrgId = Convert.ToInt32(item[1]);
-                    lis.MaterialId = Convert.ToInt32(item[2]);
+                    lis.MaterialNumber = item[2];
                     lis.StockId = Convert.ToInt32(item[3]);
                     lis.StockCode = item[4];
                     lis.Qty = Convert.ToDecimal(item[5]);
@@ -723,7 +728,7 @@ namespace WMS.Web.Domain.Services.Public
                 //3.获取金蝶分步式入库订单：拼接参数和条件
                 var query = new ErpBillQueryDto(token_result.Data);
                 var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString());
-                param.FieldKeys = "FBillNo,FSubProOwnerIdH,FMaterialIDSETY,FStockIDSETY,FStockIDSETY.FNumber,FQtySETY,FCreateDate,FDescriptionSETY,FSubProOwnerIdH.FNumber,FSubEntity_FDetailID";
+                param.FieldKeys = "FBillNo,FSubProOwnerIdH,FMaterialIDSETY.FNumber,FStockIDSETY,FStockIDSETY.FNumber,FQtySETY,FCreateDate,FDescriptionSETY,FSubProOwnerIdH.FNumber,FSubEntity_FDetailID";
                 param.Limit = 10000;
                 //查询条件：备注其中的条件值以金蝶的值为准！！！
                 //1.创建时间在两天前和当天时间之间
@@ -765,7 +770,8 @@ namespace WMS.Web.Domain.Services.Public
                 }//注意：当有单据编号的查询的时候，时间条件去掉；不然就查不到数据了
                 else
                 {
-                    param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
+                    //param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
+                    param.FilterString = param.FilterString + " and FAPPROVEDATE>='" + beginTime + "' and FAPPROVEDATE<='" + endTime + "'";
                 }
 
                 query.Data = JsonConvert.SerializeObject(param);
@@ -782,7 +788,7 @@ namespace WMS.Web.Domain.Services.Public
                     var lis = new ErpInStockResultDto();
                     lis.BillNo = item[0];
                     lis.OrgId = Convert.ToInt32(item[1]);
-                    lis.MaterialId = Convert.ToInt32(item[2]);
+                    lis.MaterialNumber = item[2];
                     lis.StockId = Convert.ToInt32(item[3]);
                     lis.StockCode = item[4];
                     lis.Qty = Convert.ToDecimal(item[5]);