调整获取金蝶数据的方法

src/WMS.Web.Api/Controllers/TestController.cs

@@ -34,8 +34,9 @@ namespace WMS.Web.Api.Controllers
         [Route("hj")]
         public async Task<string> TestHJ()
         {
-            var result= await this._erpService.BillQueryForPurchaseInStock();
+            //var result= await this._erpService.BillQueryForPurchaseInStock();
             //var result = await this._erpService.BillQueryForOrg();
+            var result = await this._erpService.BillQueryForMaterial();
             if (!result.IsSuccess)
                 return "";
             return JsonConvert.SerializeObject(result.Data);

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -555,6 +555,31 @@
             单据Id
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.Erp.ErpMaterialDto">
+            <summary>
+            对应金蝶，物料信息
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpMaterialDto.MaterialId">
+            <summary>
+            物料ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpMaterialDto.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpMaterialDto.MaterialNumber">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpMaterialDto.Specifications">
+            <summary>
+            物料规格型号
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.Org.ErpOrgDto">
             <summary>
             金蝶组织-基本信息

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -1411,6 +1411,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForMaterial">
+            <summary>
+            erp:单据查询-物料
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForOrg">
             <summary>
             
@@ -2042,6 +2048,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForMaterial">
+            <summary>
+            erp:单据查询-物料
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForOrg">
             <summary>
             erp:单据查询-组织数据
@@ -2514,6 +2526,11 @@
             盘亏单
             </summary>
         </member>
+        <member name="F:WMS.Web.Domain.Values.Erp.FormIdParam.BD_MATERIAL">
+            <summary>
+            物料
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Values.InstockStatus">
             <summary>
             入库状态

src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.Erp
+{
+    /// <summary>
+    /// 对应金蝶，物料信息
+    /// </summary>
+    public class ErpMaterialDto
+    {
+        /// <summary>
+        /// 物料ID
+        /// </summary>
+        public int MaterialId { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string MaterialName { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string MaterialNumber { get; set; }
+        /// <summary>
+        /// 物料规格型号
+        /// </summary>
+        public string Specifications { get; set; }
+
+        public string Status { get; set; }
+        public string UseOrgId { get; set; }
+    }
+}

src/WMS.Web.Domain/IService/Public/IErpService.cs

@@ -18,6 +18,12 @@ namespace WMS.Web.Domain.IService.Public
         /// <returns></returns>
         Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock();
 
+        /// <summary>
+        /// erp:单据查询-物料
+        /// </summary>
+        /// <returns></returns>
+        Task<ResultList<ErpMaterialDto>> BillQueryForMaterial();
+
         /// <summary>
         /// 
         /// </summary>

src/WMS.Web.Domain/Services/Public/ErpService.cs

@@ -175,6 +175,59 @@ namespace WMS.Web.Domain.Services.Public
             }
         }
 
+        /// <summary>
+        /// erp:单据查询-物料
+        /// </summary>
+        /// <returns></returns>
+        public async Task<ResultList<ErpMaterialDto>> BillQueryForMaterial() 
+        {
+            //1.先登录金蝶-拿到token
+            var token_result = await this.Init();
+            if (!token_result.IsSuccess)
+                return ResultList<ErpMaterialDto>.ReFailure(token_result);
+
+            //3.获取金蝶物料：拼接参数和条件
+            var query = new ErpBillQueryDto(token_result.Data);
+            var param = new ErpBillQueryParamDto(FormIdParam.BD_MATERIAL.ToString());
+            param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FForbidStatus,FUseOrgId";
+            //Console.WriteLine("请输入请求的条数：");
+            //var numb= Console.ReadLine();
+            //Convert.ToInt32(numb);
+            param.Limit = 100;
+            //查询条件：备注其中的条件值以金蝶的值为准！！！
+            //1.审核状态：已审核
+            //2.禁用状态：A否，B是 and FForbidStatus=0
+            //3.使用组织：只查询“深圳市元创时代科技有限公司”这个组织；组织ID=100008--固定值查询（测试端和正式是一样的）
+            param.FilterString = "FNumber='G98-22-010127'";
+            //param.FilterString = "FDocumentStatus='C' and FForbidStatus='A' and FUseOrgId=100008";
+
+            query.Data = JsonConvert.SerializeObject(param);
+            var json = JsonConvert.SerializeObject(query);
+
+            var beginTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            _logger.LogInformation($"开始时间：{beginTime}");
+             //4.请求查询接口
+             var result_json = await _client.ExecuteBillQueryAsync(json);
+            var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
+
+            var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            _logger.LogInformation($"结束时间：{beginTime}");
+            //5.返回数据的组装
+            var erp_list = new List<ErpMaterialDto>();
+            foreach (var item in result)
+            {
+                var lis = new ErpMaterialDto();
+                lis.MaterialId = Convert.ToInt32(item[0]);
+                lis.MaterialName = item[1];
+                lis.MaterialNumber =item[2];
+                lis.Specifications = item[3];
+                lis.Status = item[4];
+                lis.UseOrgId = item[5];
+                erp_list.Add(lis);
+            }
+            return ResultList<ErpMaterialDto>.ReSuccess(erp_list);
+        }
+
         /// <summary>
         /// erp:单据查询-组织数据
         /// </summary>

src/WMS.Web.Domain/Values/Erp/FormIdParam.cs

@@ -53,5 +53,9 @@ namespace WMS.Web.Domain.Values.Erp
         /// 盘亏单
         /// </summary>
         STK_StockCountLoss,
+        /// <summary>
+        /// 物料
+        /// </summary>
+        BD_MATERIAL,
     }
 }