From e7639b1edab8ae2921b7f9545271dfadf1566d63 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期五, 15 十一月 2024 14:18:39 +0800
Subject: [PATCH] 忽略项
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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..0335a14 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
@@ -322,10 +326,13 @@
var process = _processRepository.QueryData(x => x.EquipmentName == commonStackerCrane.DeviceName).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 = commonStackerCrane.DeviceName.Substring(commonStackerCrane.DeviceCode.IndexOf("鍫嗗灈鏈�")),
+ WipOrderNo = runDto.WipOrderNo,
+ ProductDesc = runDto.ProductDesc,
ProcessValue = JsonConvert.SerializeObject(result)
};
var isResult = await _processRepository.AddDataAsync(process) > 0;
--
Gitblit v1.9.3