diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index eeeb8478..59646772 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -192,7 +192,7 @@
- 保存
+ 保存(出库)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 632bfa07..e5871ea0 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -640,6 +640,11 @@
仓库编码
+
+
+ 已交数量
+
+
仓库信息
@@ -867,7 +872,12 @@
- 数量
+ 订单数量
+
+
+
+
+ 已交数量
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 81c8250c..d8bbc685 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -481,22 +481,27 @@
- 出厂价
+ 出厂价（对应金蝶数据）
- 应入数量
+ 应入数量（对应金蝶的订单数量-对应物料）
+
+
+
+
+ 已交数量（对应金蝶的已交数量-对应物料），目前只有采购订单有
- 收货数量
+ 收货数量（仓库现场收货动作的数量）
- 实际入库数量
+ 实际入库数量（仓库人员现场入库的数量）上架动作
diff --git a/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs b/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs
index 07c21f68..db31dd7b 100644
--- a/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs
+++ b/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs
@@ -63,6 +63,11 @@ namespace WMS.Web.Core.Dto.Erp.Purchase
///
public string StockFNumber { get; set; }
+ ///
+ /// 已交数量
+ ///
+ public decimal FStockInQty { get; set; }
+
public string FDocumentStatus { get; set; }
public string FBillTypeID { get; set; }
public string FMRPCloseStatus { get; set; }
diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs
index 9294a440..94afeaca 100644
--- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs
+++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs
@@ -42,10 +42,16 @@ namespace WMS.Web.Core.Dto.InStockTask
public string Specifications { get; set; }
///
- /// 数量
+ /// 订单数量
///
public decimal Qty { get; set; }
+
+ ///
+ /// 已交数量
+ ///
+ public decimal DeliveredQty { get; set; }
+
///
/// 明细备注
///
diff --git a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
index eb4289a6..de3f1f92 100644
--- a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
@@ -42,19 +42,23 @@ namespace WMS.Web.Domain.Entitys
///
public string StockCode { get; set; }
///
- /// 出厂价
+ /// 出厂价（对应金蝶数据）
///
public decimal FactoryPrice { get; set; }
///
- /// 应入数量
+ /// 应入数量（对应金蝶的订单数量-对应物料）
///
public decimal AccruedQty { get; set; }
///
- /// 收货数量
+ /// 已交数量（对应金蝶的已交数量-对应物料），目前只有采购订单有
+ ///
+ public decimal DeliveredQty{ get; set; }
+ ///
+ /// 收货数量（仓库现场收货动作的数量）
///
public decimal ReceiveQty { get; set; }
///
- /// 实际入库数量
+ /// 实际入库数量（仓库人员现场入库的数量）上架动作
///
public decimal RealityQty { get; set; }
///
diff --git a/src/WMS.Web.Domain/Mappers/InStockMapper.cs b/src/WMS.Web.Domain/Mappers/InStockMapper.cs
index 34dd693e..97c7e6d6 100644
--- a/src/WMS.Web.Domain/Mappers/InStockMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/InStockMapper.cs
@@ -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))
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 9e4661f1..45c2b821 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -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.ReSuccess(erp_list);
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index a3f8cb0a..4c1b0ca4 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -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;