18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

采购订单模糊查询接口

Browse Source
This commit is contained in:
tongfei
2023-11-03 10:28:13 +08:00
parent eac6c6b269
commit 5dd3a8125b
9 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
View File

@@ -192,7 +192,7 @@
</member>
<member name="M:WMS.Web.Api.Controllers.OutStockController.Save(WMS.Web.Core.Dto.OutStock.SaveOutStockRequest)">
<summary>
保存
保存(出库)
</summary>
<param name="dto"></param>
<returns></returns>

12
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -640,6 +640,11 @@
仓库编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FStockInQty">
<summary>
已交数量
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpStockDto">
<summary>
仓库信息
@@ -867,7 +872,12 @@
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.Qty">
<summary>
数量
订单数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.DeliveredQty">
<summary>
已交数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.Remark">

13
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -481,22 +481,27 @@
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.FactoryPrice">
<summary>
出厂价
出厂价（对应金蝶数据）
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.AccruedQty">
<summary>
应入数量
应入数量（对应金蝶的订单数量-对应物料）
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.DeliveredQty">
<summary>
已交数量（对应金蝶的已交数量-对应物料），目前只有采购订单有
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.ReceiveQty">
<summary>
收货数量
收货数量（仓库现场收货动作的数量）
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.RealityQty">
<summary>
实际入库数量
实际入库数量（仓库人员现场入库的数量）上架动作
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.Remark">

5
src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs
View File

@@ -63,6 +63,11 @@ namespace WMS.Web.Core.Dto.Erp.Purchase
/// </summary>
public string StockFNumber { get; set; }
/// <summary>
/// 已交数量
/// </summary>
public decimal FStockInQty { get; set; }
public string FDocumentStatus { get; set; }
public string FBillTypeID { get; set; }
public string FMRPCloseStatus { get; set; }

8
src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs
View File

@@ -42,10 +42,16 @@ namespace WMS.Web.Core.Dto.InStockTask
public string Specifications { get; set; }
/// <summary>
/// 数量
/// 订单数量
/// </summary>
public decimal Qty { get; set; }
/// <summary>
/// 已交数量
/// </summary>
public decimal DeliveredQty { get; set; }
/// <summary>
/// 明细备注
/// </summary>

12
src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
View File

@@ -42,19 +42,23 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
public string StockCode { get; set; }
/// <summary>
/// 出厂价
/// 出厂价（对应金蝶数据）
/// </summary>
public decimal FactoryPrice { get; set; }
/// <summary>
/// 应入数量
/// 应入数量（对应金蝶的订单数量-对应物料）
/// </summary>
public decimal AccruedQty { get; set; }
/// <summary>
/// 收货数量
/// 已交数量（对应金蝶的已交数量-对应物料），目前只有采购订单有
/// </summary>
public decimal DeliveredQty{ get; set; }
/// <summary>
/// 收货数量（仓库现场收货动作的数量）
/// </summary>
public decimal ReceiveQty { get; set; }
/// <summary>
/// 实际入库数量
/// 实际入库数量（仓库人员现场入库的数量）上架动作
/// </summary>
public decimal RealityQty { get; set; }
/// <summary>

2
src/WMS.Web.Domain/Mappers/InStockMapper.cs
View File

@@ -32,7 +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.StockCode, ops => ops.MapFrom(x => x.StockFNumber))
.ForMember(x => x.DeliveredQty, ops => ops.MapFrom(x => x.FStockInQty))
.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))

11
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -113,7 +113,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,FCHUCHANGPRICE,FSOSTOCKID.FNumber,FDocumentStatus,FBillTypeID,FMRPCloseStatus,FBillTypeID.FName";
param.FieldKeys = "FBillNo,FSupplierId,FPurchaseOrgId,FModel,FMaterialName,FMaterialId,FSOSTOCKID,FQty,FEntryNote,FCreateDate,FCHUCHANGPRICE,FSOSTOCKID.FNumber,FStockInQty,FDocumentStatus,FBillTypeID,FMRPCloseStatus,FBillTypeID.FName";
param.Limit = 10;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -160,10 +160,11 @@ namespace WMS.Web.Domain.Services.Public
lis.FCreateDate =Convert.ToDateTime(item[9]);
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];
lis.FStockInQty = Convert.ToDecimal(item[12]);
lis.FDocumentStatus = item[13];
lis.FBillTypeID = item[14];
lis.FMRPCloseStatus = item[15];
lis.FBillTypeFName = item[16];
erp_list.Add(lis);
}
return ResultList<ErpPurchaseInStockResultDto>.ReSuccess(erp_list);

1
src/WMS.Web.Repositories/InStockTaskRepositories.cs
View File

@@ -167,6 +167,7 @@ namespace WMS.Web.Repositories
MaterialNumber = "",
Specifications = "",
Qty=s.detail.AccruedQty,
DeliveredQty=s.detail.DeliveredQty,
Remark = s.detail.Remark
}).ToListAsync();
return list;