From 97aa1acbbb33c0e493d6d921d8507768af107c07 Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Thu, 2 Nov 2023 10:15:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96=E9=87=91?= =?UTF-8?q?=E8=9D=B6=E5=85=A5=E5=BA=93=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 12 +++++++++++- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 5 +++++ .../Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs | 10 ++++++++++ src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs | 4 ++++ src/WMS.Web.Domain/Mappers/InStockMapper.cs | 1 + src/WMS.Web.Domain/Services/Public/ErpService.cs | 13 +++++++------ 6 files changed, 38 insertions(+), 7 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 1f888466..25d9e6f7 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -285,7 +285,7 @@ 总数量 - + 明细信息 @@ -595,6 +595,16 @@ 创建时间 + + + 出厂价格 + + + + + 仓库编码 + + Erp同步数据时单据头 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index e2245b5a..0f00a434 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -474,6 +474,11 @@ 收货仓库 + + + 收货仓库编码（对应金蝶和单点） + + 出厂价 diff --git a/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs b/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs index 867a1a78..07c21f68 100644 --- a/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs @@ -53,6 +53,16 @@ namespace WMS.Web.Core.Dto.Erp.Purchase /// public DateTime FCreateDate { get; set; } + /// + /// 出厂价格 + /// + public decimal FCHUCHANGPRICE { get; set; } + + /// + /// 仓库编码 + /// + public string StockFNumber { get; set; } + public string FDocumentStatus { get; set; } public string FBillTypeID { get; set; } public string FMRPCloseStatus { get; set; } diff --git a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs index c9a76f36..eb4289a6 100644 --- a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs +++ b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs @@ -38,6 +38,10 @@ namespace WMS.Web.Domain.Entitys /// public int StockId { get; set; } /// + /// 收货仓库编码（对应金蝶和单点） + /// + public string StockCode { get; set; } + /// /// 出厂价 /// public decimal FactoryPrice { get; set; } diff --git a/src/WMS.Web.Domain/Mappers/InStockMapper.cs b/src/WMS.Web.Domain/Mappers/InStockMapper.cs index 8a455285..38c90439 100644 --- a/src/WMS.Web.Domain/Mappers/InStockMapper.cs +++ b/src/WMS.Web.Domain/Mappers/InStockMapper.cs @@ -32,6 +32,7 @@ namespace WMS.Web.Domain.Mappers .ForMember(x => x.MaterialId, ops => ops.MapFrom(x => x.FMaterialId)) .ForMember(x => x.StockId, ops => ops.MapFrom(x => x.FSOSTOCKID)) + .ForMember(x => x.FactoryPrice, ops => ops.MapFrom(x => x.FCHUCHANGPRICE)) .ForMember(x => x.AccruedQty, ops => ops.MapFrom(x => x.FQty)) .ForMember(x => x.Remark, ops => ops.MapFrom(x => x.FEntryNote)) .ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.FCreateDate)) diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 7334b330..bce46705 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -93,7 +93,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,FModel,FMaterialName,FMaterialId,FSOSTOCKID,FQty,FEntryNote,FCreateDate,FDocumentStatus,FBillTypeID,FMRPCloseStatus,FBillTypeID.FName"; + param.FieldKeys = "FBillNo,FSupplierId,FPurchaseOrgId,FModel,FMaterialName,FMaterialId,FSOSTOCKID,FQty,FEntryNote,FCreateDate,FCHUCHANGPRICE,FSOSTOCKID.FNumber,FDocumentStatus,FBillTypeID,FMRPCloseStatus,FBillTypeID.FName"; param.Limit = 10; //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 @@ -124,11 +124,12 @@ namespace WMS.Web.Domain.Services.Public lis.FQty = Convert.ToDecimal(item[7]); lis.FEntryNote = item[8]; lis.FCreateDate =Convert.ToDateTime(item[9]); - lis.FDocumentStatus = item[10]; - lis.FBillTypeID = item[11]; - lis.FMRPCloseStatus = item[12]; - lis.FBillTypeFName = item[13]; - //list.FCHUCHANGPRICE=FCHUCHANGPRICE[?];//这个是出厂价，但是金蝶测试没有这个字段，正式有的 + lis.FCHUCHANGPRICE = Convert.ToDecimal(item[10]); + lis.StockFNumber = item[11]; + lis.FDocumentStatus = item[12]; + lis.FBillTypeID = item[13]; + lis.FMRPCloseStatus = item[14]; + lis.FBillTypeFName = item[15]; erp_list.Add(lis); } return ResultList.ReSuccess(erp_list);