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

...

Browse Source
This commit is contained in:
周科达
2024-07-16 10:11:26 +08:00
parent ae17e639eb
commit a66d0c0a9a
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
View File

@@ -280,6 +280,9 @@ namespace Tnb.ProductionMgr
.Where((x, y) => x.code == "ZSJ") .Where((x, y) => x.code == "ZSJ")
.Select((x, y) => y).ToListAsync(); .Select((x, y) => y).ToListAsync();
int? cs01Count = await _redisData.TryGetValueByKeyField<int?>("YTCS", "EmptyNo_CS01");
int? cs03Count = await _redisData.TryGetValueByKeyField<int?>("YTCS", "EmptyNo_CS03");
List<String> eqpIds = equipments.Select(x => x.id).ToList(); List<String> eqpIds = equipments.Select(x => x.id).ToList();
List<EqpDaq> eqpDaqs = await _db.Queryable<EqpDaq>().Where(x => eqpIds.Contains(x.equip_id) && x.label_name.Contains("允许入空箱")).ToListAsync(); List<EqpDaq> eqpDaqs = await _db.Queryable<EqpDaq>().Where(x => eqpIds.Contains(x.equip_id) && x.label_name.Contains("允许入空箱")).ToListAsync();
//BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DOMAIN); //BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DOMAIN);
@@ -475,7 +478,16 @@ namespace Tnb.ProductionMgr
stopwatch.Stop(); stopwatch.Stop();
elapsedMilliseconds = stopwatch.ElapsedMilliseconds; elapsedMilliseconds = stopwatch.ElapsedMilliseconds;
thirdResult = JsonConvert.DeserializeObject<ThirdResult>(response); try
{
thirdResult = JsonConvert.DeserializeObject<ThirdResult>(response);
}
catch (Exception e)
{
thirdResult.Code = 500;
thirdResult.msgResult = response;
}
if (thirdResult.Code == 200) if (thirdResult.Code == 200)
{ {
await _db.Updateable<ThirdWebapiRecord>() await _db.Updateable<ThirdWebapiRecord>()