From b7cf29b366aa2afb5fada4b340bac268c1bb1534 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期四, 12 六月 2025 17:34:02 +0800
Subject: [PATCH] 123
---
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.json | 4 ++++
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.backup.json | 4 ----
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs | 19 ++++++++++---------
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs | 4 ++--
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.backup.json b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.backup.json
index 324cf49..d15714b 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.backup.json
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.backup.json
@@ -34,10 +34,6 @@
{
"$type": "Bookmark",
"Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
}
]
},
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.json b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.json
index d15714b..324cf49 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.json
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.json
@@ -34,6 +34,10 @@
{
"$type": "Bookmark",
"Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
}
]
},
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
index 5e0a7fb..070d127 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
@@ -959,17 +959,18 @@
var writeRes1 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
{
host = plc.ip,
- addr = plc.writeAddr + 3,// + 4
+ addr = plc.writeAddr,
+ data = 0,
+ port = plc.port
+ });
+
+ writeRes1 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+ {
+ host = plc.ip,
+ addr = plc.writeAddr + 3,
data = 1,
port = plc.port
});
- //var writeRes1 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
- //{
- // host = plc.ip,
- // addr = plc.writeAddr + 3,
- // data = 1,
- // port = plc.port
- //});
}
}
@@ -4134,7 +4135,7 @@
if (result.result[0] == 2 && result.result[1] == 2 && result.result[3] == 2)
{
//鎺ㄩ�灏忚溅杩涘叆
- TSHelper.GoToAGV(taskNo, 10, 3);
+ TSHelper.GoToAGV(taskNo, 10, 1);
var writeRes = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
{
host = plc.ip,
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
index 3a45058..237f2cb 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
@@ -135,8 +135,8 @@
var trayInfo = MongoDBSingleton.Instance.FindOne<trayTypeTable>(Query.EQ("locCode", mst.CN_S_START_BIT), "trayTypeTable");
if (trayInfo != null && trayInfo.trayType == "2")
{
- start.CN_N_AGV_LOCATION = MongoDBSingleton.Instance.FindOne<STOCK_LOCATION_Two>(Query.EQ("CN_S_LOCATION_CODE", mst.CN_S_START_BIT), "STOCK_LOCATION_Two").CN_N_AGV_LOCATION;
- end.CN_N_AGV_LOCATION = MongoDBSingleton.Instance.FindOne<STOCK_LOCATION_Two>(Query.EQ("CN_S_LOCATION_CODE", mst.CN_S_END_BIT), "STOCK_LOCATION_Two").CN_N_AGV_LOCATION;
+ start.CN_N_AGV_LOCATION = start.CN_N_AGV_LOCATION + 400;
+ end.CN_N_AGV_LOCATION = end.CN_N_AGV_LOCATION + 400;
CMMLog.Info($"浠诲姟鎺ㄩ�锛氱敯瀛楁墭璧风偣缁堢偣 绔欑偣鏇存敼锛岃捣鐐癸細{start.CN_N_AGV_LOCATION}锛岀粓鐐癸細{end.CN_N_AGV_LOCATION}");
}
--
Gitblit v1.9.1