From 67e758f3477eb057e3458a0a3e8a2e8c6e94592e Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 16 六月 2025 17:32:19 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs
index 46bc41a..56acb2c 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs
@@ -166,7 +166,15 @@
{
list.ForEach(a =>
{
- PLCControl.PickUpBlankTwo(a);
+ if(a.deviceType == "1")
+ {
+ PLCControl.PickUpBlank(a);
+ }
+ else
+ {
+ PLCControl.PickUpBlankTwo(a);
+ }
+
});
}
}
@@ -193,12 +201,15 @@
#region 10006-鍙犵洏鏈烘弧鎵樹笅绾匡紙3妤煎彔鐩樹笅绾匡級-3妤煎彔鐩樹笅绾�-宸插畬鎴�寰呮祴璇�
if (currActionModel.CN_N_ACTION_CODE == 10006)
{
- var plc = Settings.GetPlcInfo().Where(a => a.enable == 1 && (a.deviceType == "15" || a.deviceType == "25")).FirstOrDefault();
- if (plc != null)
+ var plc = Settings.GetPlcInfo().Where(a => a.enable == 1 && (a.deviceType == "15" || a.deviceType == "25")).ToList();
+ if (plc.Count >0 )
{
- if (PickUpStartFree(plc.location))
+ foreach(var a in plc)
{
- PLCControl.StackingLineEmpty(plc);
+ if (PickUpStartFree(a.location))
+ {
+ PLCControl.StackingLineEmpty(a);
+ }
}
}
//Thread.Sleep(500);
@@ -327,7 +338,7 @@
{
lock (lock10015)
{
- //ERPService.insertMidTable();
+ ERPService.insertMidTable();
}
}
#endregion
--
Gitblit v1.9.1