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

BUG

Browse Source
This commit is contained in:
周科达
2024-09-18 17:20:17 +08:00
parent 9a0a72e717
commit 1e2ab3fd6c
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BasicData/Tnb.BasicData/ThirdApiRecordService.cs
View File

@@ -169,7 +169,8 @@ namespace Tnb.BasicData
JToken children = data.SelectToken("children")[0]; JToken children = data.SelectToken("children")[0];
var responsetDtos = children.Select(x => new ErpReportDto() var responsetDtos = children.Select(x => new ErpReportDto()
{ {
pk_wr_product = x["valueIndex"]["pk_wr_product"].ToString(), // pk_wr_product = x["valueIndex"]["pk_wr_product"].ToString(),
pk_wr_product = x["qualityvos"][0]["pk_wr_product_q"].ToString(),
pk_wr = x["valueIndex"]["pk_wr"].ToString(), pk_wr = x["valueIndex"]["pk_wr"].ToString(),
report_id = reportId report_id = reportId
}).ToList(); }).ToList();

18
ProductionMgr/Tnb.ProductionMgr/RedisDataService.cs
View File

@@ -68,9 +68,17 @@ namespace Tnb.ProductionMgr
// { // {
// throw Oops.Bah("未在数据采集中设置允许称重标签点"); // throw Oops.Bah("未在数据采集中设置允许称重标签点");
// } // }
EqpDaq eqpDaq2 = await _repository.AsSugarClient().Queryable<EqpDaq>().
LeftJoin<EqpEquipment>((x,y)=>x.equip_id==y.id).
Where((x,y) => y.code == device && x.label_name.Contains("当前重量")).FirstAsync();
if (eqpDaq2 == null)
{
throw Oops.Bah("未在数据采集中设置当前重量标签点");
}
string eqpcode = device; string eqpcode = device;
// device = eqpDaq1.equip_code; device = eqpDaq2.equip_code;
// Dictionary<string, string> dicCommand = new(StringComparer.OrdinalIgnoreCase) // Dictionary<string, string> dicCommand = new(StringComparer.OrdinalIgnoreCase)
// { // {
// ["DevName"] = device, // ["DevName"] = device,
@@ -82,13 +90,7 @@ namespace Tnb.ProductionMgr
// var str = await HttpClientHelper.GetRequestAsync(_eleCtlCfg.WriteTagUrl, dicCommand); // var str = await HttpClientHelper.GetRequestAsync(_eleCtlCfg.WriteTagUrl, dicCommand);
// Log.Information($"{device},{eqpDaq1.label_name}确认称重返回:{str}"); // Log.Information($"{device},{eqpDaq1.label_name}确认称重返回:{str}");
EqpDaq eqpDaq2 = await _repository.AsSugarClient().Queryable<EqpDaq>().
LeftJoin<EqpEquipment>((x,y)=>x.equip_id==y.id).
Where((x,y) => y.code == eqpcode && x.label_name.Contains("当前重量")).FirstAsync();
if (eqpDaq2 == null)
{
throw Oops.Bah("未在数据采集中设置当前重量标签点");
}
bool flag = await _redisData.HashExist(device, eqpDaq2.label_name); bool flag = await _redisData.HashExist(device, eqpDaq2.label_name);
if (!flag) if (!flag)

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

@@ -855,7 +855,8 @@ namespace Tnb.ProductionMgr
JToken children = data.SelectToken("children")[0]; JToken children = data.SelectToken("children")[0];
var responsetDtos = children.Select(x => new ErpReportDto() var responsetDtos = children.Select(x => new ErpReportDto()
{ {
pk_wr_product = x["valueIndex"]["pk_wr_product"].ToString(), // pk_wr_product = x["valueIndex"]["pk_wr_product"].ToString(),
pk_wr_product = x["qualityvos"][0]["pk_wr_product_q"].ToString(),
pk_wr = x["valueIndex"]["pk_wr"].ToString(), pk_wr = x["valueIndex"]["pk_wr"].ToString(),
report_id = reportId report_id = reportId
}).ToList(); }).ToList();