From da5d613a85d97ecd826e343eae6d901806120a05 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 18 三月 2026 14:18:36 +0800
Subject: [PATCH] fix: 修复输送线目标地址选择器并完善机械手任务地址映射
---
Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Entities/InstanceConfig.cs | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Entities/InstanceConfig.cs b/Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Entities/InstanceConfig.cs
index f3003bc..91a7923 100644
--- a/Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Entities/InstanceConfig.cs
+++ b/Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Entities/InstanceConfig.cs
@@ -1,53 +1,57 @@
-using Newtonsoft.Json;
+锘縰sing System.Text.Json.Serialization;
using WIDESEAWCS_S7Simulator.Core.Enums;
namespace WIDESEAWCS_S7Simulator.Core.Entities
{
/// <summary>
- /// S7鏈嶅姟鍣ㄥ疄渚嬮厤缃�
+ /// S7閺堝秴濮熼崳銊ョ杽娓氬鍘ょ純?
/// </summary>
public class InstanceConfig
{
/// <summary>
- /// 瀹炰緥鍞竴鏍囪瘑
+ /// 鐎圭偘绶ラ崬顖欑閺嶅洩鐦�
/// </summary>
- [JsonProperty("id")]
+ //[JsonPropertyName("id")]
public string Id { get; set; } = string.Empty;
/// <summary>
- /// 瀹炰緥鍚嶇О
+ /// 鐎圭偘绶ラ崥宥囆�
/// </summary>
- [JsonProperty("name")]
+ //[JsonPropertyName("name")]
public string Name { get; set; } = string.Empty;
/// <summary>
- /// PLC鍨嬪彿
+ /// PLC閸ㄥ褰�
/// </summary>
- [JsonProperty("plcType")]
+ //[JsonPropertyName("plcType")]
public SiemensPLCType PLCType { get; set; }
/// <summary>
- /// 鐩戝惉绔彛
+ /// 閻╂垵鎯夌粩顖氬經
/// </summary>
- [JsonProperty("port")]
+ //[JsonPropertyName("port")]
public int Port { get; set; }
/// <summary>
- /// HSL婵�娲荤爜
+ /// HSL濠碘偓濞茶崵鐖�
/// </summary>
- [JsonProperty("activationKey")]
+ [JsonPropertyName("activationKey")]
public string ActivationKey { get; set; } = string.Empty;
/// <summary>
- /// 鏄惁鑷姩鍚姩
+ /// 閺勵垰鎯侀懛顏勫З閸氼垰濮�
/// </summary>
- [JsonProperty("autoStart")]
+ [JsonPropertyName("autoStart")]
public bool AutoStart { get; set; }
+ [JsonPropertyName("protocolTemplateId")]
+ public string ProtocolTemplateId { get; set; } = string.Empty;
+
/// <summary>
- /// 鍐呭瓨鍖哄煙閰嶇疆
+ /// 閸愬懎鐡ㄩ崠鍝勭厵闁板秶鐤�
/// </summary>
- [JsonProperty("memoryConfig")]
+ [JsonPropertyName("memoryConfig")]
public MemoryRegionConfig MemoryConfig { get; set; } = new();
}
}
+
--
Gitblit v1.9.3