diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 8a271e6b..273ebd84 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -34,8 +34,9 @@ namespace WMS.Web.Api.Controllers [Route("hj")] public async Task 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); diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 53cb1610..d6f10178 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -555,6 +555,31 @@ 单据Id + + + 对应金蝶，物料信息 + + + + + 物料ID + + + + + 物料名称 + + + + + 物料编码 + + + + + 物料规格型号 + + 金蝶组织-基本信息 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 1100658b..249cb649 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1411,6 +1411,12 @@ + + + erp:单据查询-物料 + + + @@ -2042,6 +2048,12 @@ + + + erp:单据查询-物料 + + + erp:单据查询-组织数据 @@ -2514,6 +2526,11 @@ 盘亏单 + + + 物料 + + 入库状态 diff --git a/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs b/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs new file mode 100644 index 00000000..caad2179 --- /dev/null +++ b/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 +{ + /// + /// 对应金蝶，物料信息 + /// + public class ErpMaterialDto + { + /// + /// 物料ID + /// + public int MaterialId { get; set; } + + /// + /// 物料名称 + /// + public string MaterialName { get; set; } + /// + /// 物料编码 + /// + public string MaterialNumber { get; set; } + /// + /// 物料规格型号 + /// + public string Specifications { get; set; } + + public string Status { get; set; } + public string UseOrgId { get; set; } + } +} diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs index 571409b8..ad13396c 100644 --- a/src/WMS.Web.Domain/IService/Public/IErpService.cs +++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs @@ -18,6 +18,12 @@ namespace WMS.Web.Domain.IService.Public /// Task> BillQueryForPurchaseInStock(); + /// + /// erp:单据查询-物料 + /// + /// + Task> BillQueryForMaterial(); + /// /// /// diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 45c2b821..07a50ed0 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -175,6 +175,59 @@ namespace WMS.Web.Domain.Services.Public } } + /// + /// erp:单据查询-物料 + /// + /// + public async Task> BillQueryForMaterial() + { + //1.先登录金蝶-拿到token + var token_result = await this.Init(); + if (!token_result.IsSuccess) + return ResultList.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>>(result_json); + + var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + _logger.LogInformation($"结束时间：{beginTime}"); + //5.返回数据的组装 + var erp_list = new List(); + 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.ReSuccess(erp_list); + } + /// /// erp:单据查询-组织数据 /// diff --git a/src/WMS.Web.Domain/Values/Erp/FormIdParam.cs b/src/WMS.Web.Domain/Values/Erp/FormIdParam.cs index a6a33311..ca416baa 100644 --- a/src/WMS.Web.Domain/Values/Erp/FormIdParam.cs +++ b/src/WMS.Web.Domain/Values/Erp/FormIdParam.cs @@ -53,5 +53,9 @@ namespace WMS.Web.Domain.Values.Erp /// 盘亏单 /// STK_StockCountLoss, + /// + /// 物料 + /// + BD_MATERIAL, } }