From c814a981db2a078a3d1021263ad349e2c1de9188 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期二, 08 四月 2025 16:52:43 +0800
Subject: [PATCH] 1
---
Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue | 5 +++--
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 2 +-
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs | 2 +-
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue
index 015c106..ee27710 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue
@@ -33,7 +33,7 @@
stacker: "",
executionMethod:"",
platformType:"",
- plcCode:"",
+ deviceCode:"",
location: "",
capacity: "",
status: "",
@@ -59,7 +59,7 @@
stacker: "",
executionMethod:"",
platformType:"",
- plcCode:"",
+ deviceCode:"",
location: "",
capacity: "",
status: "",
@@ -99,6 +99,7 @@
type: "string",
width: 90,
align: "left",
+ // hidden:true,
},
{
field: "status",
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs
index 104af76..b99d08d 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs
@@ -65,7 +65,7 @@
[ImporterHeader(Name = "瀵瑰簲PLC缂栧彿")]
[ExporterHeader(DisplayName = "瀵瑰簲PLC缂栧彿")]
[SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "瀵瑰簲PLC缂栧彿")]
- public string PLCCode { get; set; }
+ public string DeviceCode { get; set; }
/// <summary>
/// 绔欏彴浣嶇疆
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
index 3589d01..23dc750 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -257,7 +257,7 @@
}
// 鏌ヨ骞冲彴淇℃伅
- Platform platform = _platFormRepository.QueryFirst(x => x.PLCCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
+ Platform platform = _platFormRepository.QueryFirst(x => x.DeviceCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
if (platform != null && !string.IsNullOrEmpty(platform.Location))
{
var strings = platform.Location.Split(',').ToList();
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
index bf61d3b..18369bb 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
@@ -134,7 +134,7 @@
if (childDeviceCode == "1670"||childDeviceCode=="1666"||childDeviceCode=="1548"||childDeviceCode=="1448")
{
- Platform platform = _platFormRepository.QueryFirst(x => x.PLCCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
+ Platform platform = _platFormRepository.QueryFirst(x => x.DeviceCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
if (platform != null)
{
if (command.HasPallet != 1)
--
Gitblit v1.9.3