Compare commits

..

2 Commits

Author SHA1 Message Date
dbb43efdb5 改了入库作任务单 2026-05-27 17:45:24 +08:00
b49dfa9980 测试 2026-05-27 14:31:52 +08:00
3 changed files with 19 additions and 11 deletions

View File

@@ -8,15 +8,15 @@
}
},
"$schema": "http://json.schemastore.org/launchsettings.json",
//"profiles": {
// "IIS Express": {
// "commandName": "IISExpress",
// "launchBrowser": true,
// "launchUrl": "swagger",
// "environmentVariables": {
// "ASPNETCORE_ENVIRONMENT": "Development"
// }
// },
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"WMS.Web.Api": {
"commandName": "Project",
"launchBrowser": false,

View File

@@ -217,8 +217,16 @@ namespace WMS.Web.Repositories
for (int i = 0; i < resList.Count(); i++)
{
var bList = instockTaskBoxList.Where(w => w.BoxId == bid).OrderBy(x => x.CreateTime).ToList();
resList[i].Receiver = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, bList[i].ReceiverId ?? 0);
resList[i].ReceiveTime = bList[i].CreateTime.HasValue ? bList[i].CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "";
if (bList.Count == 1)
{
resList[i].Receiver = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, bList[0].ReceiverId ?? 0);
resList[i].ReceiveTime = bList[0].CreateTime.HasValue ? bList[0].CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "";
}
else
{
resList[i].Receiver = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, bList[i].ReceiverId ?? 0);
resList[i].ReceiveTime = bList[i].CreateTime.HasValue ? bList[i].CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "";
}
}
//如果收货的条数大于入库的条数 代表有收货未入库的 需要添加
if (resList.Count() < instockTaskBoxList.Where(w => w.BoxId == bid).Count())