From 2ae5aa151f7b40a082e34aa7ed22b4b64edd1d3c Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 11 六月 2025 17:13:56 +0800
Subject: [PATCH] 修改堆垛机通讯协议及交互逻辑
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Dictionary.tsv | 144 +++++++++++++++++++++++++++--------------------
1 files changed, 82 insertions(+), 62 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Dictionary.tsv" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Dictionary.tsv"
index 9740f96..2519a2e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Dictionary.tsv"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Dictionary.tsv"
@@ -2,253 +2,273 @@
{
"DicId": 3,
"Config": "{valueField: 'Enable',\r\ntextField: 'Enable',\r\n containField: null,\r\n handler: null }",
- "DBServer": "1",
- "DBSql": null,
+ "Sql": null,
"DicName": "鏄惁鍊�",
"DicNo": "enable",
"Enable": 1,
"OrderNo": null,
"ParentId": 0,
"Remark": null,
- "SystemType": 10,
"DicList": null,
"Creater": "system",
- "CreateDate": "2024-09-04T10:37:48.587",
+ "CreateDate": "2024-09-04T11:08:54.763",
"Modifier": "瓒呯骇绠＄悊鍛�",
"ModifyDate": "2022-01-03T18:30:18.113"
},
{
"DicId": 30,
"Config": "{valueField: 'Success',\r\n textField: 'Success', \r\n containField: null,\r\n handler: null }\r\n",
- "DBServer": null,
- "DBSql": null,
+ "Sql": null,
"DicName": "鍝嶅簲鐘舵��",
"DicNo": "restatus",
"Enable": 1,
"OrderNo": null,
"ParentId": 0,
"Remark": null,
- "SystemType": 10,
"DicList": null,
"Creater": "system",
- "CreateDate": "2024-09-04T10:37:48.587",
+ "CreateDate": "2024-09-04T11:08:54.763",
"Modifier": "娴嬭瘯瓒呯骇绠＄悊鍛�",
"ModifyDate": "2018-06-12T10:21:48"
},
{
"DicId": 31,
"Config": "{valueField: 'LogType',\r\n textField: 'LogType', \r\n containField: null,\r\n handler: null }\r\n",
- "DBServer": null,
- "DBSql": null,
+ "Sql": null,
"DicName": "鏃ュ織绫诲瀷",
"DicNo": "log",
"Enable": 1,
"OrderNo": null,
"ParentId": 0,
"Remark": null,
- "SystemType": 10,
"DicList": null,
"Creater": "system",
- "CreateDate": "2024-09-04T10:37:48.587",
+ "CreateDate": "2024-09-04T11:08:54.763",
"Modifier": "瓒呯骇绠＄悊鍛�",
"ModifyDate": "2022-04-04T13:21:54.927"
},
{
"DicId": 32,
"Config": "{valueField: 'Role_Id',\r\n textField: 'RoleName', \r\n containField: ['Role_Id','RoleName'],\r\n handler: null }\r\n",
- "DBServer": null,
- "DBSql": "SELECT RoleId as 'key',RoleName as 'value' FROM Sys_Role WHERE Enable=1",
+ "Sql": "SELECT RoleId as 'key',RoleName as 'value' FROM Sys_Role WHERE Enable=1",
"DicName": "瑙掕壊鍒楄〃",
"DicNo": "roles",
"Enable": 1,
"OrderNo": 123,
"ParentId": 0,
"Remark": "sql璇彞闇�瑕乲ey,value鍒楋紝鐣岄潰鎵嶈兘缁戝畾鏁版嵁婧�",
- "SystemType": 10,
"DicList": null,
"Creater": "system",
- "CreateDate": "2024-09-04T10:37:48.587",
+ "CreateDate": "2024-09-04T11:08:54.763",
"Modifier": "娴嬭瘯瓒呯骇绠＄悊鍛�",
"ModifyDate": "2018-07-13T15:03:53"
},
{
"DicId": 35,
"Config": "{\r\n valueField: 'AuditStatus',\r\n textField: 'AuditStatus',\r\n containField:null \r\n}",
- "DBServer": null,
- "DBSql": null,
+ "Sql": null,
"DicName": "瀹℃牳鐘舵��",
"DicNo": "audit",
"Enable": 1,
"OrderNo": null,
"ParentId": 0,
"Remark": null,
- "SystemType": 10,
"DicList": null,
"Creater": "system",
- "CreateDate": "2024-09-04T10:37:48.587",
+ "CreateDate": "2024-09-04T11:08:54.763",
"Modifier": "瓒呯骇绠＄悊鍛�",
"ModifyDate": "2023-05-08T01:05:44.193"
},
{
"DicId": 49,
"Config": "{\r\n valueField: 'Gender',\r\n textField: 'Gender',\r\n containField:null \r\n}",
- "DBServer": null,
- "DBSql": null,
+ "Sql": null,
"DicName": "鎬у埆",
"DicNo": "gender",
"Enable": 1,
"OrderNo": null,
"ParentId": 0,
"Remark": null,
- "SystemType": 10,
"DicList": null,
"Creater": "system",
- "CreateDate": "2024-09-04T10:37:48.587",
+ "CreateDate": "2024-09-04T11:08:54.763",
"Modifier": "娴嬭瘯瓒呯骇绠＄悊鍛�",
"ModifyDate": "2018-07-23T11:10:28"
},
{
"DicId": 50,
"Config": "{\r\n valueField: 'Enable',\r\n textField: 'Enable',\r\n containField:null \r\n}",
- "DBServer": null,
- "DBSql": null,
+ "Sql": null,
"DicName": "鍚敤鐘舵��",
"DicNo": "status",
"Enable": 1,
"OrderNo": null,
"ParentId": 0,
"Remark": null,
- "SystemType": 10,
"DicList": null,
"Creater": "system",
- "CreateDate": "2024-09-04T10:37:48.587",
+ "CreateDate": "2024-09-04T11:08:54.763",
"Modifier": null,
- "ModifyDate": "2024-09-04T11:07:01.8163734+08:00"
+ "ModifyDate": "2024-09-04T11:07:01.817"
},
{
"DicId": 59,
"Config": "{\r\n valueField: 'IsRegregisterPhone',\r\n textField: 'IsRegregisterPhone',\r\n containField:null \r\n}",
- "DBServer": null,
- "DBSql": null,
+ "Sql": null,
"DicName": "鎵嬫満鐢ㄦ埛",
"DicNo": "isphone",
"Enable": 1,
"OrderNo": null,
"ParentId": 0,
"Remark": null,
- "SystemType": 10,
"DicList": null,
"Creater": "system",
- "CreateDate": "2024-09-04T10:37:48.587",
+ "CreateDate": "2024-09-04T11:08:54.763",
"Modifier": "瓒呯骇绠＄悊鍛�",
"ModifyDate": "2020-11-20T23:05:48.303"
},
{
"DicId": 66,
"Config": null,
- "DBServer": null,
- "DBSql": "SELECT RoleId AS id,parentId,RoleId AS [key],RoleName AS value FROM Sys_Role",
+ "Sql": "SELECT RoleId AS id,parentId,RoleId AS [key],RoleName AS value FROM Sys_Role",
"DicName": "绾ц仈瑙掕壊",
"DicNo": "tree_roles",
"Enable": 1,
"OrderNo": null,
"ParentId": 0,
"Remark": null,
- "SystemType": 10,
"DicList": null,
"Creater": "system",
- "CreateDate": "2024-09-04T10:37:48.587",
+ "CreateDate": "2024-09-04T11:08:54.763",
"Modifier": "瓒呯骇绠＄悊鍛�",
"ModifyDate": "2020-11-20T23:08:03.217"
},
{
"DicId": 67,
"Config": null,
- "DBServer": null,
- "DBSql": null,
+ "Sql": null,
"DicName": "nav",
"DicNo": "nav",
"Enable": 1,
"OrderNo": null,
"ParentId": 0,
"Remark": null,
- "SystemType": 10,
"DicList": null,
"Creater": "system",
- "CreateDate": "2024-09-04T10:37:48.587",
+ "CreateDate": "2024-09-04T11:08:54.763",
"Modifier": null,
- "ModifyDate": "2024-09-04T11:07:01.8163773+08:00"
+ "ModifyDate": "2024-09-04T11:07:01.817"
},
{
"DicId": 70,
"Config": null,
- "DBServer": null,
- "DBSql": null,
+ "Sql": null,
"DicName": "璇锋眰鏂瑰紡",
"DicNo": "璇锋眰鏂瑰紡",
"Enable": 1,
"OrderNo": null,
"ParentId": 0,
"Remark": null,
- "SystemType": 10,
"DicList": null,
"Creater": "system",
- "CreateDate": "2024-09-04T10:37:48.587",
+ "CreateDate": "2024-09-04T11:08:54.763",
"Modifier": null,
- "ModifyDate": "2024-09-04T11:07:01.816382+08:00"
+ "ModifyDate": "2024-09-04T11:07:01.817"
},
{
"DicId": 71,
"Config": null,
- "DBServer": null,
- "DBSql": null,
+ "Sql": null,
"DicName": "瀹氭椂浠诲姟鐘舵��",
"DicNo": "瀹氭椂浠诲姟鐘舵��",
"Enable": 1,
"OrderNo": null,
"ParentId": 0,
"Remark": null,
- "SystemType": 10,
"DicList": null,
"Creater": "system",
- "CreateDate": "2024-09-04T10:37:48.587",
+ "CreateDate": "2024-09-04T11:08:54.763",
"Modifier": null,
- "ModifyDate": "2024-09-04T11:07:01.8163831+08:00"
+ "ModifyDate": "2024-09-04T11:07:01.817"
},
{
"DicId": 72,
"Config": null,
- "DBServer": null,
- "DBSql": "SELECT DepartmentId AS 'key',DepartmentId AS 'id',ParentId AS parentId,DepartmentName as 'value' FROM Sys_Department",
+ "Sql": "SELECT DepartmentId AS 'key',DepartmentId AS 'id',ParentId AS parentId,DepartmentName as 'value' FROM Sys_Department",
"DicName": "缁勭粐鏈烘瀯",
"DicNo": "缁勭粐鏈烘瀯",
"Enable": 1,
"OrderNo": null,
"ParentId": 0,
"Remark": null,
- "SystemType": 10,
"DicList": null,
"Creater": "system",
- "CreateDate": "2024-09-04T10:37:48.587",
+ "CreateDate": "2024-09-04T11:08:54.763",
"Modifier": null,
- "ModifyDate": "2024-09-04T11:07:01.8163841+08:00"
+ "ModifyDate": "2024-09-04T11:07:01.817"
},
{
"DicId": 75,
"Config": null,
- "DBServer": null,
- "DBSql": null,
+ "Sql": null,
"DicName": "鏃ュ織鐘舵��",
"DicNo": "LogState",
"Enable": 1,
"OrderNo": null,
"ParentId": 0,
"Remark": null,
- "SystemType": 1,
"DicList": null,
"Creater": "瓒呯骇绠＄悊鍛�",
- "CreateDate": "2024-09-04T10:37:48.587",
+ "CreateDate": "2024-09-04T11:08:54.763",
"Modifier": null,
- "ModifyDate": "2024-09-04T11:07:01.8163851+08:00"
+ "ModifyDate": "2024-09-04T11:07:01.817"
+ },
+ {
+ "DicId": 78,
+ "Config": null,
+ "Sql": "SELECT Id AS 'key', WarehouseName AS 'value' FROM Dt_Warehouse\r\nUNION ALL\r\nSELECT '0' AS 'key', '鏃�' AS 'value'",
+ "DicName": "浠撳簱",
+ "DicNo": "warehouse",
+ "Enable": 1,
+ "OrderNo": null,
+ "ParentId": 0,
+ "Remark": null,
+ "DicList": null,
+ "Creater": "admin",
+ "CreateDate": "2024-09-23T15:18:34.56",
+ "Modifier": null,
+ "ModifyDate": null
+ },
+ {
+ "DicId": 79,
+ "Config": null,
+ "Sql": "SELECT Id AS 'key', AreaName AS 'value' FROM Dt_AreaInfo\r\nUNION ALL\r\nSELECT '0' AS 'key', '鏃�' AS 'value'",
+ "DicName": "鍖哄煙",
+ "DicNo": "areainfo",
+ "Enable": 1,
+ "OrderNo": null,
+ "ParentId": 0,
+ "Remark": null,
+ "DicList": null,
+ "Creater": "admin",
+ "CreateDate": "2024-09-23T17:07:26.75",
+ "Modifier": null,
+ "ModifyDate": null
+ },
+ {
+ "DicId": 81,
+ "Config": null,
+ "Sql": null,
+ "DicName": "鏄惁鍊�",
+ "DicNo": "yesno",
+ "Enable": 1,
+ "OrderNo": 0,
+ "ParentId": 0,
+ "Remark": null,
+ "DicList": null,
+ "Creater": "admin",
+ "CreateDate": "2024-09-24T13:40:11.04",
+ "Modifier": null,
+ "ModifyDate": null
}
]
\ No newline at end of file
--
Gitblit v1.9.3