From 8111f0b69161ca7be2246c03e9ffba1e2fe989e9 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期三, 11 六月 2025 17:19:46 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.json | 4 --
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs | 72 +++++++++++++++++++++++++----------
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs | 26 ++++++++++++-
3 files changed, 75 insertions(+), 27 deletions(-)
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 324cf49..d15714b 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,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/PLCControl.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
index 596065b..5e0a7fb 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
@@ -503,8 +503,8 @@
data = num,//鍘熷厛鏄�,鍗曚釜鍐欏叆
port = plc.port
});
- CMMLog.Debug($"鍐欏叆璁惧{plc.location}閫氶亾{plc.writeAddr}閲岄潰鏁版嵁涓�.");
- Console.WriteLine($"鍐欏叆璁惧{plc.location}閫氶亾{plc.writeAddr}閲岄潰鏁版嵁涓�.");
+ CMMLog.Debug($"鍐欏叆璁惧{plc.location}閫氶亾{plc.writeAddr}閲岄潰鏁版嵁涓簕JsonConvert.SerializeObject(num)}.");
+ Console.WriteLine($"鍐欏叆璁惧{plc.location}閫氶亾{plc.writeAddr}閲岄潰鏁版嵁涓簕JsonConvert.SerializeObject(num)}.");
///灏忚溅鍜屽绉颁綅瀵规帴
//灏忚溅璇锋眰杩涙枡锛屽苟涓旀煡璇㈣澶囨槸鍚﹀厑璁窤GV杩涘叆
var readRes = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
@@ -766,6 +766,7 @@
}
if (result.result[0] == 3 && result.result[2] == 1)
+ //if (result.result[2] == 1)
{
CMMLog.Info($"SecondWeightActionOne:鍑嗗鐢熸垚澶嶇О鍏ョ紦瀛樻灦浠诲姟锛屽紑濮嬬‘瀹氭墭鐩樺彿:{model.ext2}");
if(plc.deviceType == "22")
@@ -1470,17 +1471,21 @@
/// <param name="taskNo"></param>
internal static void CacheStackingMouth6(Settings.PlcInfo plc)
{
- //var readres = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
- //{
- // dataNum = 2,
- // addr = plc.readAddr + 1,
- // host = plc.ip,
- // port = plc.port
- //});
- //if (readres != null)
- //{
-
- //}
+ var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+ {
+ addr = plc.writeAddr + 1,
+ data = 3,
+ host = plc.ip,
+ port = plc.port
+ });
+ Thread.Sleep(2000);
+ wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+ {
+ addr = plc.writeAddr + 1,
+ data = 0,
+ host = plc.ip,
+ port = plc.port
+ });
}
/// <summary>
@@ -3731,12 +3736,26 @@
CMMLog.Debug($"锛堝洓閽磋溅闂达級鍖呰涓嬬嚎娴佺▼-{pmInfo.location}锛氬憳宸ョ紪鐮侊細{employeeId}");
// 鍒ゆ柇褰撳墠銆愬憳宸ョ紪鍙枫�閫氶亾淇℃伅璇诲嚭鏉ョ殑鍛樺伐缂栧彿鏄惁宸茬粡瀛樺湪浜庢垜浠殑鍛樺伐淇℃伅琛�ERPEmployeeTable(鏌ヨ瀛楁-employee_id)
var erpEmployeeInfo = MongoDBSingleton.Instance.FindOne<ERPEmployeeTable>(Query.EQ("employee_id", employeeId), "ERPEmployeeTable");
- if (erpEmployeeInfo == null) IsContLaterCode = false;
+ var erpItemInfo = MongoDBSingleton.Instance.FindOne<ERPItemTable>(Query.EQ("item_code", tray.materialCode), "ERPItemTable");
+ if (string.IsNullOrEmpty(tray.empCode) || string.IsNullOrEmpty(tray.materialCode) || erpEmployeeInfo == null || erpEmployeeInfo == null)
+ {
+ CMMLog.Debug($"锛堝洓閽磋溅闂达級鍖呰涓嬬嚎娴佺▼-{pmInfo.location}锛氫汉鍛樿〃鎴栬�鐗╂枡琛ㄦ湭鎵惧埌璇ユ暟鎹紝鍛樺伐缂栧彿锛歿employeeId}锛岀墿鏂欑紪鐮侊細{tray.materialCode}锛�);
+ IsContLaterCode = false;
+ }
else CMMLog.Debug($"锛堝洓閽磋溅闂达級鍖呰涓嬬嚎娴佺▼-{pmInfo.location}锛氬憳宸ョ紪鐮佹煡璇㈡垚鍔�);
}
if (IsContLaterCode)
{
+ //妫�储鍛樺伐淇℃伅鎴愬姛
+ var wirteall01 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+ {
+ addr = pmInfo.writeAddr,
+ host = pmInfo.ip,
+ port = pmInfo.port,
+ data = 4
+ });
+
//string timeStamp = ProcessHelper.GetTimeStamp(31, 1, 1);
//tray.trayCode = "VW" + timeStamp;
//MongoDBSingleton.Instance.Update<MachineInfoTetracobalt>(Query.EQ("_id", tray._id), Update.Set("trayCode", tray.trayCode), UpdateFlags.None);
@@ -4081,17 +4100,28 @@
{
if (action)
{
- int[] num = new int[4] { 2, 0, 0, 1 };
- var writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
+ var result = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
{
+ dataNum = 1,
+ addr = plc.readAddr + 3,
host = plc.ip,
- addr = plc.writeAddr,
- data = num,
port = plc.port
});
- CMMLog.Debug($"鍐欏叆璁惧{plc.location}閫氶亾{plc.writeAddr}閲岄潰鏁版嵁涓簕JsonConvert.SerializeObject(num)}.");
+ CMMLog.Debug($"鏌ヨ璁惧{plc.location}閫氶亾{plc.readAddr + 3}閲岄潰鏁版嵁涓簕result.result[0]}.");
+ if (result.result[0] == 1)
+ {
+ int[] num = new int[4] { 2, 0, 0, 1 };
+ var writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
+ {
+ host = plc.ip,
+ addr = plc.writeAddr,
+ data = num,
+ port = plc.port
+ });
+ CMMLog.Debug($"鍐欏叆璁惧{plc.location}閫氶亾{plc.writeAddr}閲岄潰鏁版嵁涓簕JsonConvert.SerializeObject(num)}.");
+ }
- var result = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
+ result = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
{
dataNum = 4,
addr = plc.readAddr,
@@ -4105,7 +4135,7 @@
{
//鎺ㄩ�灏忚溅杩涘叆
TSHelper.GoToAGV(taskNo, 10, 3);
- writeRes = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+ var writeRes = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
{
host = plc.ip,
addr = plc.writeAddr + 3,
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
index 7222b46..3a45058 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
@@ -254,6 +254,7 @@
if (mst.CN_S_BUSS_TYPE == "鍖呰绾胯ˉ绌�) PLCControl.PackingLineComplete(plc.ip);
if (mst.CN_S_BUSS_TYPE == "鐢垫鍙栬揣") PLCControl.LiftAction(plc, mst.CN_S_TASK_NO,false);
if (mst.CN_S_BUSS_TYPE == "鍥涢挻鎴愬搧鍑哄簱" || mst.CN_S_BUSS_TYPE == "鍥涢挻杈呮潗鍑哄簱") PLCControl.productOutWare(mst.CN_S_END_BIT, mst.CN_S_TASK_NO, false);
+ if (mst.CN_S_BUSS_TYPE == "3妤肩紦瀛樻灦鍏ュ彔鎵�) PLCControl.CacheStackingMouth6(plc);
}
}
}
@@ -471,7 +472,7 @@
{
#region 鍒ゆ柇杈撻�绾挎ā寮�鍙樻洿娉ㄩ噴
bool action = true;
- plc.ForEach(a =>
+ foreach(var a in plc)
{
var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
{
@@ -487,6 +488,7 @@
{
action = false;
CMMLog.Debug($"OutWareTask:杈撻�绾夸负 鍏ュ簱妯″紡锛岃緭閫佺嚎鐐逛綅锛歿a.location}");
+ break;
}
else
{
@@ -498,6 +500,18 @@
{
action = false;
CMMLog.Debug($"OutWareTask:涓棿琛�ModeList涓�鍏ュ簱妯″紡");
+
+ }
+ else
+ {
+ int[] num = new int[1] { 1 };
+ var writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
+ {
+ host = a.ip,
+ addr = a.writeAddr,
+ data = num,
+ port = a.port
+ });
}
}
else
@@ -507,7 +521,7 @@
}
}
}
- });
+ };
if (!action)
{
return false;
@@ -631,6 +645,14 @@
}
else
{
+ int[] num = new int[1] { 2 };
+ var writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
+ {
+ host = plc.ip,
+ addr = plc.writeAddr,
+ data = num,
+ port = plc.port
+ });
return true;
}
}
--
Gitblit v1.9.1