修复bug

This commit is contained in:
18942506660
2023-12-18 16:53:06 +08:00
parent f171eabaa5
commit 7cf3b3a276
5 changed files with 16 additions and 5 deletions

View File

@@ -90,6 +90,11 @@ namespace WMS.Web.Core.Dto.TakeStock
[Column("盘点结果")] [Column("盘点结果")]
public string ResultType { get; set; } public string ResultType { get; set; }
/// <summary> /// <summary>
/// 失败原因
/// </summary>
[Column("失败原因")]
public string FailRemark { get; set; }
/// <summary>
/// 备注 /// 备注
/// </summary> /// </summary>
[Column("备注")] [Column("备注")]

View File

@@ -49,8 +49,8 @@ namespace WMS.Web.Domain.Entitys
/// <summary> /// <summary>
/// 备注 /// 备注
/// </summary> /// </summary>
[Column("Remark")] [Column("FailRemark")]
public string Remark { get; set; } public string FailRemark { get; set; }
/// <summary> /// <summary>
/// 同步到金蝶后金蝶的单据Id /// 同步到金蝶后金蝶的单据Id
/// </summary> /// </summary>
@@ -78,7 +78,7 @@ namespace WMS.Web.Domain.Entitys
public void Sync(bool isSuccess, string remark, SyncStatus syncStatus,string erpBillNo) public void Sync(bool isSuccess, string remark, SyncStatus syncStatus,string erpBillNo)
{ {
this.SuccessSync = syncStatus; this.SuccessSync = syncStatus;
this.Remark = ""; this.FailRemark = remark;
this.ErpSyncBillNo = erpBillNo; this.ErpSyncBillNo = erpBillNo;
} }
/// <summary> /// <summary>

View File

@@ -75,5 +75,10 @@ namespace WMS.Web.Domain.Entitys
/// </summary> /// </summary>
[Column("SerialNumbers")] [Column("SerialNumbers")]
public List<string> SerialNumbers { get; set; } = new List<string>(); public List<string> SerialNumbers { get; set; } = new List<string>();
/// <summary>
/// 备注
/// </summary>
[Column("Remark")]
public string Remark { get; set; }
} }
} }

View File

@@ -192,7 +192,7 @@ namespace WMS.Web.Domain.Services
AfterQty = d.AfterQty, AfterQty = d.AfterQty,
FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0, FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0,
LossQty = entity.ResultType == TakeStockType.Loss ? 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() ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto()

View File

@@ -210,7 +210,8 @@ namespace WMS.Web.Repositories
AfterQty = s.detail.AfterQty, AfterQty = s.detail.AfterQty,
FinalQty = s.detail.FinalQty, FinalQty = s.detail.FinalQty,
ResultType = s.order.ResultType.GetRemark(), 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), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
Date = s.order.Date.DateToStringSeconds(), Date = s.order.Date.DateToStringSeconds(),
SuccessSync = s.order.SuccessSync== SyncStatus.Success ? "成功":"失败", SuccessSync = s.order.SuccessSync== SyncStatus.Success ? "成功":"失败",