diff --git a/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs b/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs index 66d86376..ba4c1a66 100644 --- a/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs @@ -69,7 +69,7 @@ namespace WMS.Web.Core.Dto /// /// 创建时间(入库时间) /// - public DateTime CreateTime { get; set; } + public string CreateTime { get; set; } /// /// 同步成功或者失败 /// diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index cc278fbe..83b50431 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -252,6 +252,7 @@ namespace WMS.Web.Domain.Services task.Details.ForEach(x => { x.DeliveredQty = x.ReceiveQty; + x.RealityQty = x.ReceiveQty; }); task.Shelf(loginInfo.UserInfo.StaffId); task = await _inStockTaskRepositories.Update(task, isTransaction); diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index 265f5ec9..53a88374 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -296,10 +296,12 @@ namespace WMS.Web.Domain.Services if (erp_data != null) { //2.1.2修改数量 + if (erp_data.Qty > item.AccruedQty) + data.Status = InstockStatus.Part; item.Remark = erp_data.Remark; item.AccruedQty = erp_data.Qty; item.FactoryPrice = erp_data.FactoryPrice; - item.DeliveredQty = erp_data.DeliveredQty> item.DeliveredQty? erp_data.DeliveredQty: item.DeliveredQty; + item.DeliveredQty = erp_data.DeliveredQty> item.DeliveredQty? erp_data.DeliveredQty: item.DeliveredQty; //打印日志:需要的修改条数 totalUpdateCount++; erp_remove_billNo.Add(data.SourceBillNo); diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index 8dd07d20..69217fd0 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -128,7 +128,7 @@ namespace WMS.Web.Repositories Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode+s.detail.OrgCode), Qty =s.detail.Qty, Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), - CreateTime =s.order.CreateTime, + CreateTime =s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), SuccessSync=s.order.SuccessSync }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();