diff --git a/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs index 1f90cf59..5fcf0f0e 100644 --- a/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs +++ b/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs @@ -90,6 +90,11 @@ namespace WMS.Web.Core.Dto.TakeStock [Column("盘点结果")] public string ResultType { get; set; } /// + /// 失败原因 + /// + [Column("失败原因")] + public string FailRemark { get; set; } + /// /// 备注 /// [Column("备注")] diff --git a/src/WMS.Web.Domain/Entitys/TakeStock.cs b/src/WMS.Web.Domain/Entitys/TakeStock.cs index fc645bb9..fde997b8 100644 --- a/src/WMS.Web.Domain/Entitys/TakeStock.cs +++ b/src/WMS.Web.Domain/Entitys/TakeStock.cs @@ -49,8 +49,8 @@ namespace WMS.Web.Domain.Entitys /// /// 备注 /// - [Column("Remark")] - public string Remark { get; set; } + [Column("FailRemark")] + public string FailRemark { get; set; } /// /// 同步到金蝶后金蝶的单据Id /// @@ -78,7 +78,7 @@ namespace WMS.Web.Domain.Entitys public void Sync(bool isSuccess, string remark, SyncStatus syncStatus,string erpBillNo) { this.SuccessSync = syncStatus; - this.Remark = ""; + this.FailRemark = remark; this.ErpSyncBillNo = erpBillNo; } /// diff --git a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs index 92228dba..5fca58cd 100644 --- a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs @@ -75,5 +75,10 @@ namespace WMS.Web.Domain.Entitys /// [Column("SerialNumbers")] public List SerialNumbers { get; set; } = new List(); + /// + /// 备注 + /// + [Column("Remark")] + public string Remark { get; set; } } } diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 577c298d..32f38d77 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -192,7 +192,7 @@ namespace WMS.Web.Domain.Services AfterQty = d.AfterQty, FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0, LossQty = entity.ResultType == TakeStockType.Loss ? d.FinalQty : 0, - Fnote = entity.ResultType == TakeStockType.Loss ? "wms盘亏单同步" : "wms盘盈单同步" + Fnote = d.Remark }); } ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto() diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs index 45cecc8c..bc300c15 100644 --- a/src/WMS.Web.Repositories/TakeStockRepositories.cs +++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs @@ -210,7 +210,8 @@ namespace WMS.Web.Repositories AfterQty = s.detail.AfterQty, FinalQty = s.detail.FinalQty, ResultType = s.order.ResultType.GetRemark(), - Remark = s.order.Remark, + Remark = s.detail.Remark, + FailRemark=s.order.FailRemark, Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), Date = s.order.Date.DateToStringSeconds(), SuccessSync = s.order.SuccessSync== SyncStatus.Success ? "成功":"失败",