diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 8f565c32..8c134780 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -447,6 +447,11 @@
入库时间(上架时间)
+
+
+ 创建时间(erp那边的创建时间)
+
+
箱信息集合
@@ -578,11 +583,6 @@
明细备注
-
-
- 创建时间(erp那边的创建时间)
-
-
wms即时库存明细表
diff --git a/src/WMS.Web.Domain/Entitys/InstockTask.cs b/src/WMS.Web.Domain/Entitys/InstockTask.cs
index 8a5b69df..c4c7bc1b 100644
--- a/src/WMS.Web.Domain/Entitys/InstockTask.cs
+++ b/src/WMS.Web.Domain/Entitys/InstockTask.cs
@@ -51,6 +51,11 @@ namespace WMS.Web.Domain.Entitys
///
public DateTime? ShelfTime { get; set; }
+ ///
+ /// 创建时间(erp那边的创建时间)
+ ///
+ public DateTime CreateTime { get; set; }
+
///
/// 箱信息集合
///
diff --git a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
index abde6abc..c6f0ffda 100644
--- a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
@@ -61,9 +61,6 @@ namespace WMS.Web.Domain.Entitys
/// 明细备注
///
public string Remark { get; set; }
- ///
- /// 创建时间(erp那边的创建时间)
- ///
- public DateTime CreateTime { get; set; }
+
}
}
diff --git a/src/WMS.Web.Domain/Mappers/InStockMapper.cs b/src/WMS.Web.Domain/Mappers/InStockMapper.cs
index 2e7b80b2..915d594c 100644
--- a/src/WMS.Web.Domain/Mappers/InStockMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/InStockMapper.cs
@@ -41,7 +41,8 @@ namespace WMS.Web.Domain.Mappers
CreateMap().ReverseMap();
CreateMap()
- .ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.FBillNo));
+ .ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.FBillNo))
+ .ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.FCreateDate));
CreateMap()
.ForMember(x => x.Details, ops => ops.Ignore());
@@ -57,8 +58,7 @@ namespace WMS.Web.Domain.Mappers
.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))
- .ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.FCreateDate))
+ .ForMember(x => x.Remark, ops => ops.MapFrom(x => x.FEntryNote))
.ReverseMap();
}
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index 5aa9494d..52b3292b 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -143,7 +143,7 @@ namespace WMS.Web.Repositories
ReceiveTime = s.order.ReceiveTime.HasValue ? s.order.ReceiveTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
Shelfer = "",
ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
- CreateTime = s.detail.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
response.Data = list;