Compare commits
2 Commits
664bd1c337
...
dbb43efdb5
| Author | SHA1 | Date | |
|---|---|---|---|
| dbb43efdb5 | |||
| b49dfa9980 |
Binary file not shown.
@@ -8,15 +8,15 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"$schema": "http://json.schemastore.org/launchsettings.json",
|
"$schema": "http://json.schemastore.org/launchsettings.json",
|
||||||
//"profiles": {
|
"profiles": {
|
||||||
// "IIS Express": {
|
"IIS Express": {
|
||||||
// "commandName": "IISExpress",
|
"commandName": "IISExpress",
|
||||||
// "launchBrowser": true,
|
"launchBrowser": true,
|
||||||
// "launchUrl": "swagger",
|
"launchUrl": "swagger",
|
||||||
// "environmentVariables": {
|
"environmentVariables": {
|
||||||
// "ASPNETCORE_ENVIRONMENT": "Development"
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
// }
|
}
|
||||||
// },
|
},
|
||||||
"WMS.Web.Api": {
|
"WMS.Web.Api": {
|
||||||
"commandName": "Project",
|
"commandName": "Project",
|
||||||
"launchBrowser": false,
|
"launchBrowser": false,
|
||||||
|
|||||||
@@ -217,8 +217,16 @@ namespace WMS.Web.Repositories
|
|||||||
for (int i = 0; i < resList.Count(); i++)
|
for (int i = 0; i < resList.Count(); i++)
|
||||||
{
|
{
|
||||||
var bList = instockTaskBoxList.Where(w => w.BoxId == bid).OrderBy(x => x.CreateTime).ToList();
|
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);
|
if (bList.Count == 1)
|
||||||
resList[i].ReceiveTime = bList[i].CreateTime.HasValue ? bList[i].CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "";
|
{
|
||||||
|
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())
|
if (resList.Count() < instockTaskBoxList.Where(w => w.BoxId == bid).Count())
|
||||||
|
|||||||
Reference in New Issue
Block a user