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

修复bug

Browse Source
This commit is contained in:
18942506660
2023-12-09 13:42:48 +08:00
parent c6512b9eb2
commit 764155a45b
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -1031,6 +1031,11 @@
明细Id 明细Id
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpSalOutStockDetailsSaveDto.DeliveryNoticeDetailId">
<summary>
发货通知单明细Id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpSalOutStockDetailsSaveDto.Qty"> <member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpSalOutStockDetailsSaveDto.Qty">
<summary> <summary>
数量 数量

8
src/WMS.Web.Domain/Services/OutStockService.cs
View File

@@ -195,6 +195,9 @@ namespace WMS.Web.Domain.Services
if (!isSuccess) if (!isSuccess)
return Result.ReFailure(ResultCodes.DateWriteError); return Result.ReFailure(ResultCodes.DateWriteError);
if (entity.Type == OutStockType.Sal)
await SalOutStock(entity, loginInfo);
return Result.ReSuccess(); return Result.ReSuccess();
} }
/// <summary> /// <summary>
@@ -217,6 +220,7 @@ namespace WMS.Web.Domain.Services
/// <returns></returns> /// <returns></returns>
private async Task<Result> SalOutStock(OutStock entity, LoginInDto loginInfo) private async Task<Result> SalOutStock(OutStock entity, LoginInDto loginInfo)
{ {
if (entity.Details.Count() != 1) return Result.ReSuccess();
if (entity.Type != OutStockType.Sal) return Result.ReSuccess(); if (entity.Type != OutStockType.Sal) return Result.ReSuccess();
if (entity.SuccessSync != SyncStatus.Fail) return Result.ReSuccess(); if (entity.SuccessSync != SyncStatus.Fail) return Result.ReSuccess();
List<string> failList = entity.Details.SelectMany(s => s.ErpDetails) List<string> failList = entity.Details.SelectMany(s => s.ErpDetails)
@@ -238,7 +242,7 @@ namespace WMS.Web.Domain.Services
//下推金蝶 //下推金蝶
var res = await this.Push(erpDto, entity); var res = await this.Push(erpDto, entity);
if (res.result.IsSuccess) if (res.result.IsSuccess)
entity.SyncSuccess(s, loginInfo?.UserInfo?.StaffId ?? 0,res.erpId); entity.SyncSuccess(s, loginInfo?.UserInfo?.StaffId ?? 0, res.erpId);
else else
entity.SyncFail(res.result.Message, loginInfo?.UserInfo?.StaffId ?? 0, res.syncStatus); entity.SyncFail(res.result.Message, loginInfo?.UserInfo?.StaffId ?? 0, res.syncStatus);
} }
@@ -263,7 +267,7 @@ namespace WMS.Web.Domain.Services
return (Result.ReFailure(res.Message, res.Status), SyncStatus.Fail, ""); return (Result.ReFailure(res.Message, res.Status), SyncStatus.Fail, "");
} }
string id = res.Data; string id = res.Data;
var resSalOutStock= await _erpService.BillQueryForSalOutStock(id); var resSalOutStock = await _erpService.BillQueryForSalOutStock(id);
var salOutStock = resSalOutStock.Data; var salOutStock = resSalOutStock.Data;
salOutStock.Details[0].Qty = entity.Details[0].Qty; salOutStock.Details[0].Qty = entity.Details[0].Qty;
//{"Id":12709885,"Number":"XSCKD10629570","DIndex":0} //{"Id":12709885,"Number":"XSCKD10629570","DIndex":0}

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

@@ -204,7 +204,7 @@ namespace WMS.Web.Repositories
if (entity == null || entity.serial == null) return null; if (entity == null || entity.serial == null) return null;
response.BoxId = entity.serial.BoxId; response.BoxId = entity.serial.BoxId;
response.BoxBillNo = entity.box.BoxBillNo; response.BoxBillNo = entity.box.BoxBillNo;
response.SubStockId = entity.boxInventory?.SubStockId ?? 0; response.SubStockId = entity?.boxInventory?.SubStockId ?? 0;
response.SerialNumber = entity.serial.SerialNumber; response.SerialNumber = entity.serial.SerialNumber;
response.MaterialId = entity.serial.MaterialId; response.MaterialId = entity.serial.MaterialId;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialId); response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialId);