|
@@ -174,14 +174,14 @@ namespace WCS.Service.Works.Station
|
|
{
|
|
{
|
|
var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == dev.Station.Data2.Tasknum) ?? throw new WarnException($"WCS无[{dev.Station.Data2.Tasknum}]任务信息");
|
|
var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == dev.Station.Data2.Tasknum) ?? throw new WarnException($"WCS无[{dev.Station.Data2.Tasknum}]任务信息");
|
|
var addNext = "";
|
|
var addNext = "";
|
|
- if (obj.Entity.CODE == "1340")
|
|
|
|
|
|
+ if (dev.Station.Entity.CODE == "1340")
|
|
{
|
|
{
|
|
var Station1343 = Device.Find("1343").Create<StationDevice>();
|
|
var Station1343 = Device.Find("1343").Create<StationDevice>();
|
|
addNext = "1343";
|
|
addNext = "1343";
|
|
if (!Station1343.Data3.Status.HasFlag(StationStatus.自动) || Station1343.Data2.Tasknum > 10000)
|
|
if (!Station1343.Data3.Status.HasFlag(StationStatus.自动) || Station1343.Data2.Tasknum > 10000)
|
|
addNext = "1340";
|
|
addNext = "1340";
|
|
}
|
|
}
|
|
- else if (obj.Entity.CODE == "1341")
|
|
|
|
|
|
+ else if (dev.Station.Entity.CODE == "1341")
|
|
{
|
|
{
|
|
var Station1344 = Device.Find("1344").Create<StationDevice>();
|
|
var Station1344 = Device.Find("1344").Create<StationDevice>();
|
|
addNext = "1344";
|
|
addNext = "1344";
|