18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
tongfei
2023-12-04 17:10:08 +08:00
parent faadd8aabf
commit 530e6d49f9
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs
View File

@@ -69,7 +69,7 @@ namespace WMS.Web.Core.Dto
/// <summary> /// <summary>
/// 创建时间（入库时间） /// 创建时间（入库时间）
/// </summary> /// </summary>
public DateTime CreateTime { get; set; } public string CreateTime { get; set; }
/// <summary> /// <summary>
/// 同步成功或者失败 /// 同步成功或者失败
/// </summary> /// </summary>

1
src/WMS.Web.Domain/Services/InStockService.cs
View File

@@ -252,6 +252,7 @@ namespace WMS.Web.Domain.Services
task.Details.ForEach(x => task.Details.ForEach(x =>
{ {
x.DeliveredQty = x.ReceiveQty; x.DeliveredQty = x.ReceiveQty;
x.RealityQty = x.ReceiveQty;
}); });
task.Shelf(loginInfo.UserInfo.StaffId); task.Shelf(loginInfo.UserInfo.StaffId);
task = await _inStockTaskRepositories.Update(task, isTransaction); task = await _inStockTaskRepositories.Update(task, isTransaction);

4
src/WMS.Web.Domain/Services/InStockTaskService.cs
View File

@@ -296,10 +296,12 @@ namespace WMS.Web.Domain.Services
if (erp_data != null) if (erp_data != null)
{ {
//2.1.2修改数量 //2.1.2修改数量
if (erp_data.Qty > item.AccruedQty)
data.Status = InstockStatus.Part;
item.Remark = erp_data.Remark; item.Remark = erp_data.Remark;
item.AccruedQty = erp_data.Qty; item.AccruedQty = erp_data.Qty;
item.FactoryPrice = erp_data.FactoryPrice; 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++; totalUpdateCount++;
erp_remove_billNo.Add(data.SourceBillNo); erp_remove_billNo.Add(data.SourceBillNo);

2
src/WMS.Web.Repositories/InStockRepositories.cs
View File

@@ -128,7 +128,7 @@ namespace WMS.Web.Repositories
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode+s.detail.OrgCode), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode+s.detail.OrgCode),
Qty =s.detail.Qty, Qty =s.detail.Qty,
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), 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 SuccessSync=s.order.SuccessSync
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();