From f978872b6de4e7e20d992a2ee7cda902c11347b9 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 30 六月 2025 15:31:56 +0800
Subject: [PATCH] 优化配置文件读取逻辑，将ERP反馈接口写入配置文件中配置
---
config/config.comment.json | 108 ++++++++++++++++++++++++++---------------------------
1 files changed, 53 insertions(+), 55 deletions(-)
diff --git a/config/config.comment.json b/config/config.comment.json
index 2f0c4da..cc18744 100644
--- a/config/config.comment.json
+++ b/config/config.comment.json
@@ -1,81 +1,83 @@
{
- "WebApiUrl": "http://127.0.0.1:8901", // 鍚庡彴鎺ュ彛璁块棶鍦板潃
- "NdcApiUrl": "http://127.0.0.1:5201/api/order/", // NDC鎺ュ彛鍦板潃
+ "WebApiUrl": "http://127.0.0.1:8901", // 鍚庡彴鏈嶅姟鎺ュ彛鍦板潃
+ "NdcApiUrl": "http://127.0.0.1:5201/api/order/", // NDC AGV鎺ュ彛鍦板潃
"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,
- "TaskInfo": [ // 浠诲姟璧风偣缁堢偣閰嶇疆锛堜笉鑳芥敼鍙樹换鍔＄殑鐩稿浣嶇疆锛�+ "ErpRoute": {
+ "CreateTaskReturn": "CreateTaskReturn", // 鏍规嵁ERP涓嬪彂鍑哄簱璁″垝锛屽垱寤轰换鍔″悗鍙嶉ERP鐨勬帴鍙�+ "PickUpReturn": "PickUpReturn" // 鏍规嵁ERP涓嬪彂鍑哄簱璁″垝锛孉GV鍙栬揣鍚庡弽棣圗RP鐨勬帴鍙�+ },
+ "SqlServer": "Data Source=192.168.1.87;Initial Catalog=AMS_OIMobox;User ID=sa;Password=123456;", // 鏁版嵁搴撻厤缃�+ "TaskInfos": [ // 浠诲姟淇℃伅锛堝悕绉般�璧风偣璐у尯銆佺粓鐐硅揣鍖猴級
{
- "TaskName": "濂借繍绠�婊＄涓嬬嚎鍏ュ簱", // 浠诲姟鍚嶇О
- "StartAreas": [ "MXCZQ" ], // 璧风偣璐у尯锛氭弧绠卞瓨鏀惧尯
- "EndAreas": [ "MXHJQ" ] // 缁堢偣璐у尯锛氭弧绠辫揣鏋跺尯
+ "TaskName": "婊℃墭涓嬬嚎鍏ュ簱", // 浠诲姟鍚嶇О锛堝彲浠ユ洿鏀癸紝浣嗗悇浠诲姟鐩稿浣嶇疆涓嶈兘鏇存敼锛�+ "StartAreas": [ "BZQ" ], // 璧风偣璐у尯缂栧彿锛氬寘瑁呭尯
+ "EndAreas": [ "MTHJQ" ] // 缁堢偣璐у尯缂栧彿锛氭弧鎵樿揣鏋跺尯
},
{
- "TaskName": "濂借繍绠�绌虹涓婄嚎",
- "StartAreas": [ "KXHJQ" ], // 绌虹璐ф灦鍖�- "EndAreas": [ "KXCZQ" ] // 绌虹鎿嶄綔鍖�- },
- {
- "TaskName": "濂借繍绠�绌虹鍏ュ簱",
- "StartAreas": [ "KXJBQ1", "KXJBQ2" ], // 绌虹鍏ュ簱鎺ラ┏鍖�/2
- "EndAreas": [ "KXHJQ" ] // 绌虹璐ф灦鍖�+ "TaskName": "婊＄涓嬬嚎鍏ュ簱",
+ "StartAreas": [ "MXCZQ" ], // 婊＄鎿嶄綔鍖�+ "EndAreas": [ "MXHJQ" ] // 婊＄璐ф灦鍖� },
{
"TaskName": "鎴愬搧鑳跺嚭搴�,
- "StartAreas": [ "MTHJQ", "MXHJQ", "HCBHQ", "QCBHQ" ],
- "EndAreas": [ "HCCKQ", "QCCKQ" ]
+ "StartAreas": [ "MTHJQ", "MXHJQ", "HCBHQ", "QCBHQ" ], // 婊℃墭璐ф灦鍖恒�婊＄璐ф灦鍖恒�鐏溅澶囪揣鍖恒�姹借溅澶囪揣鍖�+ "EndAreas": [ "HCCKQ", "QCCKQ" ] // 鐏溅鍑哄簱鍖恒�姹借溅鍑哄簱鍖� },
{
- "TaskName": "鎵樼洏-婊℃墭涓嬬嚎鍏ュ簱",
- "StartAreas": [],
- "EndAreas": [ "MTHJQ" ]
+ "TaskName": "绌烘墭涓婄嚎鍑哄簱",
+ "StartAreas": [ "KTCFQ" ], // 绌烘墭瀛樻斁鍖�+ "EndAreas": [ "BZQ" ] // 鍖呰鍖� },
{
- "TaskName": "鎵樼洏-绌烘墭涓婄嚎",
- "StartAreas": [],
- "EndAreas": []
+ "TaskName": "绌虹涓婄嚎鍑哄簱",
+ "StartAreas": [ "KXHJQ" ], // 婊＄璐ф灦鍖�+ "EndAreas": [ "KXCZQ" ] // 绌虹鎿嶄綔鍖� },
{
- "TaskName": "鎵樼洏-绌烘墭鍏ュ簱",
- "StartAreas": [ "KTJBQ" ], // 绌烘墭鎺ラ┏鍖�+ "TaskName": "绌烘墭鍏ュ簱",
+ "StartAreas": [ "KTJBQ" ], // 绌烘墭鍏ュ簱鎺ラ┏鍖� "EndAreas": [ "KTCFQ" ] // 绌烘墭瀛樻斁鍖� },
{
- "TaskName": "鎶芥-鍑哄簱",
+ "TaskName": "绌虹鍏ュ簱",
+ "StartAreas": [ "KXJBQ1", "KXJBQ2" ], // 绌虹鍏ュ簱鎺ラ┏鍖�銆�
+ "EndAreas": [ "KXHJQ" ] // 绌虹璐ф灦鍖�+ },
+ {
+ "TaskName": "鎶芥鍑哄簱",
"StartAreas": [ "MTHJQ", "MXHJQ" ], // 婊℃墭璐ф灦鍖恒�婊＄璐ф灦鍖� "EndAreas": [ "CJQ" ] // 鎶芥鍖� },
{
- "TaskName": "鎶芥-鍚堟牸鍥炲簱",
+ "TaskName": "鎶芥鍚堟牸鍥炲簱",
"StartAreas": [ "CJQ" ], // 鎶芥鍖�- "EndAreas": []
+ "EndAreas_Pallet": [ "MTHJQ" ], // 缁堢偣璐у尯锛堟墭鐩橈級锛氭弧鎵樿揣鏋跺尯
+ "EndAreas_Goodpack": [ "MXHJQ" ] // 缁堢偣璐у尯锛堝ソ杩愮锛夛細婊＄璐ф灦鍖� },
{
- "TaskName": "鎶芥-涓嶅悎鏍肩Щ搴�,
- "StartAreas": [ "CJQ" ],
- "EndAreas": []
+ "TaskName": "鎶芥涓嶅悎鏍肩Щ搴�,
+ "StartAreas": [ "CJQ" ], // 鎶芥鍖�+ "EndAreas": [ "CJYCQ" ] // 鎶芥寮傚父鍖� },
{
- "TaskName": "绉诲簱",
- "StartAreas": [],
- "EndAreas": []
+ "TaskName": "灏炬枡鍥炲簱",
+ "StartAreas": [ "HCCKQ", "QCCKQ" ], // 鐏溅鍑哄簱鍖�+ "EndAreas_Pallet": [ "MTHJQ" ], // 婊℃墭璐ф灦鍖�+ "EndAreas_Goodpack": [ "MXHJQ" ] // 婊＄璐ф灦鍖� },
{
- "TaskName": "灏剧鍥炲簱",
- "StartAreas": [ "HCCKQ", "QCCKQ" ], // 鐏溅鍑哄簱鍖恒�姹借溅鍑哄簱鍖�- "EndAreas": []
+ "TaskName": "绉诲簱"
}
],
- "ProductionLines": [
+ "ProductionLines": [ // 浜х嚎淇℃伅锛堝緟瀹氾紝鏍规嵁鍚庨潰闇�眰鍐嶆洿鏀癸級
{
- "Id": "1",
- "Name": "鎵樼洏浜х嚎1",
- "PlcIp": "127.0.0.1",
- "PlcPort": 502,
- "SlaveId": 1,
- "OnLoc": [ "CX11" ],
- "OffLoc": [ "CX12" ]
+ "Id": "1", // 浜х嚎缂栧彿
+ "Name": "鎵樼洏浜х嚎1", // 浜х嚎鍚嶇О
+ "PlcIp": "127.0.0.1", // 浜х嚎IP
+ "PlcPort": 502, // 浜х嚎绔彛
+ "SlaveId": 1, // 浜х嚎modbus slave id锛堟牴鎹疄闄呮儏鍐碉級
+ "OnLoc": [ "BZQ-1-1" ], // 涓婄嚎璐т綅
+ "OffLoc": [ "BZQ-1-2" ] // 涓嬬嚎璐т綅
},
{
"Id": "2",
@@ -83,26 +85,22 @@
"PlcIp": "127.0.0.1",
"PlcPort": 503,
"SlaveId": 2,
- "OnLoc": [ "CX21" ],
- "OffLoc": [ "CX22" ]
+ "OnLoc": [ "BZQ-2-1" ],
+ "OffLoc": [ "BZQ-2-2" ]
},
{
"Id": "3",
"Name": "濂借繍绠变骇绾�",
"PlcIp": "127.0.0.1",
"PlcPort": 504,
- "SlaveId": 3,
- "OnLoc": [ "CX31" ],
- "OffLoc": [ "CX32" ]
+ "SlaveId": 3
},
{
"Id": "4",
"Name": "濂借繍绠变骇绾�",
"PlcIp": "127.0.0.1",
"PlcPort": 505,
- "SlaveId": 4,
- "OnLoc": [ "CX41" ],
- "OffLoc": [ "CX42" ]
+ "SlaveId": 4
}
]
}
\ No newline at end of file
--
Gitblit v1.9.1