From 25d5e0519ebde8a72cb5108d191ada41e64c9753 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 30 六月 2025 17:31:06 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs
index 9107ef9..67b86a9 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs
@@ -166,15 +166,7 @@
{
list.ForEach(a =>
{
- if(a.deviceType == "1")
- {
- PLCControl.PickUpBlank(a);
- }
- else
- {
- PLCControl.PickUpBlankTwo(a);
- }
-
+ PLCControl.PickUpBlankTwo(a);
});
}
}
@@ -201,12 +193,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);
@@ -319,7 +314,7 @@
list.ForEach(a =>
{
// 鍖呰鏈哄惎鍔ㄦ椂璇诲彇銆愮炕椤甸�閬撱�锛屾牴鎹〉鍙疯幏鍙栦簲鏉℃暟鎹紝鐒跺悗鍐欏叆鍖呰鏈�- //ERPService.WriteItemInfo(a);
+ ERPService.WriteItemInfoTwo(a);
PLCControl.CheckPackingMachineTetracobalt(a);
});
@@ -335,7 +330,7 @@
{
lock (lock10015)
{
- ERPService.insertMidTable();
+ //ERPService.insertMidTable();
}
}
#endregion
@@ -344,12 +339,12 @@
//鍥涢挻杞﹂棿鎵撳寘涓嬬嚎鐗╂枡淇℃伅闇�浠庝笅绾垮彛鑾峰彇
if (currActionModel.CN_N_ACTION_CODE == 10016)
{
- var plc = Settings.GetPlcInfo().Where(a => a.enable == 1 && a.deviceType == "26").FirstOrDefault();
+ var plc = Settings.GetPlcInfo().Where(a => a.enable == 1 && a.deviceType == "27").FirstOrDefault();
if (plc != null)
{
if (CheckStartFree(plc.location))
{
- PLCControl.CheckPackingLineFullTwo(plc);
+ PLCControl.CheckPackingLineFullThree(plc);
}
}
//Thread.Sleep(500);
--
Gitblit v1.9.1