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-05-22 16:37:56 +08:00
parent a53623823c
commit 90b567f653
6 changed files with 130 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,8 +88,9 @@ namespace Tnb.ProductionMgr
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<dynamic> EmptyCarryOutStk()
public async Task<string> EmptyCarryOutStk()
{
string result = "";
bool? cs01 = await _redisData.TryGetValueByKeyField<bool?>("YTCS", "CallCtuEmptyIn_CS01");
bool? cs03 = await _redisData.TryGetValueByKeyField<bool?>("YTCS", "CallCtuEmptyIn_CS03");
bool cs01Flag = _redisData.Get<bool>("YTCS_CallCtuEmptyIn_CS01_flag");
@@ -97,24 +98,29 @@ namespace Tnb.ProductionMgr
if (cs01==true && !cs01Flag)
{
BasFactoryConfig config = await _repository.AsSugarClient().Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DOMAIN);
HttpUtils.RequestGet($"{config.value}/api/production/time-work/empty-carry-out-stk-left");
// HttpUtils.RequestGet($"http://localhost:9232/api/production/time-work/empty-carry-out-stk-left");
string response = HttpUtils.RequestGet($"{config.value}/api/production/time-work/empty-carry-out-stk-left");
// string response = HttpUtils.RequestGet($"http://localhost:9232/api/production/time-work/empty-carry-out-stk-left");
AuthResponse authResponse = JsonConvert.DeserializeObject<AuthResponse>(response);
result += authResponse.data.ToString();
}
if (cs03==true && !cs03Flag)
{
BasFactoryConfig config = await _repository.AsSugarClient().Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DOMAIN);
HttpUtils.RequestGet($"{config.value}/api/production/time-work/empty-carry-out-stk-right");
// HttpUtils.RequestGet($"http://localhost:9232/api/production/time-work/empty-carry-out-stk-right");
string response = HttpUtils.RequestGet($"{config.value}/api/production/time-work/empty-carry-out-stk-right");
// string response = HttpUtils.RequestGet($"http://localhost:9232/api/production/time-work/empty-carry-out-stk-right");
AuthResponse authResponse = JsonConvert.DeserializeObject<AuthResponse>(response);
result += authResponse.data.ToString();
}
return Task.CompletedTask;
return result;
}
[HttpGet]
[AllowAnonymous]
public async Task<dynamic> EmptyCarryOutStkLeft()
public async Task<string> EmptyCarryOutStkLeft()
{
string msg = "";
MESEmptyCarryOutStkInput input = new MESEmptyCarryOutStkInput();
input.org_id = WmsWareHouseConst.AdministratorOrgId;
input.location_code = "SSX-021-001";
@@ -126,20 +132,23 @@ namespace Tnb.ProductionMgr
Result result = await _wmsEmptyOutstockService.MESEmptyCarryOutStk(input);
if (result.code == HttpStatusCode.OK)
{
msg = "左输送线空箱入呼叫成功";
Log.Information("【EmptyCarryOutStk】左输送线空箱入呼叫成功");
//_redisData.Set("YTCS_CallCtuEmptyIn_CS01_flag", true, TimeSpan.FromMinutes(20));
}
else
{
msg = $"左输送线空箱入呼叫失败:{result.msg}";
Log.Error($"【EmptyCarryOutStk】左输送线空箱入呼叫失败:{result.msg}");
}
return Task.CompletedTask;
return msg;
}
[HttpGet]
[AllowAnonymous]
public async Task<dynamic> EmptyCarryOutStkRight()
public async Task<string> EmptyCarryOutStkRight()
{
string msg = "";
MESEmptyCarryOutStkInput input = new MESEmptyCarryOutStkInput();
input.org_id = WmsWareHouseConst.AdministratorOrgId;
input.location_code = "SSX-021-003";
@@ -151,20 +160,23 @@ namespace Tnb.ProductionMgr
Result result = await _wmsEmptyOutstockService.MESEmptyCarryOutStk(input);
if (result.code == HttpStatusCode.OK)
{
msg = "右输送线空箱入呼叫成功";
Log.Information("【EmptyCarryOutStk】右输送线空箱入呼叫成功");
//_redisData.Set("YTCS_CallCtuEmptyIn_CS03_flag", true, TimeSpan.FromMinutes(20));
}
else
{
msg = $"右输送线空箱入呼叫失败:{result.msg}";
Log.Error($"【EmptyCarryOutStk】右输送线空箱入呼叫失败:{result.msg}");
}
return Task.CompletedTask;
return msg;
}
[HttpGet]
[AllowAnonymous]
public async Task<dynamic> FixedPointDelivery()
public async Task<string> FixedPointDelivery()
{
string msg = "";
bool? value = await _redisData.TryGetValueByKeyField<bool?>("hxjC", "DB100.132.3");
bool valueFlag = _redisData.Get<bool>("hxjC_DB100.132.3_flag");
if (value==true && !valueFlag)
@@ -175,7 +187,7 @@ namespace Tnb.ProductionMgr
if (startLocationCode.IsEmpty())
{
Log.Error($"起始库位为空");
return Task.CompletedTask;
return "起始库位为空";
}
var db = _repository.AsSugarClient();
@@ -184,7 +196,7 @@ namespace Tnb.ProductionMgr
if (equipment == null)
{
Log.Error($"未找到设备编号为TYZS001的设备");
return Task.CompletedTask;
return "未找到设备编号为TYZS001的设备";
}
CommonCreatePretaskInput postData = new CommonCreatePretaskInput();
@@ -195,21 +207,23 @@ namespace Tnb.ProductionMgr
Log.Information($"【FixedPointDelivery】注塑定点配送,参数:{JsonConvert.SerializeObject(postData)}");
BasFactoryConfig config = await db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DOMAIN);
string sendResult = HttpUtils.RequestPost($"{config.value}/api/wms/ware-house/common-create-pretask", JsonConvert.SerializeObject(postData), null);
// string sendResult = HttpUtils.RequestPost($"http://localhost:9232/api/wms/ware-house/common-create-pretask", JsonConvert.SerializeObject(postData), null);
AuthResponse authResponse = JsonConvert.DeserializeObject<AuthResponse>(sendResult);
if(authResponse.code == 200 && authResponse.data.ObjToBool())
{
msg = "注塑定点配送成功";
Log.Information("【FixedPointDelivery】注塑定点配送成功");
//_redisData.Set("hxjC_DB100.132.3_flag", true, TimeSpan.FromMinutes(20));
}
else
{
msg = $"注塑定点配送失败:{authResponse.msg}";
Log.Error($"【FixedPointDelivery】注塑定点配送失败:{authResponse.msg}");
}
}
return Task.CompletedTask;
return msg;
}
}