From d20ce230b49932d39ee4ce25e39fd78368c3b28a Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 27 六月 2025 17:26:04 +0800
Subject: [PATCH] 优化配置文件和部分日志打印信息
---
config/config.comment.json | 151 ++++++++++++++++----------------------------------
1 files changed, 49 insertions(+), 102 deletions(-)
diff --git a/config/config.comment.json b/config/config.comment.json
index 4acea66..2f0c4da 100644
--- a/config/config.comment.json
+++ b/config/config.comment.json
@@ -1,73 +1,70 @@
{
- //"WebApiUrl": "http://192.168.1.141:8901",
- //"WebApiUrl": "http://192.168.1.67:8901",
- "WebApiUrl": "http://127.0.0.1:8901",
- "NdcApiUrl": "http://127.0.0.1:5201/api/order/",
- "ErpApiUrl": "http://127.0.0.1:8085/api/",
- //"SqlServer": "Data Source=192.168.1.87;Initial Catalog=AMS_OIMobox;User ID=sa;Password=123456;",
- "SqlServer": "Data Source=(local);Initial Catalog=DSZSHTest;User ID=sa;Password=123456;",
+ "WebApiUrl": "http://127.0.0.1:8901", // 鍚庡彴鎺ュ彛璁块棶鍦板潃
+ "NdcApiUrl": "http://127.0.0.1:5201/api/order/", // NDC鎺ュ彛鍦板潃
+ "ErpApiUrl": "http://127.0.0.1:8901/api/", // ERP鎺ュ彛鍦板潃
+ "SqlServer": "Data Source=192.168.1.87;Initial Catalog=AMS_OIMobox;User ID=sa;Password=123456;", // 鏁版嵁搴撻厤缃湴鍧� "TcpServerIp": "127.0.0.1",
"TcpServerPort": 8085,
- "Areas": [
+ "TaskInfo": [ // 浠诲姟璧风偣缁堢偣閰嶇疆锛堜笉鑳芥敼鍙樹换鍔＄殑鐩稿浣嶇疆锛� {
- "Name": "鍖呰鍖�,
- "Codes": [ "BZQ" ]
+ "TaskName": "濂借繍绠�婊＄涓嬬嚎鍏ュ簱", // 浠诲姟鍚嶇О
+ "StartAreas": [ "MXCZQ" ], // 璧风偣璐у尯锛氭弧绠卞瓨鏀惧尯
+ "EndAreas": [ "MXHJQ" ] // 缁堢偣璐у尯锛氭弧绠辫揣鏋跺尯
},
{
- "Name": "绌虹鎿嶄綔鍖�,
- "Codes": [ "KXCZQ" ]
+ "TaskName": "濂借繍绠�绌虹涓婄嚎",
+ "StartAreas": [ "KXHJQ" ], // 绌虹璐ф灦鍖�+ "EndAreas": [ "KXCZQ" ] // 绌虹鎿嶄綔鍖� },
{
- "Name": "婊＄鎿嶄綔鍖�,
- "Codes": [ "MXCZQ" ]
+ "TaskName": "濂借繍绠�绌虹鍏ュ簱",
+ "StartAreas": [ "KXJBQ1", "KXJBQ2" ], // 绌虹鍏ュ簱鎺ラ┏鍖�/2
+ "EndAreas": [ "KXHJQ" ] // 绌虹璐ф灦鍖� },
{
- "Name": "绌烘墭瀛樻斁鍖�,
- "Codes": [ "KTCFQ" ]
+ "TaskName": "鎴愬搧鑳跺嚭搴�,
+ "StartAreas": [ "MTHJQ", "MXHJQ", "HCBHQ", "QCBHQ" ],
+ "EndAreas": [ "HCCKQ", "QCCKQ" ]
},
{
- "Name": "绌虹璐ф灦鍖�,
- "Codes": [ "KXHJQ" ]
+ "TaskName": "鎵樼洏-婊℃墭涓嬬嚎鍏ュ簱",
+ "StartAreas": [],
+ "EndAreas": [ "MTHJQ" ]
},
{
- "Name": "婊℃墭璐ф灦鍖�,
- "Codes": [ "MTHJQ" ]
+ "TaskName": "鎵樼洏-绌烘墭涓婄嚎",
+ "StartAreas": [],
+ "EndAreas": []
},
{
- "Name": "婊＄璐ф灦鍖�,
- "Codes": [ "MXHJQ" ]
+ "TaskName": "鎵樼洏-绌烘墭鍏ュ簱",
+ "StartAreas": [ "KTJBQ" ], // 绌烘墭鎺ラ┏鍖�+ "EndAreas": [ "KTCFQ" ] // 绌烘墭瀛樻斁鍖� },
{
- "Name": "鎶芥鍖�,
- "Codes": [ "CJQ" ]
+ "TaskName": "鎶芥-鍑哄簱",
+ "StartAreas": [ "MTHJQ", "MXHJQ" ], // 婊℃墭璐ф灦鍖恒�婊＄璐ф灦鍖�+ "EndAreas": [ "CJQ" ] // 鎶芥鍖� },
{
- "Name": "鎶芥寮傚父鍖�,
- "Codes": [ "CJYCQ" ]
+ "TaskName": "鎶芥-鍚堟牸鍥炲簱",
+ "StartAreas": [ "CJQ" ], // 鎶芥鍖�+ "EndAreas": []
},
{
- "Name": "绌烘墭鍏ュ簱鎺ラ┏鍖�,
- "Codes": [ "KTJBQ" ]
+ "TaskName": "鎶芥-涓嶅悎鏍肩Щ搴�,
+ "StartAreas": [ "CJQ" ],
+ "EndAreas": []
},
{
- "Name": "绌虹鍏ュ簱鎺ラ┏鍖�,
- "Codes": [ "KXJBQ1", "KXJBQ2" ]
+ "TaskName": "绉诲簱",
+ "StartAreas": [],
+ "EndAreas": []
},
{
- "Name": "姹借溅鍑哄簱鍖�,
- "Codes": [ "QCCKQ" ]
- },
- {
- "Name": "鐏溅鍑哄簱鍖�,
- "Codes": [ "HCCKQ" ]
- },
- {
- "Name": "姹借溅澶囪揣鍖�,
- "Codes": [ "QCBHQ" ]
- },
- {
- "Name": "鐏溅澶囪揣鍖�,
- "Codes": [ "HCBHQ" ]
+ "TaskName": "灏剧鍥炲簱",
+ "StartAreas": [ "HCCKQ", "QCCKQ" ], // 鐏溅鍑哄簱鍖恒�姹借溅鍑哄簱鍖�+ "EndAreas": []
}
],
"ProductionLines": [
@@ -77,12 +74,8 @@
"PlcIp": "127.0.0.1",
"PlcPort": 502,
"SlaveId": 1,
- "OnLoc": [
- "CX11"
- ],
- "OffLoc": [
- "CX12"
- ]
+ "OnLoc": [ "CX11" ],
+ "OffLoc": [ "CX12" ]
},
{
"Id": "2",
@@ -90,12 +83,8 @@
"PlcIp": "127.0.0.1",
"PlcPort": 503,
"SlaveId": 2,
- "OnLoc": [
- "CX21"
- ],
- "OffLoc": [
- "CX22"
- ]
+ "OnLoc": [ "CX21" ],
+ "OffLoc": [ "CX22" ]
},
{
"Id": "3",
@@ -103,12 +92,8 @@
"PlcIp": "127.0.0.1",
"PlcPort": 504,
"SlaveId": 3,
- "OnLoc": [
- "CX31"
- ],
- "OffLoc": [
- "CX32"
- ]
+ "OnLoc": [ "CX31" ],
+ "OffLoc": [ "CX32" ]
},
{
"Id": "4",
@@ -116,46 +101,8 @@
"PlcIp": "127.0.0.1",
"PlcPort": 505,
"SlaveId": 4,
- "OnLoc": [
- "CX41"
- ],
- "OffLoc": [
- "CX42"
- ]
- }
- ],
- "ProdAgvSite": [
- {
- "Code": "work111",
- "ProdId": 0
- },
- {
- "Code": "work112",
- "ProdId": 0
- },
- {
- "Code": "work121",
- "ProdId": 1
- },
- {
- "Code": "work122",
- "ProdId": 1
- },
- {
- "Code": "work131",
- "ProdId": 2
- },
- {
- "Code": "work132",
- "ProdId": 2
- },
- {
- "Code": "work141",
- "ProdId": 3
- },
- {
- "Code": "work142",
- "ProdId": 3
+ "OnLoc": [ "CX41" ],
+ "OffLoc": [ "CX42" ]
}
]
}
\ No newline at end of file
--
Gitblit v1.9.1