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
2024-03-26 17:36:26 +08:00
parent 47bf5c4365
commit 6c5c5faa5a
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WMS.Web.Api/Controllers/SubscribeNotificationController.cs
View File

@@ -143,7 +143,7 @@ namespace WMS.Web.Api.Controllers
return Result<SubscribeNotificationInfoResponse>.ReFailure(ResultCodes.Token_Invalid_Error); return Result<SubscribeNotificationInfoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var entity = await _repositories.Get(id); var entity = await _repositories.Get(id);
if (entity == null) Result<SubscribeNotificationInfoResponse>.ReFailure(ResultCodes.SubscribeNotificationNoData); if (entity == null || entity.IsDelete == true) Result<SubscribeNotificationInfoResponse>.ReFailure(ResultCodes.SubscribeNotificationNoData);
return Result<SubscribeNotificationInfoResponse>.ReSuccess(_mapper.Map<SubscribeNotificationInfoResponse>(entity)); return Result<SubscribeNotificationInfoResponse>.ReSuccess(_mapper.Map<SubscribeNotificationInfoResponse>(entity));
} }
} }

15
src/WMS.Web.Domain/Services/OutStockTaskService.cs
View File

@@ -479,6 +479,21 @@ namespace WMS.Web.Domain.Services
? _erpBasicDataExtendService.GetCustomerName(customers, entity.ReceiptCustomerId) ? _erpBasicDataExtendService.GetCustomerName(customers, entity.ReceiptCustomerId)
: _erpBasicDataExtendService.GetOrgName(orgs, entity.DeliveryOrgId), : _erpBasicDataExtendService.GetOrgName(orgs, entity.DeliveryOrgId),
}; };
var details = outStockList.SelectMany(s => s.Details).ToList();
var boxDetails = outStockList.SelectMany(s => s.Details).SelectMany(s => s.BoxsDetails).ToList();
foreach (var b in boxDetails)
{
var detail = details.FirstOrDefault(f => f.Id == b.DetailId);
var outStock = outStockList.FirstOrDefault(f => f.Id == detail.Fid);
OutStockTaskInfoDetailsResponse infoDetail = new OutStockTaskInfoDetailsResponse()
{
BoxBillNo = b.BoxId.ToString(),
Qty = b.Qty,
SerialNumbers = string.Join(",", b.SerialNumbers),
Method = outStock.Method.GetRemark()
};
}
return Result<OutStockTaskInfoResponse>.ReSuccess(response); return Result<OutStockTaskInfoResponse>.ReSuccess(response);
} }