From 01030b05f7ea9b14878102718a2004b4f908dcfc Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 28 五月 2025 11:15:12 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/24365a37-3171-40e0-9067-b34b6860f327.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/WIDESEAWCS_ITaskInfoRepository.csproj | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/WIDESEAWCS_ITaskInfoService.csproj | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs | 66 +--
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f92ea823-4793-428b-8373-4040362364da.vsidx | 0
代码管理/WMS/WIDESEA_WMSClient/src/views/system/Sys_User.vue | 36 +-
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 2
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/57ae96c1-5e57-4458-b620-36f3c051d823.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/WIDESEAWCS_TaskInfoService.csproj | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/WIDESEAWCS_SystemRepository.csproj | 2
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/warehouse.vue | 16
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Modified_Date.json | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/WIDESEAWCS_IBasicInfoService.csproj | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/WIDESEAWCS_SystemServices.csproj | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/WIDESEAWCS_TaskInfoRepository.csproj | 2
项目资料/项目文件/中和立体库和AGV软件系统问题清单（第二次沟通）-20204.08.06.xls | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WIDESEAWCS_DTO.csproj | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/WIDESEAWCS_BasicInfoService.csproj | 4
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue | 36 +-
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 19 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_DictionaryRepository.cs | 112 +++++++
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/roadwayInfo.vue | 4
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue | 7
代码管理/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js | 16
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/WIDESEAWCS_BasicInfoRepository.csproj | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Log/System/API请求/2025-05-28/任务完成250528.txt | 5
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9792178d-f937-4c06-9523-5ec0b82b8a84.vsidx | 0
代码管理/WMS/WIDESEA_WMSClient/src/extension/system/Sys_Role.js | 2
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/38b1c5dd-656a-4092-881f-3db66940307e.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/WIDESEAWCS_IBasicInfoRepository.csproj | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/WIDESEAWCS_Model.csproj | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/WIDESEAWCS_Common.csproj | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs | 2
代码管理/WMS/WIDESEA_WMSClient/src/views/system/Sys_Role.vue | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 6
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6f1437fd-2fc1-4910-9d5a-eb569aaa6efe.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs | 2
/dev/null | 362 ------------------------
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs | 99 ++++--
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj | 22 -
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_RoleService.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/WIDESEAWCS_ISystemRepository.csproj | 2
代码管理/WMS/WIDESEA_WMSClient/config/buttons.js | 10
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/WIDESEAWCS_ISystemServices.csproj | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/ISys_DictionaryRepository.cs | 3
49 files changed, 321 insertions(+), 560 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/24365a37-3171-40e0-9067-b34b6860f327.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/24365a37-3171-40e0-9067-b34b6860f327.vsidx"
new file mode 100644
index 0000000..a8e9a61
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/24365a37-3171-40e0-9067-b34b6860f327.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/WIDESEAWCS_BasicInfoRepository.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/WIDESEAWCS_BasicInfoRepository.csproj"
index 00d158a..895bae2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/WIDESEAWCS_BasicInfoRepository.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/WIDESEAWCS_BasicInfoRepository.csproj"
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/WIDESEAWCS_BasicInfoService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/WIDESEAWCS_BasicInfoService.csproj"
index 25ff47e..0aa1432 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/WIDESEAWCS_BasicInfoService.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/WIDESEAWCS_BasicInfoService.csproj"
@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
- <PackageReference Include="WIDESEAWCS_QuartzJob" Version="2.1.0" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
+ <PackageReference Include="WIDESEAWCS_QuartzJob" Version="3.0.9" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/WIDESEAWCS_Common.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/WIDESEAWCS_Common.csproj"
index 6f0bfe9..9c9b3f3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/WIDESEAWCS_Common.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/WIDESEAWCS_Common.csproj"
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
</ItemGroup>
</Project>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WIDESEAWCS_DTO.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WIDESEAWCS_DTO.csproj"
index bcc4ff3..ad61ac3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WIDESEAWCS_DTO.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WIDESEAWCS_DTO.csproj"
@@ -15,7 +15,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
</ItemGroup>
</Project>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/WIDESEAWCS_IBasicInfoRepository.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/WIDESEAWCS_IBasicInfoRepository.csproj"
index 1d9a416..81f36db 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/WIDESEAWCS_IBasicInfoRepository.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/WIDESEAWCS_IBasicInfoRepository.csproj"
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/WIDESEAWCS_IBasicInfoService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/WIDESEAWCS_IBasicInfoService.csproj"
index 72c2a68..e5839c4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/WIDESEAWCS_IBasicInfoService.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/WIDESEAWCS_IBasicInfoService.csproj"
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/WIDESEAWCS_ISystemRepository.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/WIDESEAWCS_ISystemRepository.csproj"
index 3707d54..ac9a428 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/WIDESEAWCS_ISystemRepository.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/WIDESEAWCS_ISystemRepository.csproj"
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/WIDESEAWCS_ISystemServices.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/WIDESEAWCS_ISystemServices.csproj"
index 5522748..257ec29 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/WIDESEAWCS_ISystemServices.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/WIDESEAWCS_ISystemServices.csproj"
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/WIDESEAWCS_ITaskInfoRepository.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/WIDESEAWCS_ITaskInfoRepository.csproj"
index 0997d4a..d247715 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/WIDESEAWCS_ITaskInfoRepository.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/WIDESEAWCS_ITaskInfoRepository.csproj"
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/WIDESEAWCS_ITaskInfoService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/WIDESEAWCS_ITaskInfoService.csproj"
index 8cf4290..450305e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/WIDESEAWCS_ITaskInfoService.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/WIDESEAWCS_ITaskInfoService.csproj"
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/WIDESEAWCS_Model.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/WIDESEAWCS_Model.csproj"
index e379ed4..d23299b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/WIDESEAWCS_Model.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/WIDESEAWCS_Model.csproj"
@@ -8,8 +8,8 @@
<ItemGroup>
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
- <PackageReference Include="WIDESEAWCS_Core" Version="1.0.6" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
+ <PackageReference Include="WIDESEAWCS_Core" Version="1.0.24" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Modified_Date.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Modified_Date.json"
index 70f3447..fe09f62 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Modified_Date.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Modified_Date.json"
@@ -1 +1 @@
-{"MM":"1","LogTime":"2024-11-12"}
\ No newline at end of file
+{"MM":"1","LogTime":"2025-05-21"}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj"
index e47767f..1fcc814 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj"
@@ -8,11 +8,6 @@
</PropertyGroup>
<ItemGroup>
- <Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceInfo.tsv" />
- <Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceProtocol.tsv" />
- <Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceProtocolDetail.tsv" />
- <Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DispatchInfo.tsv" />
- <Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_Router.tsv" />
<Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_Task.tsv" />
<Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_TaskExecuteDetail.tsv" />
<Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_Dictionary.tsv" />
@@ -30,21 +25,6 @@
<ItemGroup>
<EmbeddedResource Include="index.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </EmbeddedResource>
- <EmbeddedResource Include="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceInfo.tsv">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </EmbeddedResource>
- <EmbeddedResource Include="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceProtocol.tsv">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </EmbeddedResource>
- <EmbeddedResource Include="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceProtocolDetail.tsv">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </EmbeddedResource>
- <EmbeddedResource Include="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DispatchInfo.tsv">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </EmbeddedResource>
- <EmbeddedResource Include="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_Router.tsv">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_Task.tsv">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -74,7 +54,7 @@
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
index de17e48..999a7cb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
@@ -10,9 +10,15 @@
"AllowedHosts": "*",
"ConnectionStringsEncryption": false,
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
+ //1.MySql
+ //2.SqlServer
+ //3.Sqlite
+ //4.Oracle
+ //5.PostgreSQL
+ "DBType": "SqlServer", //鏁版嵁搴撶被鍨�
//杩炴帴瀛楃涓�
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_ZH;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
"PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
@@ -23,8 +29,13 @@
},
"WMS": "http://localhost:9290/api/Task/",
-
- "ApiName": "WIDESEA",
+ "ApiLogIgnore": "WIDESEAWCS", //蹇界暐鐨凙PI鍚嶇О锛屽涓敤閫楀彿鍒嗛殧
+ "ApiName": "WIDESEAWCS",
"ExpMinutes": 120,
- "QuartzJobAutoStart": true
+ "QuartzJobAutoStart": false,//鏄惁鑷姩鍚姩Job
+ "LogDeubgEnable": true, //鏄惁璁板綍璋冭瘯鏃ュ織
+ "PrintSql": true, //鎵撳嵃SQL璇彞
+ "LogAOPEnable": true, //鏄惁璁板綍AOP鏃ュ織
+ "WebSocketEnable": true, //鏄惁寮�鍚疻ebSocket鏈嶅姟
+ "WebSocketPort": 9296 //WebSocket鏈嶅姟绔彛
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DeviceInfo.tsv" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DeviceInfo.tsv"
deleted file mode 100644
index 1c6d83f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DeviceInfo.tsv"
+++ /dev/null
@@ -1,34 +0,0 @@
-锘縖
- {
- "Id": 1,
- "DeviceCode": "SC01",
- "DeviceName": "1鍙峰爢鍨涙満",
- "DeviceType": "CommonStackerCrane",
- "DeviceStatus": "1",
- "DeviceIp": "127.0.0.1",
- "DevicePort": 102,
- "DevicePlcType": "SiemensS7",
- "DeviceRemark": "1",
- "ProtocolList": null,
- "Creater": "1",
- "CreateDate": "2024-08-23T11:32:25.507",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 3,
- "DeviceCode": "1002",
- "DeviceName": "杈撻�佺嚎",
- "DeviceType": "CommonConveyorLine",
- "DeviceStatus": "1",
- "DeviceIp": "127.0.0.1",
- "DevicePort": 103,
- "DevicePlcType": "SiemensS7",
- "DeviceRemark": "1",
- "ProtocolList": null,
- "Creater": "1",
- "CreateDate": "2024-08-23T11:32:25.507",
- "Modifier": null,
- "ModifyDate": null
- }
-]
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DeviceProtocol.tsv" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DeviceProtocol.tsv"
deleted file mode 100644
index f6217f8..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DeviceProtocol.tsv"
+++ /dev/null
@@ -1,2977 +0,0 @@
-锘縖
- {
- "Id": 1,
- "DeviceId": 1,
- "DeviceChildCode": "SC01",
- "DeviceProDataBlock": "DB106",
- "DeviceProOffset": 2.0,
- "DeviceProDataType": "byte",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "StackerCraneStatus",
- "DeviceProParamType": "StackerCraneStatus",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 2,
- "DeviceId": 1,
- "DeviceChildCode": "SC01",
- "DeviceProDataBlock": "DB106",
- "DeviceProOffset": 3.0,
- "DeviceProDataType": "byte",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "StackerCraneAutoStatus",
- "DeviceProParamType": "StackerCraneAutoStatus",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 3,
- "DeviceId": 1,
- "DeviceChildCode": "SC01",
- "DeviceProDataBlock": "DB106",
- "DeviceProOffset": 18.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "CurrentTaskNum",
- "DeviceProParamType": "CurrentTaskNum",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 4,
- "DeviceId": 1,
- "DeviceChildCode": "SC01",
- "DeviceProDataBlock": "DB106",
- "DeviceProOffset": 22.0,
- "DeviceProDataType": "byte",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "StackerCraneWorkStatus",
- "DeviceProParamType": "StackerCraneWorkStatus",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 5,
- "DeviceId": 1,
- "DeviceChildCode": "SC01",
- "DeviceProDataBlock": "DB105",
- "DeviceProOffset": 2.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "TaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 6,
- "DeviceId": 1,
- "DeviceChildCode": "SC01",
- "DeviceProDataBlock": "DB105",
- "DeviceProOffset": 6.0,
- "DeviceProDataType": "int",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WorkType",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 7,
- "DeviceId": 1,
- "DeviceChildCode": "SC01",
- "DeviceProDataBlock": "DB105",
- "DeviceProOffset": 8.0,
- "DeviceProDataType": "int",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "TrayType",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 8,
- "DeviceId": 1,
- "DeviceChildCode": "SC01",
- "DeviceProDataBlock": "DB105",
- "DeviceProOffset": 10.0,
- "DeviceProDataType": "int",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "StartRow",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 9,
- "DeviceId": 1,
- "DeviceChildCode": "SC01",
- "DeviceProDataBlock": "DB105",
- "DeviceProOffset": 12.0,
- "DeviceProDataType": "int",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "StartColumn",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 10,
- "DeviceId": 1,
- "DeviceChildCode": "SC01",
- "DeviceProDataBlock": "DB105",
- "DeviceProOffset": 14.0,
- "DeviceProDataType": "int",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "StartLayer",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 11,
- "DeviceId": 1,
- "DeviceChildCode": "SC01",
- "DeviceProDataBlock": "DB105",
- "DeviceProOffset": 16.0,
- "DeviceProDataType": "int",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "EndRow",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 12,
- "DeviceId": 1,
- "DeviceChildCode": "SC01",
- "DeviceProDataBlock": "DB105",
- "DeviceProOffset": 18.0,
- "DeviceProDataType": "int",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "EndColumn",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 13,
- "DeviceId": 1,
- "DeviceChildCode": "SC01",
- "DeviceProDataBlock": "DB105",
- "DeviceProOffset": 20.0,
- "DeviceProDataType": "int",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "EndLayer",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 14,
- "DeviceId": 1,
- "DeviceChildCode": "SC01",
- "DeviceProDataBlock": "DB105",
- "DeviceProOffset": 22.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "Barcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 15,
- "DeviceId": 3,
- "DeviceChildCode": "101",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 0.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 16,
- "DeviceId": 3,
- "DeviceChildCode": "101",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 2.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 17,
- "DeviceId": 3,
- "DeviceChildCode": "101",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 30.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 18,
- "DeviceId": 3,
- "DeviceChildCode": "101",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 34.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 19,
- "DeviceId": 3,
- "DeviceChildCode": "102",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 50.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 20,
- "DeviceId": 3,
- "DeviceChildCode": "102",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 52.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 21,
- "DeviceId": 3,
- "DeviceChildCode": "102",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 80.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 22,
- "DeviceId": 3,
- "DeviceChildCode": "102",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 84.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 23,
- "DeviceId": 3,
- "DeviceChildCode": "103",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 100.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 24,
- "DeviceId": 3,
- "DeviceChildCode": "103",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 102.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 25,
- "DeviceId": 3,
- "DeviceChildCode": "103",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 130.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 26,
- "DeviceId": 3,
- "DeviceChildCode": "103",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 134.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 27,
- "DeviceId": 3,
- "DeviceChildCode": "104",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 150.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 28,
- "DeviceId": 3,
- "DeviceChildCode": "104",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 152.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 29,
- "DeviceId": 3,
- "DeviceChildCode": "104",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 180.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 30,
- "DeviceId": 3,
- "DeviceChildCode": "104",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 184.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 31,
- "DeviceId": 3,
- "DeviceChildCode": "105",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 200.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 32,
- "DeviceId": 3,
- "DeviceChildCode": "105",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 202.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 33,
- "DeviceId": 3,
- "DeviceChildCode": "105",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 230.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 34,
- "DeviceId": 3,
- "DeviceChildCode": "105",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 234.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 35,
- "DeviceId": 3,
- "DeviceChildCode": "106",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 250.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 36,
- "DeviceId": 3,
- "DeviceChildCode": "106",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 252.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 37,
- "DeviceId": 3,
- "DeviceChildCode": "106",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 280.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 38,
- "DeviceId": 3,
- "DeviceChildCode": "106",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 284.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 39,
- "DeviceId": 3,
- "DeviceChildCode": "107",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 300.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 40,
- "DeviceId": 3,
- "DeviceChildCode": "107",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 302.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 41,
- "DeviceId": 3,
- "DeviceChildCode": "107",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 330.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 42,
- "DeviceId": 3,
- "DeviceChildCode": "107",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 334.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 43,
- "DeviceId": 3,
- "DeviceChildCode": "108",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 350.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 44,
- "DeviceId": 3,
- "DeviceChildCode": "108",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 352.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 45,
- "DeviceId": 3,
- "DeviceChildCode": "108",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 380.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 46,
- "DeviceId": 3,
- "DeviceChildCode": "108",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 384.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 47,
- "DeviceId": 3,
- "DeviceChildCode": "109",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 400.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 48,
- "DeviceId": 3,
- "DeviceChildCode": "109",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 402.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 49,
- "DeviceId": 3,
- "DeviceChildCode": "109",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 430.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 50,
- "DeviceId": 3,
- "DeviceChildCode": "109",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 438.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 51,
- "DeviceId": 3,
- "DeviceChildCode": "110",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 450.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 52,
- "DeviceId": 3,
- "DeviceChildCode": "110",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 452.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 53,
- "DeviceId": 3,
- "DeviceChildCode": "110",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 480.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 54,
- "DeviceId": 3,
- "DeviceChildCode": "110",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 484.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 55,
- "DeviceId": 3,
- "DeviceChildCode": "111",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 500.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 56,
- "DeviceId": 3,
- "DeviceChildCode": "111",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 502.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 57,
- "DeviceId": 3,
- "DeviceChildCode": "111",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 530.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 58,
- "DeviceId": 3,
- "DeviceChildCode": "111",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 534.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 59,
- "DeviceId": 3,
- "DeviceChildCode": "112",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 550.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 60,
- "DeviceId": 3,
- "DeviceChildCode": "112",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 552.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 61,
- "DeviceId": 3,
- "DeviceChildCode": "112",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 580.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 62,
- "DeviceId": 3,
- "DeviceChildCode": "112",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 584.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 63,
- "DeviceId": 3,
- "DeviceChildCode": "113",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 600.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 64,
- "DeviceId": 3,
- "DeviceChildCode": "113",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 602.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 65,
- "DeviceId": 3,
- "DeviceChildCode": "113",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 630.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 66,
- "DeviceId": 3,
- "DeviceChildCode": "113",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 634.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 67,
- "DeviceId": 3,
- "DeviceChildCode": "114",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 650.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 68,
- "DeviceId": 3,
- "DeviceChildCode": "114",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 652.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 69,
- "DeviceId": 3,
- "DeviceChildCode": "114",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 680.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 70,
- "DeviceId": 3,
- "DeviceChildCode": "114",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 684.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 71,
- "DeviceId": 3,
- "DeviceChildCode": "115",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 700.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 72,
- "DeviceId": 3,
- "DeviceChildCode": "115",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 702.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 73,
- "DeviceId": 3,
- "DeviceChildCode": "115",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 730.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 74,
- "DeviceId": 3,
- "DeviceChildCode": "115",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 734.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 75,
- "DeviceId": 3,
- "DeviceChildCode": "116",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 750.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 76,
- "DeviceId": 3,
- "DeviceChildCode": "116",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 752.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 77,
- "DeviceId": 3,
- "DeviceChildCode": "116",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 780.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 78,
- "DeviceId": 3,
- "DeviceChildCode": "116",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 784.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 79,
- "DeviceId": 3,
- "DeviceChildCode": "117",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 800.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 80,
- "DeviceId": 3,
- "DeviceChildCode": "117",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 802.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 81,
- "DeviceId": 3,
- "DeviceChildCode": "117",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 830.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 82,
- "DeviceId": 3,
- "DeviceChildCode": "117",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 834.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 83,
- "DeviceId": 3,
- "DeviceChildCode": "118",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 850.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 84,
- "DeviceId": 3,
- "DeviceChildCode": "118",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 852.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 85,
- "DeviceId": 3,
- "DeviceChildCode": "118",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 880.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 86,
- "DeviceId": 3,
- "DeviceChildCode": "118",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 884.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 87,
- "DeviceId": 3,
- "DeviceChildCode": "119",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 900.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 88,
- "DeviceId": 3,
- "DeviceChildCode": "119",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 902.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 89,
- "DeviceId": 3,
- "DeviceChildCode": "119",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 930.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 90,
- "DeviceId": 3,
- "DeviceChildCode": "119",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 934.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 91,
- "DeviceId": 3,
- "DeviceChildCode": "120",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 950.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "InteractiveSignal",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 92,
- "DeviceId": 3,
- "DeviceChildCode": "120",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 952.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "ConveyorLineBarcode",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 93,
- "DeviceId": 3,
- "DeviceChildCode": "120",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 980.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTargetAddress",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 94,
- "DeviceId": 3,
- "DeviceChildCode": "120",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 984.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "ConveyorLineTaskNum",
- "DeviceProParamType": "ReadDeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 95,
- "DeviceId": 3,
- "DeviceChildCode": "101",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 0.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 96,
- "DeviceId": 3,
- "DeviceChildCode": "101",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 2.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 97,
- "DeviceId": 3,
- "DeviceChildCode": "101",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 30.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 98,
- "DeviceId": 3,
- "DeviceChildCode": "101",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 34.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 99,
- "DeviceId": 3,
- "DeviceChildCode": "102",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 50.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 100,
- "DeviceId": 3,
- "DeviceChildCode": "102",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 52.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 101,
- "DeviceId": 3,
- "DeviceChildCode": "102",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 80.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 102,
- "DeviceId": 3,
- "DeviceChildCode": "102",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 84.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 103,
- "DeviceId": 3,
- "DeviceChildCode": "103",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 100.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 104,
- "DeviceId": 3,
- "DeviceChildCode": "103",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 102.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 105,
- "DeviceId": 3,
- "DeviceChildCode": "103",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 130.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 106,
- "DeviceId": 3,
- "DeviceChildCode": "103",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 134.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 107,
- "DeviceId": 3,
- "DeviceChildCode": "104",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 150.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 108,
- "DeviceId": 3,
- "DeviceChildCode": "104",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 152.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 109,
- "DeviceId": 3,
- "DeviceChildCode": "104",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 180.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 110,
- "DeviceId": 3,
- "DeviceChildCode": "104",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 184.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 111,
- "DeviceId": 3,
- "DeviceChildCode": "105",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 200.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 112,
- "DeviceId": 3,
- "DeviceChildCode": "105",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 202.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 113,
- "DeviceId": 3,
- "DeviceChildCode": "105",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 230.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 114,
- "DeviceId": 3,
- "DeviceChildCode": "105",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 234.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 115,
- "DeviceId": 3,
- "DeviceChildCode": "106",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 250.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 116,
- "DeviceId": 3,
- "DeviceChildCode": "106",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 252.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 117,
- "DeviceId": 3,
- "DeviceChildCode": "106",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 280.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 118,
- "DeviceId": 3,
- "DeviceChildCode": "106",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 284.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 119,
- "DeviceId": 3,
- "DeviceChildCode": "107",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 300.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 120,
- "DeviceId": 3,
- "DeviceChildCode": "107",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 302.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 121,
- "DeviceId": 3,
- "DeviceChildCode": "107",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 330.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 122,
- "DeviceId": 3,
- "DeviceChildCode": "107",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 334.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 123,
- "DeviceId": 3,
- "DeviceChildCode": "108",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 350.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 124,
- "DeviceId": 3,
- "DeviceChildCode": "108",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 352.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 125,
- "DeviceId": 3,
- "DeviceChildCode": "108",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 380.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 126,
- "DeviceId": 3,
- "DeviceChildCode": "108",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 384.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 127,
- "DeviceId": 3,
- "DeviceChildCode": "109",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 400.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 128,
- "DeviceId": 3,
- "DeviceChildCode": "109",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 402.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 129,
- "DeviceId": 3,
- "DeviceChildCode": "109",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 430.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 130,
- "DeviceId": 3,
- "DeviceChildCode": "109",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 438.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 131,
- "DeviceId": 3,
- "DeviceChildCode": "110",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 450.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 132,
- "DeviceId": 3,
- "DeviceChildCode": "110",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 452.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 133,
- "DeviceId": 3,
- "DeviceChildCode": "110",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 480.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 134,
- "DeviceId": 3,
- "DeviceChildCode": "110",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 484.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 135,
- "DeviceId": 3,
- "DeviceChildCode": "111",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 500.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 136,
- "DeviceId": 3,
- "DeviceChildCode": "111",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 502.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 137,
- "DeviceId": 3,
- "DeviceChildCode": "111",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 530.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 138,
- "DeviceId": 3,
- "DeviceChildCode": "111",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 534.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 139,
- "DeviceId": 3,
- "DeviceChildCode": "112",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 550.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 140,
- "DeviceId": 3,
- "DeviceChildCode": "112",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 552.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 141,
- "DeviceId": 3,
- "DeviceChildCode": "112",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 580.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 142,
- "DeviceId": 3,
- "DeviceChildCode": "112",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 584.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 143,
- "DeviceId": 3,
- "DeviceChildCode": "113",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 600.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 144,
- "DeviceId": 3,
- "DeviceChildCode": "113",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 602.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 145,
- "DeviceId": 3,
- "DeviceChildCode": "113",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 630.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 146,
- "DeviceId": 3,
- "DeviceChildCode": "113",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 634.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 147,
- "DeviceId": 3,
- "DeviceChildCode": "114",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 650.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 148,
- "DeviceId": 3,
- "DeviceChildCode": "114",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 652.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 149,
- "DeviceId": 3,
- "DeviceChildCode": "114",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 680.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 150,
- "DeviceId": 3,
- "DeviceChildCode": "114",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 684.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 151,
- "DeviceId": 3,
- "DeviceChildCode": "115",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 700.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 152,
- "DeviceId": 3,
- "DeviceChildCode": "115",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 702.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 153,
- "DeviceId": 3,
- "DeviceChildCode": "115",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 730.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 154,
- "DeviceId": 3,
- "DeviceChildCode": "115",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 734.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 155,
- "DeviceId": 3,
- "DeviceChildCode": "116",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 750.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 156,
- "DeviceId": 3,
- "DeviceChildCode": "116",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 752.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 157,
- "DeviceId": 3,
- "DeviceChildCode": "116",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 780.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 158,
- "DeviceId": 3,
- "DeviceChildCode": "116",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 784.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 159,
- "DeviceId": 3,
- "DeviceChildCode": "117",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 800.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 160,
- "DeviceId": 3,
- "DeviceChildCode": "117",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 802.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 161,
- "DeviceId": 3,
- "DeviceChildCode": "117",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 830.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 162,
- "DeviceId": 3,
- "DeviceChildCode": "117",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 834.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 163,
- "DeviceId": 3,
- "DeviceChildCode": "118",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 850.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 164,
- "DeviceId": 3,
- "DeviceChildCode": "118",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 852.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 165,
- "DeviceId": 3,
- "DeviceChildCode": "118",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 880.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 166,
- "DeviceId": 3,
- "DeviceChildCode": "118",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 884.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 167,
- "DeviceId": 3,
- "DeviceChildCode": "119",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 900.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 168,
- "DeviceId": 3,
- "DeviceChildCode": "119",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 902.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 169,
- "DeviceId": 3,
- "DeviceChildCode": "119",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 930.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 170,
- "DeviceId": 3,
- "DeviceChildCode": "119",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 934.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 171,
- "DeviceId": 3,
- "DeviceChildCode": "120",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 950.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteInteractiveSignal",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 172,
- "DeviceId": 3,
- "DeviceChildCode": "120",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 952.0,
- "DeviceProDataType": "string",
- "DeviceProDataLength": 25,
- "DeviceProParamName": "WriteConveyorLineBarcode",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 173,
- "DeviceId": 3,
- "DeviceChildCode": "120",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 980.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTargetAddress",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 174,
- "DeviceId": 3,
- "DeviceChildCode": "120",
- "DeviceProDataBlock": "DB90",
- "DeviceProOffset": 984.0,
- "DeviceProDataType": "dint",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "WriteConveyorLineTaskNum",
- "DeviceProParamType": "DeviceCommand",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 175,
- "DeviceId": 3,
- "DeviceChildCode": "111",
- "DeviceProDataBlock": "DB80",
- "DeviceProOffset": 500.0,
- "DeviceProDataType": "w",
- "DeviceProDataLength": 1,
- "DeviceProParamName": "IsOccupied",
- "DeviceProParamType": "IsOccupied",
- "DeviceProParamDes": "1",
- "DeviceProRemark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:25.857",
- "Modifier": null,
- "ModifyDate": null
- }
-]
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DeviceProtocolDetail.tsv" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DeviceProtocolDetail.tsv"
deleted file mode 100644
index 5364f42..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DeviceProtocolDetail.tsv"
+++ /dev/null
@@ -1,262 +0,0 @@
-锘縖
- {
- "Id": 1,
- "DeviceType": "CommonStackerCrane",
- "DeviceProParamName": "StackerCraneStatus",
- "ProtocolDetailType": "Normal",
- "ProtocalDetailValue": "1",
- "ProtocolDetailDes": "璁惧鐘舵��(1:姝ｅ父)",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 2,
- "DeviceType": "CommonStackerCrane",
- "DeviceProParamName": "StackerCraneStatus",
- "ProtocolDetailType": "Fault",
- "ProtocalDetailValue": "2",
- "ProtocolDetailDes": "璁惧鐘舵��(2:鏁呴殰)",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 3,
- "DeviceType": "CommonStackerCrane",
- "DeviceProParamName": "StackerCraneStatus",
- "ProtocolDetailType": "EmergencyStop",
- "ProtocalDetailValue": "3",
- "ProtocolDetailDes": "璁惧鐘舵��(3:鎬ュ仠)",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 4,
- "DeviceType": "CommonStackerCrane",
- "DeviceProParamName": "StackerCraneAutoStatus",
- "ProtocolDetailType": "Maintenance",
- "ProtocalDetailValue": "0",
- "ProtocolDetailDes": "宸ヤ綔妯″紡(0:缁翠慨)",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 5,
- "DeviceType": "CommonStackerCrane",
- "DeviceProParamName": "StackerCraneAutoStatus",
- "ProtocolDetailType": "Manual",
- "ProtocalDetailValue": "1",
- "ProtocolDetailDes": "宸ヤ綔妯″紡(1:鎵嬪姩",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 6,
- "DeviceType": "CommonStackerCrane",
- "DeviceProParamName": "StackerCraneAutoStatus",
- "ProtocolDetailType": "SemiAutomatic",
- "ProtocalDetailValue": "2",
- "ProtocolDetailDes": "宸ヤ綔妯″紡(2:鍗婅嚜鍔�)",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 7,
- "DeviceType": "CommonStackerCrane",
- "DeviceProParamName": "StackerCraneAutoStatus",
- "ProtocolDetailType": "Automatic",
- "ProtocalDetailValue": "3",
- "ProtocolDetailDes": "宸ヤ綔妯″紡(3:鑷姩)",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 8,
- "DeviceType": "CommonStackerCrane",
- "DeviceProParamName": "StackerCraneWorkStatus",
- "ProtocolDetailType": "Standby",
- "ProtocalDetailValue": "0",
- "ProtocolDetailDes": "浣滀笟鐘舵��(0:寰呮満)",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 9,
- "DeviceType": "CommonStackerCrane",
- "DeviceProParamName": "StackerCraneWorkStatus",
- "ProtocolDetailType": "PickUp",
- "ProtocalDetailValue": "1",
- "ProtocolDetailDes": "浣滀笟鐘舵��(1:鍙栬揣涓�)",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 10,
- "DeviceType": "CommonStackerCrane",
- "DeviceProParamName": "StackerCraneWorkStatus",
- "ProtocolDetailType": "PickUpCompleted",
- "ProtocalDetailValue": "2",
- "ProtocolDetailDes": "浣滀笟鐘舵��(2:鍙栬揣瀹屾垚)",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 11,
- "DeviceType": "CommonStackerCrane",
- "DeviceProParamName": "StackerCraneWorkStatus",
- "ProtocolDetailType": "Putting",
- "ProtocalDetailValue": "4",
- "ProtocolDetailDes": "浣滀笟鐘舵��(4:鏀捐揣涓�)",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 12,
- "DeviceType": "CommonStackerCrane",
- "DeviceProParamName": "StackerCraneWorkStatus",
- "ProtocolDetailType": "PutCompleted",
- "ProtocalDetailValue": "5",
- "ProtocolDetailDes": "浣滀笟鐘舵��(5:鏀捐揣瀹屾垚)",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 13,
- "DeviceType": "CommonStackerCrane",
- "DeviceProParamName": "StackerCraneWorkStatus",
- "ProtocolDetailType": "WorkCompleted",
- "ProtocalDetailValue": "6",
- "ProtocolDetailDes": "浣滀笟鐘舵��(6:浠诲姟瀹屾垚)",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 14,
- "DeviceType": "CommonConveyorLine",
- "DeviceProParamName": "InteractiveSignal",
- "ProtocolDetailType": "RequestInbound",
- "ProtocalDetailValue": "1",
- "ProtocolDetailDes": "1",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 15,
- "DeviceType": "CommonConveyorLine",
- "DeviceProParamName": "InteractiveSignal",
- "ProtocolDetailType": "RequestInNextAddress",
- "ProtocalDetailValue": "2",
- "ProtocolDetailDes": "2",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 32,
- "DeviceType": "CommonConveyorLine",
- "DeviceProParamName": "InteractiveSignal",
- "ProtocolDetailType": "ConveyorLineInFinish",
- "ProtocalDetailValue": "3",
- "ProtocolDetailDes": "3",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 34,
- "DeviceType": "CommonConveyorLine",
- "DeviceProParamName": "IsOccupied",
- "ProtocolDetailType": "IsOccupied",
- "ProtocalDetailValue": "0",
- "ProtocolDetailDes": "0",
- "Remark": null,
- "Creater": "1",
- "CreateDate": "2024-08-23T23:05:46",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 35,
- "DeviceType": "CommonConveyorLine",
- "DeviceProParamName": "InteractiveSignal",
- "ProtocolDetailType": "RequestOutbound",
- "ProtocalDetailValue": "4",
- "ProtocolDetailDes": "4",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 36,
- "DeviceType": "CommonConveyorLine",
- "DeviceProParamName": "InteractiveSignal",
- "ProtocolDetailType": "RequestOutNextAddress",
- "ProtocalDetailValue": "5",
- "ProtocolDetailDes": "5",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 37,
- "DeviceType": "CommonConveyorLine",
- "DeviceProParamName": "InteractiveSignal",
- "ProtocolDetailType": "ConveyorLineOutFinish",
- "ProtocalDetailValue": "6",
- "ProtocolDetailDes": "6",
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T11:32:26.157",
- "Modifier": null,
- "ModifyDate": null
- }
-]
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DispatchInfo.tsv" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DispatchInfo.tsv"
deleted file mode 100644
index 49a6637..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DispatchInfo.tsv"
+++ /dev/null
@@ -1,32 +0,0 @@
-锘縖
- {
- "Id": 1,
- "Name": "娴嬭瘯",
- "JobGroup": "CommonStackerCrane",
- "AssemblyName": "WIDESEAWCS_Tasks",
- "ClassName": "CommonStackerCraneJob",
- "IntervalSecond": 1,
- "BeginTime": null,
- "EndTime": null,
- "Remark": null,
- "Creater": "1",
- "CreateDate": "2024-08-23T11:32:26.513",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 3,
- "Name": "娴嬭瘯2",
- "JobGroup": "CommonConveyorLine",
- "AssemblyName": "WIDESEAWCS_Tasks",
- "ClassName": "CommonConveyorLineJob",
- "IntervalSecond": 1,
- "BeginTime": null,
- "EndTime": null,
- "Remark": null,
- "Creater": "1",
- "CreateDate": "2024-08-23T11:32:26.513",
- "Modifier": null,
- "ModifyDate": null
- }
-]
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_Router.tsv" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_Router.tsv"
deleted file mode 100644
index e7010c8..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_Router.tsv"
+++ /dev/null
@@ -1,362 +0,0 @@
-锘縖
- {
- "Id": 42,
- "StartPosi": "101",
- "NextPosi": "102",
- "InOutType": 1,
- "ChildPosi": "102",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T23:34:41.067",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 43,
- "StartPosi": "102",
- "NextPosi": "103",
- "InOutType": 1,
- "ChildPosi": "103",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T23:34:41.07",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 44,
- "StartPosi": "103",
- "NextPosi": "104",
- "InOutType": 1,
- "ChildPosi": "104",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T23:34:41.07",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 45,
- "StartPosi": "104",
- "NextPosi": "105",
- "InOutType": 1,
- "ChildPosi": "105",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T23:34:41.07",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 46,
- "StartPosi": "105",
- "NextPosi": "106",
- "InOutType": 1,
- "ChildPosi": "106",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T23:34:41.073",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 47,
- "StartPosi": "106",
- "NextPosi": "107",
- "InOutType": 1,
- "ChildPosi": "107",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T23:34:41.073",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 48,
- "StartPosi": "107",
- "NextPosi": "108",
- "InOutType": 1,
- "ChildPosi": "108",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T23:34:41.073",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 49,
- "StartPosi": "108",
- "NextPosi": "109",
- "InOutType": 1,
- "ChildPosi": "109",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T23:34:41.073",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 50,
- "StartPosi": "109",
- "NextPosi": "110",
- "InOutType": 1,
- "ChildPosi": "110",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T23:34:41.077",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 51,
- "StartPosi": "110",
- "NextPosi": "SC01",
- "InOutType": 1,
- "ChildPosi": "SC01",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": 1,
- "SrmColumn": 100,
- "SrmLayer": 1,
- "Depth": 1,
- "IsEnd": true,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-23T23:34:41.077",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 52,
- "StartPosi": "SC01",
- "NextPosi": "111",
- "InOutType": 2,
- "ChildPosi": "111",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": 2,
- "SrmColumn": 100,
- "SrmLayer": 1,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-25T00:05:09.283",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 53,
- "StartPosi": "111",
- "NextPosi": "112",
- "InOutType": 2,
- "ChildPosi": "112",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-25T00:05:09.287",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 54,
- "StartPosi": "112",
- "NextPosi": "113",
- "InOutType": 2,
- "ChildPosi": "113",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-25T00:05:09.287",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 55,
- "StartPosi": "113",
- "NextPosi": "114",
- "InOutType": 2,
- "ChildPosi": "114",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-25T00:05:09.29",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 56,
- "StartPosi": "114",
- "NextPosi": "115",
- "InOutType": 2,
- "ChildPosi": "115",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-25T00:05:09.29",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 57,
- "StartPosi": "115",
- "NextPosi": "116",
- "InOutType": 2,
- "ChildPosi": "116",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-25T00:05:09.29",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 58,
- "StartPosi": "116",
- "NextPosi": "117",
- "InOutType": 2,
- "ChildPosi": "117",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-25T00:05:09.293",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 59,
- "StartPosi": "117",
- "NextPosi": "118",
- "InOutType": 2,
- "ChildPosi": "118",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-25T00:05:09.293",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 60,
- "StartPosi": "118",
- "NextPosi": "119",
- "InOutType": 2,
- "ChildPosi": "119",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": false,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-25T00:05:09.297",
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "Id": 61,
- "StartPosi": "119",
- "NextPosi": "CLOutAreaA",
- "InOutType": 2,
- "ChildPosi": "120",
- "ChildPosiDeviceCode": "1002",
- "SrmRow": null,
- "SrmColumn": null,
- "SrmLayer": null,
- "Depth": 1,
- "IsEnd": true,
- "Remark": null,
- "Creater": "admin",
- "CreateDate": "2024-08-25T00:05:09.297",
- "Modifier": null,
- "ModifyDate": null
- }
-]
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/WIDESEAWCS_SystemRepository.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/WIDESEAWCS_SystemRepository.csproj"
index 08ccccd..c3f928b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/WIDESEAWCS_SystemRepository.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/WIDESEAWCS_SystemRepository.csproj"
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/WIDESEAWCS_SystemServices.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/WIDESEAWCS_SystemServices.csproj"
index ee8e5c7..a179f20 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/WIDESEAWCS_SystemServices.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/WIDESEAWCS_SystemServices.csproj"
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/WIDESEAWCS_TaskInfoRepository.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/WIDESEAWCS_TaskInfoRepository.csproj"
index 45808b9..6818860 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/WIDESEAWCS_TaskInfoRepository.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/WIDESEAWCS_TaskInfoRepository.csproj"
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/WIDESEAWCS_TaskInfoService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/WIDESEAWCS_TaskInfoService.csproj"
index f5e8eda..bb8bc79 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/WIDESEAWCS_TaskInfoService.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/WIDESEAWCS_TaskInfoService.csproj"
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj"
index dc9b032..72ed02d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj"
@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
- <PackageReference Include="WIDESEAWCS_QuartzJob" Version="2.1.0" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
+ <PackageReference Include="WIDESEAWCS_QuartzJob" Version="3.0.9" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/config/buttons.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/config/buttons.js"
index dc84b3a..63ed131 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/config/buttons.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/config/buttons.js"
@@ -93,17 +93,19 @@
}
},
{
- name: "鎵� 鍔� 瀹� 鎴�",
- icon: '',
+ name: "瀹屾垚浠诲姟",
+ icon: 'el-icon-check',
class: '',
+ type: 'success',
value: 'TaskHandCompleted',
onClick: function () {
}
},
{
- name: "鍙� 娑� 浠� 鍔�",
- icon: '',
+ name: "鍙栨秷浠诲姟",
+ icon: 'el-icon-delete',
class: '',
+ type: 'danger',
value: 'TaskHandCancel',
onClick: function () {
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/system/Sys_Role.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/system/Sys_Role.js"
index 5ba4845..197d2fc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/system/Sys_Role.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/system/Sys_Role.js"
@@ -27,7 +27,7 @@
},
onInit() {
//璁剧疆treetable鐨勫敮涓�鍊煎瓧娈�(杩欎釜瀛楁鐨勫�煎湪琛ㄩ噷闈㈠繀椤绘槸鍞竴鐨�)
- this.rowKey="Role_Id";
+ // this.rowKey="Role_Id";
},
/***鍔犺浇鍚庡彴鏁版嵁瑙丼ys_RoleController.cs鏂囦欢***/
loadTreeChildren(tree, treeNode, resolve) { //鍔犺浇瀛愯妭鐐�
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
index 4e7fe7d..cc5c8b9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
@@ -21,14 +21,14 @@
if (TaskHandCancelBtn) {
TaskHandCancelBtn.onClick = function () {
let rows = this.$refs.table.getSelected();
- if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
- if (rows.length > 1) return this.$error("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ if (rows.length == 0) return this.$error("璇烽�夋嫨闇�瑕佸彇娑堜换鍔�!");
+ if (rows.length > 1) return this.$error("璇烽�夋嫨涓�鏉′换鍔�!");
var param = rows[0].taskNum;
this.http
- .post("api/Task/TaskCancel?taskNum="+param, "鏁版嵁澶勭悊涓�...")
+ .post("api/Task/TaskCancel?taskNum="+param, "浠诲姟澶勭悊涓�...")
.then((x) => {
if (x.status) {
- this.$Message.success('浠诲姟鍙栨秷鎴愬姛.');
+ this.$Message.success('浠诲姟鍙栨秷鎴愬姛');
this.refresh();
} else {
return this.$error(x.message);
@@ -40,14 +40,14 @@
if (TaskHandCompletedBtn) {
TaskHandCompletedBtn.onClick = function () {
let rows = this.$refs.table.getSelected();
- if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
- if (rows.length > 1) return this.$error("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ if (rows.length == 0) return this.$error("璇烽�夋嫨闇�瑕佸畬鎴愪换鍔�!");
+ if (rows.length > 1) return this.$error("璇烽�夋嫨涓�鏉′换鍔�!");
var param = rows[0].taskNum;
this.http
- .post("api/Task/TaskCompleted?taskNum="+param, "鏁版嵁澶勭悊涓�...")
+ .post("api/Task/TaskCompleted?taskNum="+param, "浠诲姟澶勭悊涓�...")
.then((x) => {
if (x.status) {
- this.$Message.success('浠诲姟鎵嬪姩瀹屾垚');
+ this.$Message.success('浠诲姟瀹屾垚鎴愬姛');
this.refresh();
} else {
return this.$error(x.message);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue"
index 33c1729..feb18c9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue"
@@ -133,13 +133,13 @@
width: 150,
align: "left",
},
- {
- field: "areaType",
- title: "鍖哄煙绫诲瀷",
- type: "decimal",
- width: 90,
- align: "left",
- },
+ // {
+ // field: "areaType",
+ // title: "鍖哄煙绫诲瀷",
+ // type: "decimal",
+ // width: 90,
+ // align: "left",
+ // },
{
field: "areaStatus",
title: "鍖哄煙鐘舵��",
@@ -152,7 +152,7 @@
field: "areaDes",
title: "鍖哄煙鎻忚堪",
type: "int",
- width: 120,
+ width: 160,
align: "left",
},
{
@@ -166,7 +166,7 @@
field: "createDate",
title: "鍒涘缓鏃堕棿",
type: "datetime",
- width: 160,
+ width: 120,
align: "left",
sort: true,
},
@@ -174,24 +174,24 @@
field: "modifier",
title: "淇敼浜�",
type: "string",
- width: 100,
+ width: 90,
align: "left",
},
{
field: "modifyDate",
title: "淇敼鏃堕棿",
type: "datetime",
- width: 160,
+ width: 120,
align: "left",
sort: true,
},
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
+ // {
+ // field: "remark",
+ // title: "澶囨敞",
+ // type: "string",
+ // width: 100,
+ // align: "left",
+ // },
]);
const detail = ref({
cnName: "#detailCnName",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
index e448d8c..5ff5d87 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
@@ -143,13 +143,6 @@
align: "left",
},
{
- field: "Remark",
- title: "澶囨敞",
- type: "string",
- width: 90,
- align: "left",
- },
- {
field: "creater",
title: "鍒涘缓浜�",
type: "string",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/roadwayInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/roadwayInfo.vue"
index dea7725..e00d8b9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/roadwayInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/roadwayInfo.vue"
@@ -29,7 +29,7 @@
const editFormFields = ref({
roadwayNo: "",
areaId: "",
- enalbeStatus: "",
+ enableStatus: "",
deviceNo: "",
inStationCode: "",
inSCStationCode: "",
@@ -54,7 +54,7 @@
{
title: "绂佺敤鐘舵��",
required: true,
- field: "enalbeStatus",
+ field: "enableStatus",
type: "select",
dataKey: "enableStatusEnum",
data: [],
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/warehouse.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/warehouse.vue"
index 5a25672..42afca2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/warehouse.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/warehouse.vue"
@@ -64,7 +64,7 @@
[
{ title: "浠撳簱缂栧彿", field: "warehouseCode", type: "like" },
{ title: "浠撳簱鍚嶇О", field: "warehouseName", type: "like" },
- { title: "浠撳簱绫诲瀷", field: "warehouseType", type: "like" },
+ // { title: "浠撳簱绫诲瀷", field: "warehouseType", type: "like" },
{
title: "浠撳簱鐘舵��",
field: "warehouseStatus",
@@ -99,13 +99,13 @@
width: 150,
align: "left",
},
- {
- field: "warehouseType",
- title: "浠撳簱绫诲瀷",
- type: "string",
- width: 150,
- align: "left",
- },
+ // {
+ // field: "warehouseType",
+ // title: "浠撳簱绫诲瀷",
+ // type: "string",
+ // width: 150,
+ // align: "left",
+ // },
{
field: "warehouseStatus",
title: "浠撳簱鐘舵��",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/Sys_Role.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/Sys_Role.vue"
index 538b0a7..b5f3126 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/Sys_Role.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/Sys_Role.vue"
@@ -87,7 +87,7 @@
const searchFormOptions = ref([
[
{ title: "瑙掕壊鍚嶇О", field: "roleName", type: "text" },
- { title: "閮ㄩ棬ID", field: "deptId", type: "text" },
+ // { title: "閮ㄩ棬ID", field: "deptId", type: "text" },
{
dataKey: "enable",
data: [],
@@ -135,7 +135,7 @@
title: "閮ㄩ棬ID",
type: "int",
width: 90,
- // hidden: true,
+ hidden: true,
align: "left",
},
// {
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/Sys_User.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/Sys_User.vue"
index 21530cd..7f971d9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/Sys_User.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/Sys_User.vue"
@@ -50,16 +50,16 @@
type: "cascader",
},
],
- [
- {
- dataKey: "缁勭粐鏈烘瀯",
- data: [],
- title: "缁勭粐鏋勬灦",
- field: "deptIds",
- colSize: 12,
- type: "treeSelect",
- },
- ],
+ // [
+ // {
+ // dataKey: "缁勭粐鏈烘瀯",
+ // data: [],
+ // title: "缁勭粐鏋勬灦",
+ // field: "deptIds",
+ // colSize: 12,
+ // type: "treeSelect",
+ // },
+ // ],
[
{
dataKey: "enable",
@@ -80,7 +80,7 @@
},
],
[{ title: "澶囨敞", field: "remark", colSize: 12, type: "textarea" }],
- [{ title: "澶村儚", field: "headImageUrl", type: "img" }],
+ // [{ title: "澶村儚", field: "headImageUrl", type: "img" }],
]);
const searchFormFields = ref({
systemType: "0",
@@ -160,13 +160,13 @@
width: 80,
align: "left",
},
- {
- field: "headImageUrl",
- title: "澶村儚",
- type: "img",
- width: 90,
- align: "left",
- },
+ // {
+ // field: "headImageUrl",
+ // title: "澶村儚",
+ // type: "img",
+ // width: 90,
+ // align: "left",
+ // },
{
field: "dept_Id",
title: "涓嶇敤",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/38b1c5dd-656a-4092-881f-3db66940307e.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/38b1c5dd-656a-4092-881f-3db66940307e.vsidx"
new file mode 100644
index 0000000..82dcaea
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/38b1c5dd-656a-4092-881f-3db66940307e.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/57ae96c1-5e57-4458-b620-36f3c051d823.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/57ae96c1-5e57-4458-b620-36f3c051d823.vsidx"
new file mode 100644
index 0000000..8187ab0
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/57ae96c1-5e57-4458-b620-36f3c051d823.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6f1437fd-2fc1-4910-9d5a-eb569aaa6efe.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6f1437fd-2fc1-4910-9d5a-eb569aaa6efe.vsidx"
new file mode 100644
index 0000000..d646f17
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6f1437fd-2fc1-4910-9d5a-eb569aaa6efe.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9792178d-f937-4c06-9523-5ec0b82b8a84.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9792178d-f937-4c06-9523-5ec0b82b8a84.vsidx"
new file mode 100644
index 0000000..a5cde89
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9792178d-f937-4c06-9523-5ec0b82b8a84.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f92ea823-4793-428b-8373-4040362364da.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f92ea823-4793-428b-8373-4040362364da.vsidx"
new file mode 100644
index 0000000..31b3110
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f92ea823-4793-428b-8373-4040362364da.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs"
index f071b2d..6ab6ce0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs"
@@ -119,8 +119,8 @@
{
locationInfo.Depth = 2;
}
- locationInfo.LocationCode = $"R{initializationLocationDTO.Roadway.ToString().PadLeft(2, '0')}-{locationInfo.Row.ToString().PadLeft(3, '0')}-{locationInfo.Column.ToString().PadLeft(3, '0')}-{locationInfo.Layer.ToString().PadLeft(3, '0')}-{locationInfo.Depth.ToString().PadLeft(2, '0')}";
- locationInfo.LocationName = $"R{initializationLocationDTO.Roadway.ToString().PadLeft(2, '0')}宸烽亾{locationInfo.Row.ToString().PadLeft(3, '0')}琛寋locationInfo.Column.ToString().PadLeft(3, '0')}鍒梴locationInfo.Layer.ToString().PadLeft(3, '0')}灞倇locationInfo.Depth.ToString().PadLeft(2, '0')}娣�";
+ locationInfo.LocationCode = $"{initializationLocationDTO.Roadway.ToString().PadLeft(2, '0')}-{locationInfo.Row.ToString().PadLeft(3, '0')}-{locationInfo.Column.ToString().PadLeft(3, '0')}-{locationInfo.Layer.ToString().PadLeft(3, '0')}-{locationInfo.Depth.ToString().PadLeft(2, '0')}";
+ locationInfo.LocationName = $"{initializationLocationDTO.Roadway.ToString().PadLeft(2, '0')}宸烽亾{locationInfo.Row.ToString().PadLeft(3, '0')}琛寋locationInfo.Column.ToString().PadLeft(3, '0')}鍒梴locationInfo.Layer.ToString().PadLeft(3, '0')}灞倇locationInfo.Depth.ToString().PadLeft(2, '0')}娣�";
}
locationInfos.Add(locationInfo);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs"
index b95398a..0801a3d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs"
@@ -23,6 +23,8 @@
public override WebResponseContent AddData(SaveModel saveModel)
{
+ saveModel.MainData["warehouseType"] = 1;
+ saveModel.MainData["warehouseStatus"] = 1;
Dt_Warehouse warehouse = saveModel.MainData.DicToModel<Dt_Warehouse>();
return base.AddData(warehouse);
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs"
index 7136886..9a5703d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs"
@@ -41,7 +41,7 @@
[ImporterHeader(Name = "鍒涘缓鑰�")]
[ExporterHeader(DisplayName = "鍒涘缓鑰�")]
[SugarColumn(IsNullable = false, Length = 50, IsOnlyIgnoreUpdate = true, ColumnDescription = "鍒涘缓鑰�")]
- public string Creater { get; set; }
+ public string Creater { get; set; } = "System";
/// <summary>
/// 鍒涘缓鏃堕棿
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs"
index e0bf4a7..4bdd855 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs"
@@ -153,40 +153,11 @@
/// </summary>
[Description("鍏ュ簱浠诲姟寮傚父")]
InException = 299,
-
- /// <summary>
- /// 鏂板缓绉诲簱浠诲姟
- /// </summary>
- [Description("鏂板缓绉诲簱浠诲姟")]
- RelocationNew = 300,
-
- /// <summary>
- /// 绉诲簱浠诲姟瀹屾垚
- /// </summary>
- [Description("绉诲簱浠诲姟瀹屾垚")]
- RelocationFinish = 310,
-
- /// <summary>
- /// 绉诲簱浠诲姟鎵ц涓�
- /// </summary>
- [Description("绉诲簱浠诲姟鎵ц涓�")]
- RelocationExecuting = 320,
-
- /// <summary>
- /// 绉诲簱浠诲姟鍙栨秷
- /// </summary>
- [Description("绉诲簱浠诲姟鍙栨秷")]
- RelocationCancel = 330,
-
- /// <summary>
- /// 绉诲簱浠诲姟寮傚父
- /// </summary>
- [Description("绉诲簱浠诲姟寮傚父")]
- RelocationException = 340,
}
#endregion 鍏ュ簱浠诲姟鐘舵��
+ #region 鍑哄簱浠诲姟鐘舵��
/// <summary>
/// 鍑哄簱浠诲姟鐘舵��
/// </summary>
@@ -228,16 +199,74 @@
[Description("鍑哄簱浠诲姟寮傚父")]
OutException = 199
}
+ #endregion
+ #region 绉诲簱浠诲姟鐘舵��
+ public enum RelocationTaskStatusEnum
+ {
+
+ /// <summary>
+ /// 鏂板缓绉诲簱浠诲姟
+ /// </summary>
+ [Description("鏂板缓绉诲簱浠诲姟")]
+ RelocationNew = 300,
+
+ /// <summary>
+ /// 绉诲簱浠诲姟鎵ц涓�
+ /// </summary>
+ [Description("绉诲簱浠诲姟鎵ц涓�")]
+ RelocationExecuting = 310,
+
+ /// <summary>
+ /// 绉诲簱浠诲姟瀹屾垚
+ /// </summary>
+ [Description("绉诲簱浠诲姟瀹屾垚")]
+ RelocationFinish = 320,
+
+ /// <summary>
+ /// 绉诲簱浠诲姟鍙栨秷
+ /// </summary>
+ [Description("绉诲簱浠诲姟鍙栨秷")]
+ RelocationCancel = 398,
+
+ /// <summary>
+ /// 绉诲簱浠诲姟寮傚父
+ /// </summary>
+ [Description("绉诲簱浠诲姟寮傚父")]
+ RelocationException = 399,
+ }
+ #endregion
+
+ #region AGV浠诲姟鐘舵��
public enum AGVTaskStatusEnum
{
+ /// <summary>
+ /// 鏂板缓
+ /// </summary>
[Description("鏂板缓")]
AGV_New = 500,
-
- [Description("鎵ц涓�")]
+ /// <summary>
+ /// AGV鎵ц涓�
+ /// </summary>
+ [Description("AGV鎵ц涓�")]
AGV_Executing = 510,
+ /// <summary>
+ /// AGV瀹屾垚
+ /// </summary>
+ [Description("AGV瀹屾垚")]
+ AGV_Finish = 520,
- [Description("瀹屾垚")]
- AGV_Finish = 520
- }
+ /// <summary>
+ /// AGV浠诲姟鍙栨秷
+ /// </summary>
+ [Description("AGV浠诲姟鍙栨秷")]
+ RelocationCancel = 598,
+
+ /// <summary>
+ /// AGV浠诲姟寮傚父
+ /// </summary>
+ [Description("AGV浠诲姟寮傚父")]
+ RelocationException = 599,
+ }
+ #endregion
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/ISys_DictionaryRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/ISys_DictionaryRepository.cs"
index 7dd28c6..1b64071 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/ISys_DictionaryRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/ISys_DictionaryRepository.cs"
@@ -4,12 +4,15 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.BaseRepository;
+using WIDESEA_DTO.System;
using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.System;
namespace WIDESEA_ISystemRepository
{
public interface ISys_DictionaryRepository : IRepository<Sys_Dictionary>
{
IEnumerable<Sys_Dictionary> GetDictionaries(IEnumerable<string> dicNos, bool executeSql = true);
+ IEnumerable<VueDictionaryDTO> GetDictionaries(IEnumerable<string> dicNos, List<RoleNodes> roleNodes, bool executeSql = true);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs"
index 9670987..9f13f57 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs"
@@ -17,7 +17,7 @@
[SugarColumn(IsNullable = true, ColumnDescription = "鍖哄煙涓婚敭")]
public int AreaId { get; set; }
- [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "璐т綅缂栧彿")]
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "璐т綅缂栧彿")]
public string LocationCode { get; set; }
[SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "璐т綅鍚嶇О")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_DictionaryRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_DictionaryRepository.cs"
index a235134..958979e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_DictionaryRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_DictionaryRepository.cs"
@@ -5,20 +5,126 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
+using WIDESEA_DTO.System;
using WIDESEA_ISystemRepository;
using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.System;
namespace WIDESEA_SystemRepository
{
public class Sys_DictionaryRepository : RepositoryBase<Sys_Dictionary>, ISys_DictionaryRepository
{
-
+
public Sys_DictionaryRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
{
-
+
}
+
+ #region 鏌ヨ鏁版嵁搴搒elect鏂规硶
+ public class SourceKeyVaule
+ {
+ public int id { get; set; }
+ public int parentId { get; set; }
+ public string DicName { get; set; }
+ public int DicValue { get; set; }
+ }
+ public IEnumerable<VueDictionaryDTO> GetDictionaries(IEnumerable<string> dicNos, List<RoleNodes> roleNodes, bool executeSql = true)
+ {
+ List<Sys_Dictionary> Dictionaries = GetAllDictionary();
+ List<VueDictionaryDTO> DictionaryDTO = new List<VueDictionaryDTO>();
+
+
+ foreach (var item in Dictionaries.Where(x => dicNos.Contains(x.DicNo)))
+ {
+ VueDictionaryDTO dictionaryDTO = new VueDictionaryDTO();
+ dictionaryDTO.DicNo = item.DicNo;
+ dictionaryDTO.Config = item.Config;
+ dictionaryDTO.Data = item.DicList.OrderByDescending(o => o.OrderNo).Select(list => new { key = list.DicValue, value = list.DicName });
+ if (executeSql)
+ {
+ // 2020.05.01澧炲姞鏍规嵁鐢ㄦ埛淇℃伅鍔犺浇瀛楀吀鏁版嵁婧恠ql
+ string sql = item.Sql;
+ if (!string.IsNullOrEmpty(sql))
+ {
+ dictionaryDTO.Data = item.DicNo == "tree_roles" ?
+ QueryRole(GetCustomDBSql(item.DicNo, sql, roleNodes)).OrderBy(x => x.id).Select(list => new { id = list.id, parentId = list.parentId, key = list.DicValue, value = list.DicName }) : Query(GetCustomDBSql(item.DicNo, sql, roleNodes)).OrderByDescending(o => o.OrderNo).Select(list => new { key = list.DicValue, value = list.DicName });
+ }
+ }
+ DictionaryDTO.Add(dictionaryDTO);
+ }
+ return DictionaryDTO;
+ }
+
+ List<SourceKeyVaule> QueryRole(string sql)
+ {
+ try
+ {
+ return base.QueryDynamicDataBySql(sql, null).Select(s => new SourceKeyVaule()
+ {
+ id = s.id,
+ parentId = s.parentId,
+ DicName = s.value,
+ DicValue = s.key
+ }).ToList();
+ }
+ catch (Exception ex)
+ {
+ return new List<SourceKeyVaule>();
+ }
+ }
+ /// <summary>
+ /// 鑾峰彇鑷畾涔夋暟鎹簮sql
+ /// </summary>
+ /// <param name="dicNo"></param>
+ /// <param name="originalSql"></param>
+ /// <returns></returns>
+ public static string GetCustomDBSql(string dicNo, string originalSql, List<RoleNodes> roleNodes)
+ {
+ switch (dicNo)
+ {
+ case "roles":
+ //2020.05.24澧炲姞缁戝畾table琛ㄦ椂锛岃幏鍙栨墍鏈夌殑瑙掕壊鍒楄〃
+ //娉ㄦ剰锛屽鏋滄槸2020.05.24涔嬪墠鑾峰彇鐨勬暟鎹簱鑴氭湰
+ //璇峰湪鑿滃崟銆愪笅鎷夋缁戝畾璁剧疆銆戞坊鍔犱竴涓瓧鍏哥紪鍙枫�恡_roles銆�,闄や簡瀛楀吀缂栧彿锛屽叾浠栧唴瀹归殢渚垮～鍐�
+ case "t_roles":
+ case "tree_roles":
+ originalSql = GetRolesSql(originalSql, roleNodes);
+ break;
+ default:
+ break;
+ }
+ return originalSql;
+ }
+ /// <summary>
+ /// 鑾峰彇瑙ｅ喅鐨勬暟鎹簮锛屽彧鑳界湅鍒拌嚜宸变笌涓嬬骇鎵�鏈夎鑹�
+ /// </summary>
+ /// <param name="context"></param>
+ /// <param name="originalSql"></param>
+ /// <returns></returns>
+ public static string GetRolesSql(string originalSql, List<RoleNodes> roleNodes)
+ {
+ if (App.User.IsSuperAdmin)
+ {
+ return originalSql;
+ }
+
+ var RoleNodes = roleNodes.Where(x => x.Id == App.User.RoleId)
+ .Select(s => new RoleNodes()
+ {
+ Id = s.Id,
+ ParentId = 0,//灏嗚嚜宸辩殑瑙掕壊浣滀负root鑺傜偣
+ RoleName = s.RoleName
+ }).ToList();
+ List<int> roleIds = roleNodes.Select(x => x.Id).ToList();
+ //roleIds.Add(App.User.RoleId);
+
+ return originalSql = $@"SELECT RoleId as 'key',RoleId AS id,ParentId AS parentId,RoleName as 'value' FROM Sys_Role
+ WHERE Enable=1 and RoleId in ({string.Join(',', roleIds)})";
+ }
+ #endregion
/// <summary>
///
@@ -58,7 +164,7 @@
}
catch (Exception ex)
{
- throw ex;
+ return new List<Sys_DictionaryList>();
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
index 9743d4b..bc930a9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
@@ -25,11 +25,13 @@
{
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly ICacheService _cacheService;
+ private readonly ISys_RoleService _sys_RoleService;
- public Sys_DictionaryService(ISys_DictionaryRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService) : base(BaseDal)
+ public Sys_DictionaryService(ISys_DictionaryRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_RoleService sys_RoleService) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_cacheService = cacheService;
+ _sys_RoleService = sys_RoleService;
}
public ISys_DictionaryRepository Repository => BaseDal;
@@ -54,6 +56,29 @@
List<VueDictionaryDTO> vueDictionaryDTOs = new List<VueDictionaryDTO>();
List<string> cacheDicNos = new List<string>();
+ #region 鏌ヨ鏁版嵁搴撲笅鎷夋鏁版嵁
+ if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
+ {
+ var selectDics = BaseDal.GetDictionaries(dicNos.Where(x => !cacheDicNos.Contains(x)), _sys_RoleService.GetAllChildren(App.User.RoleId));
+
+ foreach (var item in selectDics)
+ {
+ if (!_cacheService.Exists(item.DicNo))
+ {
+ vueDictionaryDTOs.Add(item);
+ }
+ else
+ {
+ VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(_cacheService.Get(item.DicNo));
+ if (vueDictionary != null && vueDictionary.Data.ToJson() != item.Data.ToJson())
+ {
+ vueDictionaryDTOs.Add(item);
+ _cacheService.AddOrUpdate(item.DicNo, item.Serialize());
+ }
+ }
+ }
+ }
+ #endregion
foreach (string n in dicNos)
{
string str = _cacheService.Get(n);
@@ -61,47 +86,13 @@
{
VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(str);
- if (vueDictionary != null)
+ if (vueDictionary != null && vueDictionaryDTOs.Where(x => x.DicNo == vueDictionary.DicNo).FirstOrDefault() == null)
{
vueDictionaryDTOs.Add(vueDictionary);
cacheDicNos.Add(n);
}
}
}
- if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
- {
- List<VueDictionaryDTO> selectDics = BaseDal.GetDictionaries(dicNos.Where(x => !cacheDicNos.Contains(x))).Select(s => new VueDictionaryDTO
- {
- DicNo = s.DicNo,
- Config = s.Config,
- //dbSql = s.Sql,
- Data = s.DicList.OrderByDescending(o => o.OrderNo).Select(list => new { key = list.DicValue, value = list.DicName })
- }).ToList();
-
- foreach (var item in selectDics)
- {
- if (!_cacheService.Exists(item.DicNo))
- {
- _cacheService.Add(item.DicNo, item.Serialize());
- }
- }
- vueDictionaryDTOs.AddRange(selectDics);
- }
-
- //object GetSourceData(string dicNo, string dbSql, object data)
- //{
- // if (string.IsNullOrEmpty(dbSql))
- // {
- // return data;
- // }
- // return BaseDal.QueryObjectDataBySql(dbSql, null);
- //}
- //List<VueDictionaryDTO> vueDictionaryDTOs = dicConfig.Select(item => new VueDictionaryDTO
- //{
- // DicNo = item.dicNo,
- // Config = item.config,
- // Data = GetSourceData(item.dicNo, item.dbSql, item.list)
- //}).ToList();
try
{
@@ -117,8 +108,9 @@
foreach (var item in dics)
{
+ if (dicList.Contains(item))
+ cusDics.Add(item);
dicList.Remove(item);
- cusDics.Add(item);
}
foreach (var item in cusDics)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_RoleService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_RoleService.cs"
index 030a5ea..3092a7b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_RoleService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_RoleService.cs"
@@ -239,7 +239,7 @@
x.AuthValue = "";
});
//灏嗗彇娑堢殑鏉冮檺璁剧疆涓�""
- _RoleAuthRepository.UpdateData(delAuths);
+ _RoleAuthRepository.DeleteData(delAuths);
int addCount = updateAuths.Where(x => x.AuthId <= 0).Count();
int updateCount = updateAuths.Where(x => x.AuthId > 0).Count();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
index 33d19d7..363855a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
@@ -352,7 +352,7 @@
Roadway = location.RoadwayNo,
SourceAddress = location.LocationCode,
TargetAddress = locationInfos.LocationCode,
- TaskStatus = InTaskStatusEnum.RelocationNew.ObjToInt(),
+ TaskStatus = RelocationTaskStatusEnum.RelocationNew.ObjToInt(),
TaskType = TaskTypeEnum.Relocation.ObjToInt(),
Depth= location.Depth,
TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index dfd5943..336fc38 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -199,7 +199,7 @@
}
else if (task.TaskType == TaskTypeEnum.Relocation.ObjToInt())
{
- task.TaskStatus = InTaskStatusEnum.RelocationExecuting.ObjToInt();
+ task.TaskStatus = RelocationTaskStatusEnum.RelocationExecuting.ObjToInt();
}
else
{
@@ -451,7 +451,7 @@
_basicService.LocationInfoService.RelocationFree(locationEnd, task.TaskNum);
- task.TaskStatus = InTaskStatusEnum.RelocationFinish.ObjToInt();
+ task.TaskStatus = RelocationTaskStatusEnum.RelocationFinish.ObjToInt();
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
_unitOfWorkManage.CommitTran();
@@ -647,7 +647,7 @@
_basicService.LocationInfoService.RelocationFree(locationStart, task.TaskNum);
_basicService.LocationInfoService.Repository.UpdateData(locationEnd);
- task.TaskStatus = InTaskStatusEnum.RelocationCancel.ObjToInt();
+ task.TaskStatus = RelocationTaskStatusEnum.RelocationCancel.ObjToInt();
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
_unitOfWorkManage.CommitTran();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Log/System/API\350\257\267\346\261\202/2025-05-28/\344\273\273\345\212\241\345\256\214\346\210\220250528.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Log/System/API\350\257\267\346\261\202/2025-05-28/\344\273\273\345\212\241\345\256\214\346\210\220250528.txt"
new file mode 100644
index 0000000..ff14e5d
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Log/System/API\350\257\267\346\261\202/2025-05-28/\344\273\273\345\212\241\345\256\214\346\210\220250528.txt"
@@ -0,0 +1,5 @@
+2025/5/28 10:55:04.16
+璇锋眰寮傚父
+{"璇锋眰鎶ユ枃":"","鎺ユ敹鎶ユ枃":"","閿欒":"鐢变簬鐩爣璁＄畻鏈虹Н鏋佹嫆缁濓紝鏃犳硶杩炴帴銆� [::ffff:127.0.0.1]:9291 (localhost:9291)"}
+-------------------------------
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
index 6057083..fc5280b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
@@ -12,7 +12,7 @@
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
//杩炴帴瀛楃涓�
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_TEST;User ID=sa;Password=sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_ZH;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
"PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\346\226\207\344\273\266/\344\270\255\345\222\214\347\253\213\344\275\223\345\272\223\345\222\214AGV\350\275\257\344\273\266\347\263\273\347\273\237\351\227\256\351\242\230\346\270\205\345\215\225\357\274\210\347\254\254\344\272\214\346\254\241\346\262\237\351\200\232\357\274\211-20204.08.06.xls" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\346\226\207\344\273\266/\344\270\255\345\222\214\347\253\213\344\275\223\345\272\223\345\222\214AGV\350\275\257\344\273\266\347\263\273\347\273\237\351\227\256\351\242\230\346\270\205\345\215\225\357\274\210\347\254\254\344\272\214\346\254\241\346\262\237\351\200\232\357\274\211-20204.08.06.xls"
index ca5c731..eb17e1a 100644
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\346\226\207\344\273\266/\344\270\255\345\222\214\347\253\213\344\275\223\345\272\223\345\222\214AGV\350\275\257\344\273\266\347\263\273\347\273\237\351\227\256\351\242\230\346\270\205\345\215\225\357\274\210\347\254\254\344\272\214\346\254\241\346\262\237\351\200\232\357\274\211-20204.08.06.xls"
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\346\226\207\344\273\266/\344\270\255\345\222\214\347\253\213\344\275\223\345\272\223\345\222\214AGV\350\275\257\344\273\266\347\263\273\347\273\237\351\227\256\351\242\230\346\270\205\345\215\225\357\274\210\347\254\254\344\272\214\346\254\241\346\262\237\351\200\232\357\274\211-20204.08.06.xls"
Binary files differ
--
Gitblit v1.9.3