From 2ef99428f9be29ec299029782edb97baef88e126 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 18 三月 2026 14:19:20 +0800
Subject: [PATCH] feat: 完成WCS/WMS任务链路与设备调度改造
---
Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Entities/MemoryRegionConfig.cs | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Entities/MemoryRegionConfig.cs b/Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Entities/MemoryRegionConfig.cs
index eedf656..d6af664 100644
--- a/Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Entities/MemoryRegionConfig.cs
+++ b/Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Entities/MemoryRegionConfig.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
+using System.Collections.Generic;
namespace WIDESEAWCS_S7Simulator.Core.Entities
{
@@ -10,43 +11,50 @@
/// <summary>
/// M鍖哄ぇ灏忥紙瀛楄妭锛夛紝榛樿1KB
/// </summary>
- [JsonProperty("mRegionSize")]
+ [JsonPropertyName("mRegionSize")]
public int MRegionSize { get; set; } = 1024;
/// <summary>
/// DB鍧楁暟閲忥紝榛樿100涓�
/// </summary>
- [JsonProperty("dbBlockCount")]
+ [JsonPropertyName("dbBlockCount")]
public int DBBlockCount { get; set; } = 100;
+
+ /// <summary>
+ /// 鎸囧畾闇�瑕佸垱寤虹殑 DB 鍧楀彿鍒楄〃锛堜緥濡� 50,900,901锛夈��
+ /// 閰嶇疆鍚庡彧浼氬垵濮嬪寲杩欎簺 DB 鍧椼��
+ /// </summary>
+ [JsonPropertyName("dbBlockNumbers")]
+ public List<int> DBBlockNumbers { get; set; } = new();
/// <summary>
/// 姣忎釜DB鍧楀ぇ灏忥紙瀛楄妭锛夛紝榛樿1KB
/// </summary>
- [JsonProperty("dbBlockSize")]
+ [JsonPropertyName("dbBlockSize")]
public int DBBlockSize { get; set; } = 1024;
/// <summary>
/// I鍖哄ぇ灏忥紙瀛楄妭锛夛紝榛樿256瀛楄妭
/// </summary>
- [JsonProperty("iRegionSize")]
+ [JsonPropertyName("iRegionSize")]
public int IRegionSize { get; set; } = 256;
/// <summary>
/// Q鍖哄ぇ灏忥紙瀛楄妭锛夛紝榛樿256瀛楄妭
/// </summary>
- [JsonProperty("qRegionSize")]
+ [JsonPropertyName("qRegionSize")]
public int QRegionSize { get; set; } = 256;
/// <summary>
/// T鍖烘暟閲忥紝榛樿64涓�
/// </summary>
- [JsonProperty("tRegionCount")]
+ [JsonPropertyName("tRegionCount")]
public int TRegionCount { get; set; } = 64;
/// <summary>
/// C鍖烘暟閲忥紝榛樿64涓�
/// </summary>
- [JsonProperty("cRegionCount")]
+ [JsonPropertyName("cRegionCount")]
public int CRegionCount { get; set; } = 64;
}
}
--
Gitblit v1.9.3