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 | 209 ++++++++++++++--------------------------------------
1 files changed, 57 insertions(+), 152 deletions(-)
diff --git a/config/config.comment.json b/config/config.comment.json
index 66d1192..cc18744 100644
--- a/config/config.comment.json
+++ b/config/config.comment.json
@@ -1,128 +1,83 @@
{
- "WebApiUrl": "http://192.168.1.141:8901", //WCS鑷繁鐨勫湴鍧�- "NdcApiUrl": "http://127.0.0.1:5201/api/order/", //
- "SqlServer": "Data Source=192.168.1.87;Initial Catalog=AMS_OIMobox;User ID=sa;Password=123456;",
- "TcpServerIp": "127.0.0.1",
- "TcpServerPort": 8085,
- "Areas": [ // 璐у尯
+ "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鎺ュ彛鍦板潃
+ "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": [ // 浠诲姟淇℃伅锛堝悕绉般�璧风偣璐у尯銆佺粓鐐硅揣鍖猴級
{
- "Name": "鍖呰鍖�,
- "Codes": [ "BZQ" ]
+ "TaskName": "婊℃墭涓嬬嚎鍏ュ簱", // 浠诲姟鍚嶇О锛堝彲浠ユ洿鏀癸紝浣嗗悇浠诲姟鐩稿浣嶇疆涓嶈兘鏇存敼锛�+ "StartAreas": [ "BZQ" ], // 璧风偣璐у尯缂栧彿锛氬寘瑁呭尯
+ "EndAreas": [ "MTHJQ" ] // 缁堢偣璐у尯缂栧彿锛氭弧鎵樿揣鏋跺尯
},
{
- "Name": "鎿嶄綔鍖�,
- "Codes": [ "CZQ1", "CZQ2" ]
+ "TaskName": "婊＄涓嬬嚎鍏ュ簱",
+ "StartAreas": [ "MXCZQ" ], // 婊＄鎿嶄綔鍖�+ "EndAreas": [ "MXHJQ" ] // 婊＄璐ф灦鍖� },
{
- "Name": "璐ф灦鍖�,
- "Codes": [ "HJQ1", "HJQ2", "HJQ3", "HJQ4" ]
+ "TaskName": "鎴愬搧鑳跺嚭搴�,
+ "StartAreas": [ "MTHJQ", "MXHJQ", "HCBHQ", "QCBHQ" ], // 婊℃墭璐ф灦鍖恒�婊＄璐ф灦鍖恒�鐏溅澶囪揣鍖恒�姹借溅澶囪揣鍖�+ "EndAreas": [ "HCCKQ", "QCCKQ" ] // 鐏溅鍑哄簱鍖恒�姹借溅鍑哄簱鍖� },
{
- "Name": "绌烘墭瀛樻斁鍖�,
- "Codes": [ "KTCFQ" ]
+ "TaskName": "绌烘墭涓婄嚎鍑哄簱",
+ "StartAreas": [ "KTCFQ" ], // 绌烘墭瀛樻斁鍖�+ "EndAreas": [ "BZQ" ] // 鍖呰鍖� },
{
- "Name": "绌虹瀛樻斁鍖�,
- "Codes": [ "HJQ1" ]
+ "TaskName": "绌虹涓婄嚎鍑哄簱",
+ "StartAreas": [ "KXHJQ" ], // 婊＄璐ф灦鍖�+ "EndAreas": [ "KXCZQ" ] // 绌虹鎿嶄綔鍖� },
{
- "Name": "婊℃墭瀛樻斁鍖�,
- "Codes": [ "HJQ2" ]
+ "TaskName": "绌烘墭鍏ュ簱",
+ "StartAreas": [ "KTJBQ" ], // 绌烘墭鍏ュ簱鎺ラ┏鍖�+ "EndAreas": [ "KTCFQ" ] // 绌烘墭瀛樻斁鍖� },
{
- "Name": "婊＄瀛樻斁鍖�,
- "Codes": [ "HJQ3" ]
+ "TaskName": "绌虹鍏ュ簱",
+ "StartAreas": [ "KXJBQ1", "KXJBQ2" ], // 绌虹鍏ュ簱鎺ラ┏鍖�銆�
+ "EndAreas": [ "KXHJQ" ] // 绌虹璐ф灦鍖� },
{
- "Name": "鎶芥鍖�,
- "Codes": [ "CJQ1" ]
+ "TaskName": "鎶芥鍑哄簱",
+ "StartAreas": [ "MTHJQ", "MXHJQ" ], // 婊℃墭璐ф灦鍖恒�婊＄璐ф灦鍖�+ "EndAreas": [ "CJQ" ] // 鎶芥鍖� },
{
- "Name": "鎶芥寮傚父鍖�,
- "Codes": [ "CJYCQ" ]
+ "TaskName": "鎶芥鍚堟牸鍥炲簱",
+ "StartAreas": [ "CJQ" ], // 鎶芥鍖�+ "EndAreas_Pallet": [ "MTHJQ" ], // 缁堢偣璐у尯锛堟墭鐩橈級锛氭弧鎵樿揣鏋跺尯
+ "EndAreas_Goodpack": [ "MXHJQ" ] // 缁堢偣璐у尯锛堝ソ杩愮锛夛細婊＄璐ф灦鍖� },
{
- "Name": "绌虹鎿嶄綔鍖�,
- "Codes": [ "CZQ1" ]
+ "TaskName": "鎶芥涓嶅悎鏍肩Щ搴�,
+ "StartAreas": [ "CJQ" ], // 鎶芥鍖�+ "EndAreas": [ "CJYCQ" ] // 鎶芥寮傚父鍖� },
{
- "Name": "婊＄鎿嶄綔鍖�,
- "Codes": [ "CZQ2" ]
+ "TaskName": "灏炬枡鍥炲簱",
+ "StartAreas": [ "HCCKQ", "QCCKQ" ], // 鐏溅鍑哄簱鍖�+ "EndAreas_Pallet": [ "MTHJQ" ], // 婊℃墭璐ф灦鍖�+ "EndAreas_Goodpack": [ "MXHJQ" ] // 婊＄璐ф灦鍖� },
{
- "Name": "绌烘墭鍏ュ簱鎺ラ┏鍖�,
- "Codes": [ "KTRKJBQ" ]
- },
- {
- "Name": "绌虹鍏ュ簱鎺ラ┏鍖�,
- "Codes": [ "KXRKJBQ1", "KXRKJBQ2" ]
- },
- {
- "Name": "姹借溅鍑哄簱澶囪揣鍖�, // 姹借溅鍑哄簱鏈堝彴
- "Codes": [ "CKQ-QC" ] // 鎷奸煶锛氬嚭搴撳尯-姹借溅
- },
- {
- "Name": "鐏溅鍑哄簱澶囪揣鍖�, // 鐏溅鍑哄簱鏈堝彴
- "Codes": [ "CKQ-HC" ] // 鎷奸煶锛氬嚭搴撳尯-鐏溅
+ "TaskName": "绉诲簱"
}
],
- "Tasks": [
+ "ProductionLines": [ // 浜х嚎淇℃伅锛堝緟瀹氾紝鏍规嵁鍚庨潰闇�眰鍐嶆洿鏀癸級
{
- "Name": "鎵樼洏-婊℃墭涓嬬嚎鍏ュ簱",
- "StartAreas": [ "BZQ" ],
- "EndAreas": [ "HJQ2" ]
- },
- {
- "Name": "濂借繍绠�婊＄涓嬬嚎鍏ュ簱",
- "StartAreas": [ "CZQ2" ],
- "EndAreas": [ "HJQ3" ]
- },
- {
- "Name": "鎵樼洏-绌烘墭涓婄嚎",
- "StartAreas": [ "KTCFQ" ],
- "EndAreas": [ "BZQ" ]
- },
- {
- "Name": "濂借繍绠�绌虹涓婄嚎",
- "StartAreas": [ "HJQ1" ],
- "EndAreas": [ "CZQ1" ]
- },
- {
- "Name": "鎵樼洏-绌烘墭鍏ュ簱",
- "StartAreas": [ "KTRKJBQ" ],
- "EndAreas": [ "KTCFQ" ]
- },
- {
- "Name": "濂借繍绠�绌虹鍏ュ簱",
- "StartAreas": [ "KXRKJBQ1" ],
- "EndAreas": [ "HJQ1" ]
- },
- {
- "Name": "鎶芥-鍑哄簱"
- },
- {
- "Name": "鎶芥-鍚堟牸鍥炲簱"
- },
- {
- "Name": "鎶芥-涓嶅悎鏍肩Щ搴�
- },
- {
- "Name": "鎴愬搧鑳跺嚭搴�
- }
- ],
- "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",
@@ -130,72 +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"
- ]
- }
- ],
- "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
+ "SlaveId": 4
}
]
}
\ No newline at end of file
--
Gitblit v1.9.1