From 2ecf5dfa71bf0c553c30ced6f68a81fa3be6a93f Mon Sep 17 00:00:00 2001
From: xiaoyang <xiaoyang@hnkhzn.com>
Date: 星期五, 08 十一月 2024 20:03:58 +0800
Subject: [PATCH] 11.08-1
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
index 00950ad..fea5ff2 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
@@ -157,6 +157,10 @@
task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
}
}
+ else if (task == null)
+ {
+ task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
+ }
return task;
}
@@ -177,7 +181,7 @@
CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
//if (conveyorLine.IsOccupied(router.ChildPosi))//鍑哄簱绔欏彴鏈鍗犵敤
//{
- return task;
+ return task;
//}
}
else
@@ -305,27 +309,32 @@
{
if (!commonStackerCrane.StackerOnline)
{
- BasicDto dto = new BasicDto
+ RequestEqptRunDto request = new RequestEqptRunDto()
{
EmployeeNo = "T00001",
EquipmentCode = commonStackerCrane.DeviceCode,
RequestTime = DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
SessionId = Guid.NewGuid().ToString(),
Software = commonStackerCrane.DeviceName,
+ Password = "12345",
+ EquipmentModel = "1"
};
- var respone = await HttpHelper.PostAsync("http://ts-momapp01:12020/api/MachineIntegration/EqptRun", dto.ToJsonString());
+ var respone = await HttpHelper.PostAsync("http://ts-momapp01:12020/api/MachineIntegration/EqptRun", request.ToJsonString());
if (respone != null)
{
var result = JsonConvert.DeserializeObject<ResponseEqptRunDto>(respone);
if (result != null && result.Success)
{
- var process = _processRepository.QueryData(x => x.EquipmentName == commonStackerCrane.DeviceName).FirstOrDefault();
+ var process = _processRepository.QueryData(x => x.EquipmentName == commonStackerCrane.DeviceCode).FirstOrDefault();
if (process == null)
{
+ ResponeRunDto runDto = JsonConvert.DeserializeObject<ResponeRunDto>(respone);
process = new Dt_EquipmentProcess()
{
- EquipmentName = commonStackerCrane.DeviceName,
- EquipmentType = commonStackerCrane.DeviceCode.Substring(commonStackerCrane.DeviceCode.IndexOf("SC")),
+ EquipmentName = commonStackerCrane.DeviceCode,
+ EquipmentType = new string(commonStackerCrane.DeviceName.TakeWhile(c => !char.IsDigit(c)).ToArray()),
+ WipOrderNo = runDto.WipOrderNo,
+ ProductDesc = runDto.ProductDesc,
ProcessValue = JsonConvert.SerializeObject(result)
};
var isResult = await _processRepository.AddDataAsync(process) > 0;
@@ -432,22 +441,24 @@
AlertDescription = commonStackerCrane.StackerCraneStatusDes,
AlertReset = "0"
};
- await HttpHelper.PostAsync("http://ts-momapp01:12020/api/MachineIntegration/EqptAlive", requestAlert.ToJsonString());
+ var S= await HttpHelper.PostAsync("http://ts-momapp01:12020/api/MachineIntegration/EqptAlive", requestAlert.ToJsonString());
+ WriteInfo("EqptAlive", S);
}
RequestEqptStatusDto requestEqptStatus = new RequestEqptStatusDto()
{
EmployeeNo = "T00001",
- EquipmentCode = commonStackerCrane.DeviceCode,
+ EquipmentCode = "ECH001-B",
RequestTime = DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
SessionId = Guid.NewGuid().ToString(),
Software = commonStackerCrane.DeviceName,
- ChangeTime = DateTime.Now.ToString(),
+ ChangeTime = DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
Description = commonStackerCrane.StackerCraneStatusDes,
LocationID = "NA",
ReasonCode = "123",
StatusCode = code
};
var respone = await HttpHelper.PostAsync("http://ts-momapp01:12020/api/MachineIntegration/EqptStatus", requestEqptStatus.ToJsonString());
+ WriteInfo("EqptStatus", respone);
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3