From 3ce6c91e5325d0067596b5a571a4faa74d067289 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 07 七月 2025 16:48:07 +0800
Subject: [PATCH] 修复满箱下线入库相关问题，优化日志和测试接口
---
config/config.json | 168 ++++++++++++++++++--------------------------------------
1 files changed, 54 insertions(+), 114 deletions(-)
diff --git a/config/config.json b/config/config.json
index 04cdfe5..5b00f2f 100644
--- a/config/config.json
+++ b/config/config.json
@@ -1,113 +1,73 @@
{
- "WebApiUrl": "http://127.0.0.1:8901/",
+ "WebApiUrl": "http://127.0.0.1:8901",
"NdcApiUrl": "http://127.0.0.1:5201/api/order/",
- "SqlServer": "Data Source=(local);Initial Catalog=DSZSHTest;User ID=sa;Password=123456;",
- "TcpServerIp": "127.0.0.1",
- "TcpServerPort": 8085,
- "Areas": [
+ "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;",
+ "TaskInfos": [
{
- "Name": "鍖呰鍖�,
- "Codes": [ "BZQ" ]
- },
- {
- "Name": "鎿嶄綔鍖�,
- "Codes": [ "CZQ1", "CZQ2" ]
- },
- {
- "Name": "璐ф灦鍖�,
- "Codes": [ "HJQ1", "HJQ2", "HJQ3", "HJQ4" ]
- },
- {
- "Name": "绌烘墭瀛樻斁鍖�,
- "Codes": [ "KTCFQ" ]
- },
- {
- "Name": "绌虹瀛樻斁鍖�,
- "Codes": [ "HJQ1" ]
- },
- {
- "Name": "婊℃墭瀛樻斁鍖�,
- "Codes": [ "HJQ2" ]
- },
- {
- "Name": "婊＄瀛樻斁鍖�,
- "Codes": [ "HJQ3" ]
- },
- {
- "Name": "鎶芥鍖�,
- "Codes": [ "CJQ1" ]
- },
- {
- "Name": "鎶芥寮傚父鍖�,
- "Codes": [ "CJYCQ" ]
- },
- {
- "Name": "绌虹鎿嶄綔鍖�,
- "Codes": [ "CZQ1" ]
- },
- {
- "Name": "婊＄鎿嶄綔鍖�,
- "Codes": [ "CZQ2" ]
- },
- {
- "Name": "绌烘墭鍏ュ簱鎺ラ┏鍖�,
- "Codes": [ "KTRKJBQ" ]
- },
- {
- "Name": "绌虹鍏ュ簱鎺ラ┏鍖�,
- "Codes": [ "KXRKJBQ1", "KXRKJBQ2" ]
- },
- {
- "Name": "姹借溅鍑哄簱澶囪揣鍖�,
- "Codes": [ "QCCKBHQ" ]
- },
- {
- "Name": "鐏溅鍑哄簱澶囪揣鍖�,
- "Codes": [ "HCCKBHQ" ]
- }
- ],
- "Tasks": [
- {
- "Name": "鎵樼洏-婊℃墭涓嬬嚎鍏ュ簱",
+ "TaskName": "婊℃墭涓嬬嚎鍏ュ簱",
"StartAreas": [ "BZQ" ],
- "EndAreas": [ "HJQ2" ]
+ "EndAreas": [ "MTHJQ" ]
},
{
- "Name": "濂借繍绠�婊＄涓嬬嚎鍏ュ簱",
- "StartAreas": [ "CZQ2" ],
- "EndAreas": [ "HJQ3" ]
+ "TaskName": "婊＄涓嬬嚎鍏ュ簱",
+ "StartAreas": [ "MXCZQ" ],
+ "EndAreas": [ "MXHJQ" ]
},
{
- "Name": "鎵樼洏-绌烘墭涓婄嚎",
+ "TaskName": "鎴愬搧鑳跺嚭搴�,
+ "StartAreas": [ "MTHJQ", "MXHJQ", "HCBHQ", "QCBHQ" ],
+ "EndAreas": [ "HCCKQ", "QCCKQ" ]
+ },
+ {
+ "TaskName": "绌烘墭涓婄嚎鍑哄簱",
"StartAreas": [ "KTCFQ" ],
"EndAreas": [ "BZQ" ]
},
{
- "Name": "濂借繍绠�绌虹涓婄嚎",
- "StartAreas": [ "HJQ1" ],
- "EndAreas": [ "CZQ1" ]
+ "TaskName": "绌虹涓婄嚎鍑哄簱",
+ "StartAreas": [ "KXHJQ" ],
+ "EndAreas": [ "KXCZQ" ]
},
{
- "Name": "鎵樼洏-绌烘墭鍏ュ簱",
- "StartAreas": [ "KTRKJBQ" ],
+ "TaskName": "绌烘墭鍏ュ簱",
+ "StartAreas": [ "KTJBQ" ],
"EndAreas": [ "KTCFQ" ]
},
{
- "Name": "濂借繍绠�绌虹鍏ュ簱",
- "StartAreas": [ "KXRKJBQ1" ],
- "EndAreas": [ "HJQ1" ]
+ "TaskName": "绌虹鍏ュ簱",
+ "StartAreas": [ "KXJBQ1", "KXJBQ2" ],
+ "EndAreas": [ "KXHJQ" ]
},
{
- "Name": "鎶芥"
+ "TaskName": "鎶芥鍑哄簱",
+ "StartAreas": [ "MTHJQ", "MXHJQ" ],
+ "EndAreas": [ "CJQ" ]
},
{
- "Name": "鎴愬搧鑳跺嚭搴�
+ "TaskName": "鎶芥鍚堟牸鍥炲簱",
+ "StartAreas": [ "CJQ" ],
+ "EndAreas_Pallet": [ "MTHJQ" ],
+ "EndAreas_Goodpack": [ "MXHJQ" ]
},
{
- "Name": "鎵樼洏-绌烘墭缁戝畾"
+ "TaskName": "鎶芥涓嶅悎鏍肩Щ搴�,
+ "StartAreas": [ "CJQ" ],
+ "EndAreas": [ "CJYCQ" ]
},
{
- "Name": "濂借繍绠�绌虹缁戝畾"
+ "TaskName": "灏炬枡鍥炲簱",
+ "StartAreas": [ "HCCKQ", "QCCKQ" ],
+ "EndAreas_Pallet": [ "MTHJQ" ],
+ "EndAreas_Goodpack": [ "MXHJQ" ]
+ },
+ {
+ "TaskName": "绉诲簱"
}
],
"ProductionLines": [
@@ -117,51 +77,31 @@
"PlcIp": "127.0.0.1",
"PlcPort": 502,
"SlaveId": 1,
- "OnLoc": [
- "CX11"
- ],
- "OffLoc": [
- "CX12"
- ]
+ "OnLoc": [ "BZQ-1-1" ],
+ "OffLoc": [ "BZQ-1-2" ]
},
{
"Id": "2",
"Name": "鎵樼洏浜х嚎2",
"PlcIp": "127.0.0.1",
- "PlcPort": 502,
+ "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": 502,
- "SlaveId": 3,
- "OnLoc": [
- "CX31"
- ],
- "OffLoc": [
- "CX32"
- ]
+ "PlcPort": 504,
+ "SlaveId": 3
},
{
"Id": "4",
"Name": "濂借繍绠变骇绾�",
"PlcIp": "127.0.0.1",
- "PlcPort": 502,
- "SlaveId": 4,
- "OnLoc": [
- "CX41"
- ],
- "OffLoc": [
- "CX42"
- ]
+ "PlcPort": 505,
+ "SlaveId": 4
}
]
}
\ No newline at end of file
--
Gitblit v1.9.1