From f8d23dcf8d6501482db1a5180325194232afe96c Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 18 七月 2025 17:30:09 +0800
Subject: [PATCH] 封装部分业务代码，继续优化日志打印流程
---
config/config.comment.json | 169 +++++++++++++++++++-------------------------------------
1 files changed, 57 insertions(+), 112 deletions(-)
diff --git a/config/config.comment.json b/config/config.comment.json
index 4acea66..5bddc0f 100644
--- a/config/config.comment.json
+++ b/config/config.comment.json
@@ -1,88 +1,83 @@
{
- //"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;",
- "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涓嬪彂鍑哄簱璁″垝,鍒涘缓浠诲姟鍚庡弽棣圗RP鐨勬帴鍙�+ "PickUpReturn": "PickUpReturn" // 鏍规嵁ERP涓嬪彂鍑哄簱璁″垝,AGV鍙栬揣鍚庡弽棣圗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": [ "KXCZQ" ]
+ "TaskName": "婊＄涓嬬嚎鍏ュ簱",
+ "StartAreas": [ "MXCZQ" ], // 婊＄鎿嶄綔鍖�+ "EndAreas": [ "MXHJQ" ] // 婊＄璐ф灦鍖� },
{
- "Name": "婊＄鎿嶄綔鍖�,
- "Codes": [ "MXCZQ" ]
+ "TaskName": "鎴愬搧鑳跺嚭搴�,
+ "StartAreas": [ "MTHJQ", "MXHJQ", "HCBHQ", "QCBHQ" ], // 婊℃墭璐ф灦鍖�婊＄璐ф灦鍖�鐏溅澶囪揣鍖�姹借溅澶囪揣鍖�+ "EndAreas": [ "HCCKQ", "QCCKQ" ] // 鐏溅鍑哄簱鍖�姹借溅鍑哄簱鍖� },
{
- "Name": "绌烘墭瀛樻斁鍖�,
- "Codes": [ "KTCFQ" ]
+ "TaskName": "绌烘墭涓婄嚎鍑哄簱",
+ "StartAreas": [ "KTCFQ" ], // 绌烘墭瀛樻斁鍖�+ "EndAreas": [ "BZQ" ] // 鍖呰鍖� },
{
- "Name": "绌虹璐ф灦鍖�,
- "Codes": [ "KXHJQ" ]
+ "TaskName": "绌虹涓婄嚎鍑哄簱",
+ "StartAreas": [ "KXHJQ" ], // 婊＄璐ф灦鍖�+ "EndAreas": [ "KXCZQ" ] // 绌虹鎿嶄綔鍖� },
{
- "Name": "婊℃墭璐ф灦鍖�,
- "Codes": [ "MTHJQ" ]
+ "TaskName": "绌烘墭鍏ュ簱",
+ "StartAreas": [ "KTJBQ" ], // 绌烘墭鍏ュ簱鎺ラ┏鍖�+ "EndAreas": [ "KTCFQ" ] // 绌烘墭瀛樻斁鍖� },
{
- "Name": "婊＄璐ф灦鍖�,
- "Codes": [ "MXHJQ" ]
+ "TaskName": "绌虹鍏ュ簱",
+ "StartAreas": [ "KXJBQ1", "KXJBQ2" ], // 绌虹鍏ュ簱鎺ラ┏鍖�,2
+ "EndAreas": [ "KXHJQ" ] // 绌虹璐ф灦鍖� },
{
- "Name": "鎶芥鍖�,
- "Codes": [ "CJQ" ]
+ "TaskName": "鎶芥鍑哄簱",
+ "StartAreas": [ "MTHJQ", "MXHJQ" ], // 婊℃墭璐ф灦鍖�婊＄璐ф灦鍖�+ "EndAreas": [ "CJQ" ] // 鎶芥鍖� },
{
- "Name": "鎶芥寮傚父鍖�,
- "Codes": [ "CJYCQ" ]
+ "TaskName": "鎶芥鍚堟牸鍥炲簱",
+ "StartAreas": [ "CJQ" ], // 鎶芥鍖�+ "EndAreas_Pallet": [ "MTHJQ" ], // 缁堢偣璐у尯 (鎵樼洏) :婊℃墭璐ф灦鍖�+ "EndAreas_Goodpack": [ "MXHJQ" ] // 缁堢偣璐у尯 (濂借繍绠� :婊＄璐ф灦鍖� },
{
- "Name": "绌烘墭鍏ュ簱鎺ラ┏鍖�,
- "Codes": [ "KTJBQ" ]
+ "TaskName": "鎶芥涓嶅悎鏍肩Щ搴�,
+ "StartAreas": [ "CJQ" ], // 鎶芥鍖�+ "EndAreas": [ "CJYCQ" ] // 鎶芥寮傚父鍖� },
{
- "Name": "绌虹鍏ュ簱鎺ラ┏鍖�,
- "Codes": [ "KXJBQ1", "KXJBQ2" ]
+ "TaskName": "灏炬枡鍥炲簱",
+ "StartAreas": [ "HCCKQ", "QCCKQ" ], // 鐏溅鍑哄簱鍖�+ "EndAreas_Pallet": [ "MTHJQ" ], // 婊℃墭璐ф灦鍖�+ "EndAreas_Goodpack": [ "MXHJQ" ] // 婊＄璐ф灦鍖� },
{
- "Name": "姹借溅鍑哄簱鍖�,
- "Codes": [ "QCCKQ" ]
- },
- {
- "Name": "鐏溅鍑哄簱鍖�,
- "Codes": [ "HCCKQ" ]
- },
- {
- "Name": "姹借溅澶囪揣鍖�,
- "Codes": [ "QCBHQ" ]
- },
- {
- "Name": "鐏溅澶囪揣鍖�,
- "Codes": [ "HCBHQ" ]
+ "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",
@@ -90,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