From 3bdd686d50ae8c999924ac64101a5dbe4e271c71 Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期五, 04 七月 2025 17:27:19 +0800 Subject: [PATCH] 优化日志信息,删除冗余的工具类代码 --- config/config.json | 149 ++++++++++++++++--------------------------------- 1 files changed, 49 insertions(+), 100 deletions(-) diff --git a/config/config.json b/config/config.json index 81a3d4d..5b00f2f 100644 --- a/config/config.json +++ b/config/config.json @@ -1,70 +1,73 @@ { "WebApiUrl": "http://127.0.0.1:8901", "NdcApiUrl": "http://127.0.0.1:5201/api/order/", - "ErpApiUrl": "http://127.0.0.1:8085/api/", + "ErpApiUrl": "http://127.0.0.1:8901/api/", + "TcpServerPort": 6000, + "ErpRoute": { + "CreateTaskReturn": "CreateTaskReturn", + "PickUpReturn": "PickUpReturn" + }, "SqlServer": "Data Source=192.168.1.87;Initial Catalog=AMS_OIMobox;User ID=sa;Password=123456;", - "TcpServerIp": "127.0.0.1", - "TcpServerPort": 8085, - "Areas": [ + "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" ], + "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": [ @@ -74,12 +77,8 @@ "PlcIp": "127.0.0.1", "PlcPort": 502, "SlaveId": 1, - "OnLoc": [ - "CX11" - ], - "OffLoc": [ - "CX12" - ] + "OnLoc": [ "BZQ-1-1" ], + "OffLoc": [ "BZQ-1-2" ] }, { "Id": "2", @@ -87,72 +86,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