wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
alex
2023-09-06 09:53:17 +08:00
parent 10a907d927 31e36e7146
commit 955a0d652d
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs
View File

@@ -49,7 +49,14 @@ namespace Tnb.ProductionMgr
public async Task<dynamic> GetList(PrdPackReportQueryInput input)
{
if (input == null) throw new ArgumentNullException("input");
if (string.IsNullOrEmpty(input.stationId)) return Array.Empty<string>();
if (string.IsNullOrEmpty(input.stationId))
{
return new
{
pagination = new PageResult(),
list = Array.Empty<string>()
};
}
List<PackReportTreeOutput> trees = new();
var dic = await _dictionaryDataService.GetDicByTypeId(DictConst.PrdTaskStatusTypeId);

6
ProductionMgr/Tnb.ProductionMgr/PrdTaskManageService.cs
View File

@@ -123,7 +123,11 @@ namespace Tnb.ProductionMgr
if (string.IsNullOrEmpty(stationId))
{
return Array.Empty<string>();
return new
{
pagination = new PageResult(),
list = Array.Empty<string>()
};
}
Dictionary<string, object> dic = await _dictionaryDataService.GetDicByKey(DictConst.TaskStatus);