bug修复
This commit is contained in:
@@ -532,11 +532,11 @@
|
||||
</summary>
|
||||
<param name="creatorId"></param>
|
||||
</member>
|
||||
<member name="M:WMS.Web.Domain.Entitys.InStock.Sync(System.Boolean,System.Int32,System.String)">
|
||||
<member name="M:WMS.Web.Domain.Entitys.InStock.Sync(WMS.Web.Domain.Values.SyncStatus,System.Int32,System.String)">
|
||||
<summary>
|
||||
同步金蝶
|
||||
</summary>
|
||||
<param name="isSuccess"></param>
|
||||
<param name="syncStatus"></param>
|
||||
<param name="operateId"></param>
|
||||
<param name="remark"></param>
|
||||
</member>
|
||||
|
||||
@@ -73,6 +73,6 @@ namespace WMS.Web.Core.Dto
|
||||
/// <summary>
|
||||
/// 同步成功或者失败
|
||||
/// </summary>
|
||||
public bool? SuccessSync { get; set; }
|
||||
public string SuccessSync { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace WMS.Web.Domain.Entitys
|
||||
/// <summary>
|
||||
/// 同步成功或者失败
|
||||
/// </summary>
|
||||
public int? SuccessSync { get; set; }
|
||||
public SyncStatus SuccessSync { get; set; } = SyncStatus.Fail;
|
||||
|
||||
/// <summary>
|
||||
/// 操作人
|
||||
@@ -77,12 +77,12 @@ namespace WMS.Web.Domain.Entitys
|
||||
/// <summary>
|
||||
/// 同步金蝶
|
||||
/// </summary>
|
||||
/// <param name="isSuccess"></param>
|
||||
/// <param name="syncStatus"></param>
|
||||
/// <param name="operateId"></param>
|
||||
/// <param name="remark"></param>
|
||||
public void Sync(bool isSuccess, int operateId, string remark)
|
||||
public void Sync(SyncStatus syncStatus, int operateId, string remark)
|
||||
{
|
||||
this.SuccessSync = isSuccess;
|
||||
this.SuccessSync = syncStatus;
|
||||
this.Remark = remark;
|
||||
this.OperateId = operateId;
|
||||
this.SyncTime = DateTime.Now;
|
||||
|
||||
@@ -14,6 +14,7 @@ using WMS.Web.Core.Internal.Results;
|
||||
using WMS.Web.Domain.Entitys;
|
||||
using WMS.Web.Domain.Infrastructure;
|
||||
using WMS.Web.Domain.IService.Public;
|
||||
using WMS.Web.Domain.Values;
|
||||
using WMS.Web.Domain.Values.Single;
|
||||
using WMS.Web.Repositories.Configuration;
|
||||
|
||||
@@ -130,7 +131,7 @@ namespace WMS.Web.Repositories
|
||||
Qty =s.detail.Qty,
|
||||
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
|
||||
CreateTime =s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
SuccessSync=s.order.SuccessSync
|
||||
SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : "失败",
|
||||
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||
|
||||
return (list, total);
|
||||
|
||||
Reference in New Issue
Block a user