From 2d9de97cab8500780c61d3158504dcfbf5384980 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 10 六月 2025 21:23:51 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 14 ++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Modified_Date.json | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneDBName.cs | 58 ++++++++++++++----
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs | 6 +-
/dev/null | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/2009afbf-e648-4be8-a428-153db2ee17f1.vsidx | 0
项目资料/项目文件/WMS.sql | 10 +-
项目资料/项目文件/中和WCS----PLC交互地址.xlsx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs | 2
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/21edf12a-b813-4b5a-aa52-b48404c6b5b7.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerStatusEnum.cs | 16 ++--
项目资料/项目文件/WCS.sql | 54 ++++++++++++------
13 files changed, 112 insertions(+), 52 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/2009afbf-e648-4be8-a428-153db2ee17f1.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/2009afbf-e648-4be8-a428-153db2ee17f1.vsidx"
new file mode 100644
index 0000000..d59ecf6
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/2009afbf-e648-4be8-a428-153db2ee17f1.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/82db70ab-3e0c-467b-8fab-dd8ff6fa03b0.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/82db70ab-3e0c-467b-8fab-dd8ff6fa03b0.vsidx"
deleted file mode 100644
index 38ebe2b..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/82db70ab-3e0c-467b-8fab-dd8ff6fa03b0.vsidx"
+++ /dev/null
Binary files differ
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 fba16f1..02134be 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":"2025-06-03"}
\ No newline at end of file
+{"MM":"1","LogTime":"2025-06-10"}
\ 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_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 2292796..06cc8ad 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -37,6 +37,15 @@
SpeStackerCrane speStackerCrane = (SpeStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
if (speStackerCrane != null)
{
+ var DeviceStatu = speStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.DeviceStatus);
+ var StackerCraneStatu = speStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.StackerCraneStatus);
+ speStackerCrane.SetValue(StackerCraneDBName.StartRow, 1);
+ speStackerCrane.SetValue(StackerCraneDBName.StartColumn, 2);
+ speStackerCrane.SetValue(StackerCraneDBName.StartLayer, 3);
+ speStackerCrane.SetValue(StackerCraneDBName.EndRow, 4);
+ speStackerCrane.SetValue(StackerCraneDBName.EndColumn, 5);
+ speStackerCrane.SetValue(StackerCraneDBName.EndLayer, 2);
+
GetStackerObject getStackerObject = new GetStackerObject(speStackerCrane);
if (!getStackerObject.IsEventSubscribed)
{
@@ -46,7 +55,7 @@
{
getStackerObject.CheckStackerCraneTaskCompleted();//妫�娴嬪爢鍨涙満浠诲姟瀹屾垚浜嬩欢
- if(getStackerObject.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
+ if (getStackerObject.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
{
Dt_Task? task = GetTask(speStackerCrane);
if (task != null)
@@ -57,6 +66,7 @@
bool sendFlag = getStackerObject.SendCommand(stackerCraneTaskCommand);
if (sendFlag)
{
+ speStackerCrane.SetValue(StackerCraneDBName.CommandSend, 1);//鍚姩鍛戒护
speStackerCrane.LastTaskType = task.TaskType;
_taskService.UpdateTaskStatusToNext(task.TaskNum);
}
@@ -117,7 +127,7 @@
else
{
task = _taskService.QueryStackerCraneOutTask(speStackerCrane.DeviceCode);
- if(task == null)
+ if (task == null)
{
task = _taskService.QueryStackerCraneInTask(speStackerCrane.DeviceCode);
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs"
index bf711bf..adf2ed8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs"
@@ -49,7 +49,7 @@
/// </summary>
/// <param name="speStackerCrane"></param>
/// <returns></returns>
- public int WorkCommandValue() => _speStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkCommand);
+ //public int WorkCommandValue() => _speStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkCommand);
/// <summary>
/// 鑾峰彇鍫嗗灈鏈鸿澶囩姸鎬�
@@ -214,9 +214,9 @@
_speStackerCrane.SetValue(StackerCraneDBName.EndRow, command.EndRow);
_speStackerCrane.SetValue(StackerCraneDBName.EndColumn, command.EndColumn);
_speStackerCrane.SetValue(StackerCraneDBName.EndLayer, command.EndLayer);
- _speStackerCrane.SetValue(StackerCraneDBName.Barcode, command.Barcode);
+ //_speStackerCrane.SetValue(StackerCraneDBName.Barcode, command.Barcode);
_speStackerCrane.SetValue(StackerCraneDBName.WorkType, command.WorkType);
- _speStackerCrane.SetValue(StackerCraneDBName.TrayType, command.TrayType);
+ //_speStackerCrane.SetValue(StackerCraneDBName.WorkType, command.TrayType);
return true;
}
return false;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneDBName.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneDBName.cs"
index 5ce5c33..9c1397a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneDBName.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneDBName.cs"
@@ -26,13 +26,15 @@
{
public enum StackerCraneDBName
{
+ #region WCS==銆嬪爢鍨涙満
/// <summary>
/// 浠诲姟鍙�
/// </summary>
TaskNum,
/// <summary>
- /// 浣滀笟绫诲瀷
+ /// 浣滀笟绫诲瀷<br/>
+ /// 1鍏�2鍑�3绉诲簱
/// </summary>
WorkType,
@@ -67,38 +69,66 @@
EndLayer,
/// <summary>
- /// 鎵樼洏鍙�
+ /// 鍚姩鍛戒护<br/>
+ /// 1涓哄惎鍔�,鏀跺埌MW1512=1瀹屾垚淇″彿鍚庡紑鍚俊鍙风粰2鍙嶉缁橮LC,PLC娓呭畬鎴愪俊鍙�1--0
/// </summary>
- Barcode,
+ CommandSend,
+ #endregion
+
+ #region 鍫嗗灈鏈�==銆媁CS
/// <summary>
- /// 鎵樼洏绫诲瀷
+ /// 鍫嗗灈鏈哄彿
/// </summary>
- TrayType,
+ DeviceName,
/// <summary>
- /// 璁惧鐘舵��
+ /// 璁惧鐘舵��<br/>
+ /// 5锛氳仈鏈鸿嚜鍔�4锛氭湰鏈鸿嚜鍔�/鍗婅嚜鍔�3锛氭墜鍔�2锛氳皟璇�1锛氳嚜瀛︿範
/// </summary>
- StackerCraneStatus,
+ DeviceStatus,
/// <summary>
- /// 宸ヤ綔妯″紡
+ /// 杩愯鐘舵��<br/>
+ /// 1绌洪棽锛�2鎺ユ敹鎸囦护锛�3绌鸿浇绉诲姩,4鍙栬揣锛�5鍙栬揣瀹屾垚<br/>
+ /// 6婊¤浇绉诲姩锛�7鍗歌揣锛�8鍏ュ簱瀹屾垚锛�9鍑哄簱瀹屾垚锛�10鎵嬪姩鍒犻櫎浠诲姟
/// </summary>
- StackerCraneAutoStatus,
+ RunStatus,
/// <summary>
- /// 宸ヤ綔鐘舵��
+ /// 浠诲姟鍙�
/// </summary>
- StackerCraneWorkStatus,
+ CurrentTaskNum,
/// <summary>
- /// 浠诲姟瀹屾垚
+ /// 浠诲姟瀹屾垚<br/>
+ /// 1瀹屾垚,2鍙栨秷銆�
/// </summary>
StackerCraneTaskCompleted,
/// <summary>
- /// 浣滀笟鍛戒护
+ /// 褰撳墠鎺�
/// </summary>
- WorkCommand
+ AccuRow,
+ /// <summary>
+ /// 褰撳墠鍒�
+ /// </summary>
+ AccuColumn,
+ /// <summary>
+ /// 褰撳墠灞�
+ /// </summary>
+ AccuLayer,
+
+ /// <summary>
+ /// 璁惧鐘舵��<br/>
+ /// 1鍑嗗灏辩华0鏈氨缁紱鍑嗗灏辩华鍙笅鍙戝爢鍨涙満浠诲姟
+ /// </summary>
+ StackerCraneStatus,
+
+ /// <summary>
+ /// 鏁呴殰浠ｇ爜
+ /// </summary>
+ Err_Status,
+ #endregion
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerStatusEnum.cs"
index 587137d..b3411d2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerStatusEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerStatusEnum.cs"
@@ -29,31 +29,31 @@
/// 缁翠慨/缁存姢/淇濆吇
/// </summary>
[Description("缁翠慨")]
- Maintenance=2,
+ Maintenance = 2,
/// <summary>
/// 鎵嬪姩
/// </summary>
[Description("鎵嬪姩")]
- Manual=3,
+ Manual = 3,
/// <summary>
/// 鏈満鑷姩
/// </summary>
[Description("鏈満鑷姩")]
- SemiAutomatic=4,
+ SemiAutomatic = 4,
/// <summary>
/// 鑱旀満
/// </summary>
[Description("鑱旀満")]
- Automatic=5,
+ Automatic = 5,
/// <summary>
/// 鏈煡
/// </summary>
[Description("鏈煡")]
- Unkonw=6
+ Unkonw = 6
}
public enum StackerCraneWorkStatus
@@ -62,7 +62,7 @@
/// 寰呮満
/// </summary>
[Description("寰呮満")]
- Standby=1,
+ Standby = 1,
/// <summary>
/// 鏀跺埌浠诲姟
@@ -86,7 +86,7 @@
/// 鍙栬揣鍚庣Щ鍔�
/// </summary>
[Description("鍙栬揣鍚庣Щ鍔�")]
- PickAfterMove=6,
+ PickAfterMove = 6,
/// <summary>
/// 鏀捐揣涓�
@@ -119,7 +119,7 @@
/// 浠诲姟瀹屾垚
/// </summary>
[Description("浠诲姟瀹屾垚")]
- WorkCompleted=1,
+ WorkCompleted = 1,
/// <summary>
/// 鏈煡
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a15af72d-cadb-4f43-be5a-3770c0ed83df.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/21edf12a-b813-4b5a-aa52-b48404c6b5b7.vsidx"
similarity index 60%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a15af72d-cadb-4f43-be5a-3770c0ed83df.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/21edf12a-b813-4b5a-aa52-b48404c6b5b7.vsidx"
index 9dc3627..4e757d6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a15af72d-cadb-4f43-be5a-3770c0ed83df.vsidx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/21edf12a-b813-4b5a-aa52-b48404c6b5b7.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
index f473d5d..c2016d0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
@@ -76,6 +76,7 @@
private Dt_LocationInfo EmptyAssignLocation(string roadway)
{
List<LocationGroupDTO> locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, LocationStatusEnum.Pallet);
+ ///鏍规嵁宸烽亾杩涜鎺掑簭
if (locationGroups != null && locationGroups.Count > 0)
{
LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt()|| x.EnableStatusA == EnableStatusEnum.OnlyIn.ObjToInt());
@@ -96,6 +97,7 @@
private Dt_LocationInfo StoredAssignLocation(string roadway)
{
List<LocationGroupDTO> locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, LocationStatusEnum.InStock);
+ ///鏍规嵁宸烽亾杩涜鎺掑簭
if (locationGroups != null && locationGroups.Count > 0)
{
LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusA == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt());
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
index d19e649..2d0a5ee 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
@@ -22,7 +22,7 @@
_repository = repository;
}
- [HttpPost, Route("InitializationLocation"), AllowAnonymous]
+ [HttpPost, Route("InitializationLocation")]
public WebResponseContent InitializationLocation([FromBody] InitializationLocationDTO initializationLocationDTO)
{
return Service.InitializationLocation(initializationLocationDTO);
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/WCS.sql" "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/WCS.sql"
index dfbb0e5..7ff5f55 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/WCS.sql"
+++ "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/WCS.sql"
@@ -11,7 +11,7 @@
Target Server Version : 13001601
File Encoding : 65001
- Date: 06/06/2025 12:18:51
+ Date: 10/06/2025 21:23:20
*/
@@ -154,13 +154,13 @@
SET IDENTITY_INSERT [dbo].[Dt_DeviceInfo] ON
GO
-INSERT INTO [dbo].[Dt_DeviceInfo] ([Id], [DeviceCode], [DeviceName], [DeviceType], [DeviceStatus], [DeviceIp], [DevicePort], [DevicePlcType], [DeviceRemark], [Creater], [CreateDate], [Modifier], [ModifyDate], [DispatchId]) VALUES (N'1', N'R01', N'1鍙峰爢鍨涙満', N'SpeStackerCrane', N'1', N'127.0.0.1', N'502', N'ModbusTcp', NULL, N'System', N'2024-10-21 10:18:08.477', N'admin', N'2024-11-08 10:25:10.393', N'4')
+INSERT INTO [dbo].[Dt_DeviceInfo] ([Id], [DeviceCode], [DeviceName], [DeviceType], [DeviceStatus], [DeviceIp], [DevicePort], [DevicePlcType], [DeviceRemark], [Creater], [CreateDate], [Modifier], [ModifyDate], [DispatchId]) VALUES (N'1', N'FL_SC01', N'1鍙峰爢鍨涙満', N'SpeStackerCrane', N'1', N'192.168.1.5', N'502', N'InovanceTcp', NULL, N'System', N'2024-10-21 10:18:08.477', N'admin', N'2024-11-08 10:25:10.393', N'4')
GO
-INSERT INTO [dbo].[Dt_DeviceInfo] ([Id], [DeviceCode], [DeviceName], [DeviceType], [DeviceStatus], [DeviceIp], [DevicePort], [DevicePlcType], [DeviceRemark], [Creater], [CreateDate], [Modifier], [ModifyDate], [DispatchId]) VALUES (N'1004', N'R02', N'2鍙峰爢鍨涙満', N'SpeStackerCrane', N'0', N'127.0.0.1', N'501', N'ModbusTcp', NULL, N'System', N'2024-11-11 08:57:48.343', NULL, NULL, N'4')
+INSERT INTO [dbo].[Dt_DeviceInfo] ([Id], [DeviceCode], [DeviceName], [DeviceType], [DeviceStatus], [DeviceIp], [DevicePort], [DevicePlcType], [DeviceRemark], [Creater], [CreateDate], [Modifier], [ModifyDate], [DispatchId]) VALUES (N'1004', N'CP_SC01', N'2鍙峰爢鍨涙満', N'SpeStackerCrane', N'0', N'127.0.0.1', N'501', N'ModbusTcp', NULL, N'System', N'2024-11-11 08:57:48.343', NULL, NULL, N'4')
GO
-INSERT INTO [dbo].[Dt_DeviceInfo] ([Id], [DeviceCode], [DeviceName], [DeviceType], [DeviceStatus], [DeviceIp], [DevicePort], [DevicePlcType], [DeviceRemark], [Creater], [CreateDate], [Modifier], [ModifyDate], [DispatchId]) VALUES (N'1005', N'Line01', N'杈撻�佺嚎', N'CommonConveyorLine', N'1', N'192.168.0.86', N'103', N'SiemensS7', NULL, N'System', N'2025-05-29 15:52:45.000', NULL, NULL, N'1007')
+INSERT INTO [dbo].[Dt_DeviceInfo] ([Id], [DeviceCode], [DeviceName], [DeviceType], [DeviceStatus], [DeviceIp], [DevicePort], [DevicePlcType], [DeviceRemark], [Creater], [CreateDate], [Modifier], [ModifyDate], [DispatchId]) VALUES (N'1005', N'Line01', N'杈撻�佺嚎', N'CommonConveyorLine', N'0', N'192.168.0.86', N'103', N'SiemensS7', NULL, N'System', N'2025-05-29 15:52:45.000', NULL, NULL, N'1007')
GO
SET IDENTITY_INSERT [dbo].[Dt_DeviceInfo] OFF
@@ -314,43 +314,61 @@
SET IDENTITY_INSERT [dbo].[Dt_DeviceProtocol] ON
GO
-INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'1', N'1', N'R01', N'DBW', N'28.0', N'int', N'1', N'StackerCraneTaskCompleted', N'StackerCraneTaskCompleted', N'浠诲姟瀹屾垚淇″彿', NULL, N'admin', N'2024-10-21 10:18:12.610', N'admin', N'2024-11-08 10:25:10.397')
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'1', N'1', N'FL_SC01', N'MD1001', N'.0', N'Dint', N'1', N'TaskNum', N'DeviceCommand', N'浠诲姟鍙�', NULL, N'admin', N'2024-10-21 10:18:12.610', N'admin', N'2024-11-08 10:25:10.397')
GO
-INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'2', N'1', N'R01', N'DBW', N'2.0', N'int', N'1', N'StackerCraneAutoStatus', N'StackerCraneAutoStatus', N'宸ヤ綔妯″紡', NULL, N'admin', N'2024-10-21 10:18:12.610', N'admin', N'2024-11-08 10:25:10.397')
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'2', N'1', N'FL_SC01', N'MW2004', N'.0', N'int', N'1', N'WorkType', N'DeviceCommand', N'浣滀笟绫诲瀷', N'1鍏�2鍑�3绉诲簱', N'admin', N'2024-10-21 10:18:12.610', N'admin', N'2024-11-08 10:25:10.397')
GO
-INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'4', N'1', N'R01', N'DBW', N'4.0', N'int', N'1', N'StackerCraneWorkStatus', N'StackerCraneWorkStatus', N'浣滀笟绫诲瀷', NULL, N'admin', N'2024-10-21 10:18:12.610', N'admin', N'2024-11-08 10:25:10.400')
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'3', N'1', N'FL_SC01', N'MW2009', N'.0', N'int', N'1', N'StartRow', N'DeviceCommand', N'璧峰琛�', NULL, N'admin', N'2024-10-21 10:18:12.610', N'admin', N'2024-11-08 10:25:10.400')
GO
-INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'176', N'1', N'R01', N'DBW', N'96.0', N'int', N'1', N'StackerCraneStatus', N'StackerCraneStatus', N'鍑嗗灏辩华', NULL, N'admin', N'2024-10-30 16:56:35.617', N'admin', N'2024-11-08 10:25:10.400')
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'4', N'1', N'FL_SC01', N'MW2010', N'.0', N'int', N'1', N'StartColumn', N'DeviceCommand', N'璧峰鍒�', NULL, N'admin', N'2024-10-30 16:56:35.617', N'admin', N'2024-11-08 10:25:10.400')
GO
-INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'177', N'1', N'R01', N'DBD', N'194.0', N'Dint', N'1', N'CurrentTaskNum', N'DeviceCommand', N'浠诲姟鍙�', NULL, N'admin', N'2024-10-30 16:58:36.710', N'admin', N'2024-11-08 10:25:10.400')
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'5', N'1', N'FL_SC01', N'MW2011', N'.0', N'int', N'1', N'StartLayer', N'DeviceCommand', N'璧峰灞�', NULL, N'admin', N'2024-10-30 16:58:36.710', N'admin', N'2024-11-08 10:25:10.400')
GO
-INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'178', N'1', N'R01', N'DBW', N'198.0', N'int', N'1', N'WorkType', N'DeviceCommand', N'浣滀笟绫诲瀷', NULL, N'admin', N'2024-10-30 17:00:43.723', N'admin', N'2024-11-08 10:25:10.403')
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'6', N'1', N'FL_SC01', N'MW2012', N'.0', N'int', N'1', N'EndRow', N'DeviceCommand', N'缁堢偣琛�', NULL, N'admin', N'2024-10-30 17:00:43.723', N'admin', N'2024-11-08 10:25:10.403')
GO
-INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'179', N'1', N'R01', N'DBW', N'208.0', N'int', N'1', N'StartRow', N'DeviceCommand', N'璧峰琛�', NULL, N'admin', N'2024-10-30 17:14:13.137', N'admin', N'2024-11-08 10:25:10.403')
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'7', N'1', N'FL_SC01', N'MW2013', N'.0', N'int', N'1', N'EndColumn', N'DeviceCommand', N'缁堢偣鍒�', NULL, N'admin', N'2024-10-30 17:14:13.137', N'admin', N'2024-11-08 10:25:10.403')
GO
-INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'180', N'1', N'R01', N'DBW', N'210.0', N'int', N'1', N'StartColumn', N'DeviceCommand', N'璧峰鍒�', NULL, N'admin', N'2024-10-30 17:14:13.137', N'admin', N'2024-11-08 10:25:10.407')
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'8', N'1', N'FL_SC01', N'MW2014', N'.0', N'int', N'1', N'EndLayer', N'DeviceCommand', N'缁堢偣灞�', NULL, N'admin', N'2024-10-30 17:14:13.137', N'admin', N'2024-11-08 10:25:10.407')
GO
-INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'181', N'1', N'R01', N'DBW', N'212.0', N'int', N'1', N'StartLayer', N'DeviceCommand', N'璧峰灞�', NULL, N'admin', N'2024-10-30 17:14:13.137', N'admin', N'2024-11-08 10:25:10.407')
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'9', N'1', N'FL_SC01', N'MW2000', N'.0', N'int', N'1', N'CommandSend', N'DeviceCommand', N'鍚姩鍛戒护', N'1涓哄惎鍔�,鏀跺埌MW1512=1瀹屾垚淇″彿鍚庡紑鍚俊鍙风粰2鍙嶉缁橮LC,PLC娓呭畬鎴愪俊鍙�1--0', N'admin', N'2024-10-30 17:14:13.137', N'admin', N'2024-11-08 10:25:10.407')
GO
-INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'182', N'1', N'R01', N'DBW', N'214.0', N'int', N'1', N'EndRow', N'DeviceCommand', N'缁堢偣琛�', NULL, N'admin', N'2024-10-30 17:14:13.140', N'admin', N'2024-11-08 10:25:10.407')
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'10', N'1', N'FL_SC01', N'MW1500', N'.0', N'int', N'1', N'DeviceName', N'ReadDeviceCommand', N'鍙嶉鍫嗗灈鏈哄彿', NULL, N'admin', N'2024-10-30 17:14:13.140', N'admin', N'2024-11-08 10:25:10.407')
GO
-INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'183', N'1', N'R01', N'DBW', N'216.0', N'int', N'1', N'EndColumn', N'DeviceCommand', N'缁堢偣鍒�', NULL, N'admin', N'2024-10-30 17:14:13.140', N'admin', N'2024-11-08 10:25:10.410')
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'11', N'1', N'FL_SC01', N'MW1501', N'.0', N'int', N'1', N'DeviceStatus', N'ReadDeviceCommand', N'鍙嶉鎺у埗鏂瑰紡', N'5锛氳仈鏈鸿嚜鍔�4锛氭湰鏈鸿嚜鍔�/鍗婅嚜鍔�3锛氭墜鍔�2锛氳皟璇�1锛氳嚜瀛︿範', N'admin', N'2024-10-30 17:14:13.140', N'admin', N'2024-11-08 10:25:10.410')
GO
-INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'184', N'1', N'R01', N'DBW', N'218.0', N'int', N'1', N'EndLayer', N'DeviceCommand', N'缁堢偣灞�', NULL, N'admin', N'2024-10-30 17:14:51.447', N'admin', N'2024-11-08 10:25:10.410')
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'12', N'1', N'FL_SC01', N'MW1502', N'.0', N'int', N'1', N'RunStatus', N'ReadDeviceCommand', N'鍙嶉璁惧鐘舵��', N'1锛氱┖闂诧紝2鎺ユ敹鎸囦护锛�3绌鸿浇绉诲姩,4鍙栬揣锛�5鍙栬揣瀹屾垚锛�6婊¤浇绉诲姩锛�7鍗歌揣锛�8鍏ュ簱瀹屾垚锛�9鍑哄簱瀹屾垚锛�10鎵嬪姩鍒犻櫎浠诲姟', N'admin', N'2024-10-30 17:14:51.447', N'admin', N'2024-11-08 10:25:10.410')
GO
-INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'185', N'1', N'R01', N'DBW', N'192.0', N'int', N'1', N'WorkCommand', N'DeviceCommand', N'浣滀笟鍛戒护', NULL, N'admin', N'2024-10-30 17:17:56.353', N'admin', N'2024-11-08 10:25:10.413')
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'13', N'1', N'FL_SC01', N'MD755', N'.0', N'Dint', N'1', N'CurrentTaskNum', N'ReadDeviceCommand', N'鍙嶉鎸囦护浠诲姟鍙�', N'浣滀笟瀹屾垚鍚庝笂鎶ュ畬鎴愮殑浠诲姟鍙�', N'admin', N'2024-10-30 17:17:56.353', N'admin', N'2024-11-08 10:25:10.413')
+GO
+
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'14', N'1', N'FL_SC01', N'MW1512', N'.0', N'int', N'1', N'StackerCraneTaskCompleted', N'StackerCraneTaskCompleted', N'鍙嶉鎸囦护鐘舵��:1瀹屾垚,2鍙栨秷銆�', N'浠诲姟瀹屾垚淇″彿', N'admin', N'2024-10-30 17:17:56.353', N'admin', N'2024-11-08 10:25:10.413')
+GO
+
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'15', N'1', N'FL_SC01', N'MW1520', N'.0', N'int', N'1', N'AccuRow', N'ReadDeviceCommand', N'鍙嶉褰撳墠鎺�', NULL, N'admin', N'2024-10-30 17:17:56.353', N'admin', N'2024-11-08 10:25:10.413')
+GO
+
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'16', N'1', N'FL_SC01', N'MW1521', N'.0', N'int', N'1', N'AccuColumn', N'ReadDeviceCommand', N'鍙嶉褰撳墠鍒�', NULL, N'admin', N'2024-10-30 17:17:56.353', N'admin', N'2024-11-08 10:25:10.413')
+GO
+
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'17', N'1', N'FL_SC01', N'MW1522', N'.0', N'int', N'1', N'AccuLayer', N'ReadDeviceCommand', N'鍙嶉褰撳墠灞�', NULL, N'admin', N'2024-10-30 17:17:56.353', N'admin', N'2024-11-08 10:25:10.413')
+GO
+
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'18', N'1', N'FL_SC01', N'MW1548', N'.0', N'int', N'1', N'StackerCraneStatus', N'StackerCraneStatus', N'鍏佽淇″彿锛寃cs鍏佽涓嬪彂鍔ㄤ綔鎸囦护', N'1鍑嗗灏辩华0鏈氨缁紱鍑嗗灏辩华鍙笅鍙戝爢鍨涙満浠诲姟', N'admin', N'2024-10-30 17:17:56.353', N'admin', N'2024-11-08 10:25:10.413')
+GO
+
+INSERT INTO [dbo].[Dt_DeviceProtocol] ([Id], [DeviceId], [DeviceChildCode], [DeviceProDataBlock], [DeviceProOffset], [DeviceProDataType], [DeviceProDataLength], [DeviceProParamName], [DeviceProParamType], [DeviceProParamDes], [DeviceProRemark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'19', N'1', N'FL_SC01', N'MW1600', N'.0', N'int', N'1', N'Err_Status', N'ReadDeviceCommand', N'鏁呴殰浠ｇ爜', NULL, N'admin', N'2024-10-30 17:17:56.353', N'admin', N'2024-11-08 10:25:10.413')
GO
SET IDENTITY_INSERT [dbo].[Dt_DeviceProtocol] OFF
@@ -19682,7 +19700,7 @@
-- ----------------------------
-- Auto increment value for Dt_DeviceProtocol
-- ----------------------------
-DBCC CHECKIDENT ('[dbo].[Dt_DeviceProtocol]', RESEED, 185)
+DBCC CHECKIDENT ('[dbo].[Dt_DeviceProtocol]', RESEED, 19)
GO
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/WMS.sql" "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/WMS.sql"
index 1625ea5..6f1f5be 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/WMS.sql"
+++ "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/WMS.sql"
@@ -11,7 +11,7 @@
Target Server Version : 13001601
File Encoding : 65001
- Date: 09/06/2025 17:14:52
+ Date: 10/06/2025 21:22:46
*/
@@ -15657,16 +15657,16 @@
SET IDENTITY_INSERT [dbo].[Dt_RoadwayInfo] ON
GO
-INSERT INTO [dbo].[Dt_RoadwayInfo] ([Id], [RoadwayNo], [AreaId], [EnableStatus], [DeviceNo], [InStationCode], [InSCStationCode], [OutStationCode], [OutSCStationCode], [Remark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'4', N'SC01_FL', N'11', N'0', N'SC01', N'A05', N'FL-002-061-001-01', N'A06', N'FL-003-061-001-01', NULL, N'System', N'2025-05-27 14:27:16.000', N'admin', N'2025-06-09 17:09:12.240')
+INSERT INTO [dbo].[Dt_RoadwayInfo] ([Id], [RoadwayNo], [AreaId], [EnableStatus], [DeviceNo], [InStationCode], [InSCStationCode], [OutStationCode], [OutSCStationCode], [Remark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'4', N'SC01_FL', N'11', N'0', N'FL_SC01', N'A05', N'FL-002-061-001-01', N'A06', N'FL-003-061-001-01', NULL, N'System', N'2025-05-27 14:27:16.000', N'admin', N'2025-06-09 17:09:12.240')
GO
-INSERT INTO [dbo].[Dt_RoadwayInfo] ([Id], [RoadwayNo], [AreaId], [EnableStatus], [DeviceNo], [InStationCode], [InSCStationCode], [OutStationCode], [OutSCStationCode], [Remark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'5', N'SC02_FL', N'11', N'0', N'SC01', N'A05', N'FL-002-062-001-01', N'A06', N'FL-003-062-001-01', NULL, N'System', N'2025-05-27 14:27:16.000', N'admin', N'2025-06-09 17:09:33.383')
+INSERT INTO [dbo].[Dt_RoadwayInfo] ([Id], [RoadwayNo], [AreaId], [EnableStatus], [DeviceNo], [InStationCode], [InSCStationCode], [OutStationCode], [OutSCStationCode], [Remark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'5', N'SC02_FL', N'11', N'0', N'FL_SC01', N'A05', N'FL-002-062-001-01', N'A06', N'FL-003-062-001-01', NULL, N'System', N'2025-05-27 14:27:16.000', N'admin', N'2025-06-09 17:09:33.383')
GO
-INSERT INTO [dbo].[Dt_RoadwayInfo] ([Id], [RoadwayNo], [AreaId], [EnableStatus], [DeviceNo], [InStationCode], [InSCStationCode], [OutStationCode], [OutSCStationCode], [Remark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'6', N'SC01_CP', N'10', N'0', N'SC01', N'A01', N'CP-002-061-001-01', N'A02', N'CP-003-061-001-01', NULL, N'System', N'2024-10-21 10:51:38.000', N'admin', N'2025-06-09 17:10:19.583')
+INSERT INTO [dbo].[Dt_RoadwayInfo] ([Id], [RoadwayNo], [AreaId], [EnableStatus], [DeviceNo], [InStationCode], [InSCStationCode], [OutStationCode], [OutSCStationCode], [Remark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'6', N'SC01_CP', N'10', N'0', N'CP_SC01', N'A01', N'CP-002-061-001-01', N'A02', N'CP-003-061-001-01', NULL, N'System', N'2024-10-21 10:51:38.000', N'admin', N'2025-06-09 17:10:19.583')
GO
-INSERT INTO [dbo].[Dt_RoadwayInfo] ([Id], [RoadwayNo], [AreaId], [EnableStatus], [DeviceNo], [InStationCode], [InSCStationCode], [OutStationCode], [OutSCStationCode], [Remark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'7', N'SC02_CP', N'10', N'0', N'SC01', N'A01', N'CP-002-062-001-01', N'A02', N'CP-003-062-001-01', NULL, N'System', N'2024-10-21 10:51:38.000', N'admin', N'2025-06-09 17:10:44.650')
+INSERT INTO [dbo].[Dt_RoadwayInfo] ([Id], [RoadwayNo], [AreaId], [EnableStatus], [DeviceNo], [InStationCode], [InSCStationCode], [OutStationCode], [OutSCStationCode], [Remark], [Creater], [CreateDate], [Modifier], [ModifyDate]) VALUES (N'7', N'SC02_CP', N'10', N'0', N'CP_SC01', N'A01', N'CP-002-062-001-01', N'A02', N'CP-003-062-001-01', NULL, N'System', N'2024-10-21 10:51:38.000', N'admin', N'2025-06-09 17:10:44.650')
GO
SET IDENTITY_INSERT [dbo].[Dt_RoadwayInfo] OFF
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\214WCS----PLC\344\272\244\344\272\222\345\234\260\345\235\200.xlsx" "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\214WCS----PLC\344\272\244\344\272\222\345\234\260\345\235\200.xlsx"
new file mode 100644
index 0000000..b663c7c
--- /dev/null
+++ "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\214WCS----PLC\344\272\244\344\272\222\345\234\260\345\235\200.xlsx"
Binary files differ
--
Gitblit v1.9.3