From 6226621ae47b6dd28e4517ca79bf66b6fa57d95e Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期五, 13 六月 2025 18:22:42 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.backup.json | 4 ++++
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs | 20 +++++++++++++++-----
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs | 21 +++++++++------------
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs | 1 +
4 files changed, 29 insertions(+), 17 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 d15714b..324cf49 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,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 070d127..9fedace 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
@@ -4045,7 +4045,7 @@
{
if (action)
{
- int[] num = new int[3] {1,1,1};
+ int[] num = new int[3] {1,0,1};
var writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
{
host = plc.ip,
@@ -4069,14 +4069,24 @@
{
//鎺ㄩ�灏忚溅杩涘叆
TSHelper.GoToAGV(taskNo, 10, 3);
- writeRes = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+
+ int[] num1 = new int[2] { 1, 2};
+ writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
{
host = plc.ip,
- addr = plc.writeAddr + 2,
- data = 2,
+ addr = plc.writeAddr + 1,
+ data = num1,
port = plc.port
});
- CMMLog.Debug($"鍐欏叆璁惧{plc.location}閫氶亾{plc.writeAddr + 2}閲岄潰鏁版嵁涓�.");
+
+ //writeRes = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+ //{
+ // host = plc.ip,
+ // addr = plc.writeAddr + 2,
+ // data = 2,
+ // port = plc.port
+ //});
+ CMMLog.Debug($"鍐欏叆璁惧{plc.location}閫氶亾{plc.writeAddr + 1}閲岄潰鏁版嵁涓簕JsonConvert.SerializeObject(num1)}.");
}
}
}
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
index 237f2cb..ee8401a 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
@@ -465,15 +465,14 @@
try
{
string endMachLoc = "";
- string endLoc = "";
//1銆佸垽鏂笂鏂欏钩鍙版槸鍚︾┖闂诧紝鑻ョ┖闂叉洿鏀圭粓鐐瑰埌涓婃枡骞冲彴
- var plc = Settings.GetPlcInfo().Where(a => a.deviceType == "18" && a.enable == 1).ToList();
+ var plc = Settings.GetPlcInfo().Where(a => a.deviceType == "51" && a.enable == 1).ToList();
if (plc.Count > 0)
{
#region 鍒ゆ柇杈撻�绾挎ā寮�鍙樻洿娉ㄩ噴
- bool action = true;
foreach(var a in plc)
{
+ bool action = false;
var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
{
dataNum = 1,
@@ -483,10 +482,9 @@
});
if (modeResult != null && modeResult.errCode == 0)
{
- CMMLog.Debug($"OutWareTask锛氳鍙栨粴绛掓満{a.ip}閫氶亾鍙蜂负锛歿a.readAddr}鐨勫�涓猴細{modeResult.result[0]}");
+ CMMLog.Debug($"OutWareTask锛氳鍙栨粴绛掓満ip:{a.ip},绔彛锛歿a.port}閫氶亾鍙蜂负锛歿a.readAddr}鐨勫�涓猴細{modeResult.result[0]}");
if (modeResult.result[0] == 2)
{
- action = false;
CMMLog.Debug($"OutWareTask:杈撻�绾夸负 鍏ュ簱妯″紡锛岃緭閫佺嚎鐐逛綅锛歿a.location}");
break;
}
@@ -498,12 +496,11 @@
{
if (modelInfo.Mode == "鍏ュ簱妯″紡")
{
- action = false;
CMMLog.Debug($"OutWareTask:涓棿琛�ModeList涓�鍏ュ簱妯″紡");
-
}
else
{
+ action = true;
int[] num = new int[1] { 1 };
var writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
{
@@ -516,16 +513,16 @@
}
else
{
- action = false;
CMMLog.Debug("OutWareTask:涓棿琛�ModeList 涓虹┖");
}
}
}
+ if (!action)
+ {
+ return false;
+ }
};
- if (!action)
- {
- return false;
- }
+
#endregion
CMMLog.Info($"OutWareTask 11111");
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs
index 3dea30b..5934831 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs
@@ -121,6 +121,7 @@
}
}
}
+ mst = iCallTask.FindTask(action.CN_S_TASK_NO);
if (IsSendTask) ProcessHelper.SendTask(mst);
}
}
--
Gitblit v1.9.1