From f317e966ce0872e04d1455305845c3e19fb4a532 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期日, 06 七月 2025 12:00:53 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi
---
HH.WCS.QingXiNongfu/process/DeviceProcess.cs | 112 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 70 insertions(+), 42 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/process/DeviceProcess.cs b/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
index 65da30a..3efb1c9 100644
--- a/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
@@ -1743,41 +1743,41 @@
if (data.Length == 4)
{
- //if (data == "1122")//A鍙ｅ伐浣滀俊鍙�- //{
- // if (BottlePEMInfoFullTwo(plc, plc.location[0]))
- // {
-
- // }
- //}
- //else if (data == "1221")//B鍙ｅ伐浣滀俊鍙�- //{
- // if (BottlePEMInfoFullTwo(plc, plc.location[1]))
- // {
-
- // }
- //}
- //else if (data == "1121")//B鍙ｅ伐浣滀俊鍙�- //{
- // if (BottlePEMInfoFullTwo(plc, plc.location[0]))
- // {
-
- // }
- // if (BottlePEMInfoFullTwo(plc, plc.location[1]))
- // {
-
- // }
- //}
-
- if (data.Substring(1, 1) == "1")
+ if (data == "1122")//A鍙ｅ伐浣滀俊鍙� {
- if (BottlePEMInfoFull(plc, plc.location[0]))
+ if (BottlePEMInfoFullTwo(plc, plc.location[0]))
{
- //璁惧娌℃湁鎵樼洏锛屾垨鑰呭凡缁忔湁浠诲姟锛屼笉澶勭悊婊℃墭淇″彿锛岃繑鍥炲凡缁忓彇璐у畬鎴�- //3F 00 11 0d 0a
- //PlcHelper.SendHex(plc.address, "3F00110d0a");
+
}
}
+ else if (data == "1221")//B鍙ｅ伐浣滀俊鍙�+ {
+ if (BottlePEMInfoFullTwo(plc, plc.location[1]))
+ {
+
+ }
+ }
+ else if (data == "1121")//B鍙ｅ伐浣滀俊鍙�+ {
+ if (BottlePEMInfoFullTwo(plc, plc.location[0]))
+ {
+
+ }
+ if (BottlePEMInfoFullTwo(plc, plc.location[1]))
+ {
+
+ }
+ }
+
+ //if (data.Substring(1, 1) == "1")
+ //{
+ // if (BottlePEMInfoFull(plc, plc.location[0]))
+ // {
+ // //璁惧娌℃湁鎵樼洏锛屾垨鑰呭凡缁忔湁浠诲姟锛屼笉澶勭悊婊℃墭淇″彿锛岃繑鍥炲凡缁忓彇璐у畬鎴�+ // //3F 00 11 0d 0a
+ // //PlcHelper.SendHex(plc.address, "3F00110d0a");
+ // }
+ //}
//else if (data.Substring(1, 1) == "3")
//{
// if (BottleCapInfoEmpty(plc, plc.location[0]))
@@ -1786,13 +1786,13 @@
// }
//}
- if (data.Substring(3, 1) == "1")
- {
- if (BottlePEMInfoFull(plc, plc.location[1]))
- {
- //PlcHelper.SendHex(plc.address, "3F00210d0a");
- }
- }
+ //if (data.Substring(3, 1) == "1")
+ //{
+ // if (BottlePEMInfoFull(plc, plc.location[1]))
+ // {
+ // //PlcHelper.SendHex(plc.address, "3F00210d0a");
+ // }
+ //}
//else if (data.Substring(3, 1) == "3")
//{
// if (BottleCapInfoEmpty(plc, plc.location[1]))
@@ -1997,23 +1997,51 @@
}
}
}
+ private static object locko = new object();
+
static bool BottlePEMInfoFullTwo(Settings.deviceInfo plc, string location)
{
+
+
try
{
- if (location != "")
+ lock (locko)
{
+ var chi = new SqlHelper<object>().GetInstance();
+ var newDb = chi.CopyNew();
+ Location endBit = null;
+ if (location == "")
+ {
+ throw new Exception("璐т綅涓虹┖");
+ }
var workOrder = WCSHelper.GetWorkOrder(plc.deviceName);
if (workOrder == null)
{
- LogHelper.Info(plc.deviceName + "娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
- return false;
+ throw new Exception("娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
}
+ if (workOrder.SQL_UsingNow == "Y")//鍗充骇鍗崇敤
+ {
+ //鏌ヨ 鍗婃垚鍝佸尯鍩熻〃 BcpQyOrder
+
+ }
+ else//闈炲嵆浜у嵆鐢�+ {
+
+ }
+ if (endBit != null)
+ {
+ var _ctrl = LocationHelper.GetLocCntrRel(location);
+ int endLayer = endBit.N_CURRENT_NUM + 1;
+ var carryCntrs = new List<string> { _ctrl.FirstOrDefault().S_CNTR_CODE };//DateTime.Now.ToString("yyMMddHHmmss") };
+ var bb = TaskProcess.CreateTransport(workOrder.SQL_WorkNo, location, endBit.S_LOC_CODE, "婊＄摱鍧�鍏ュ簱", carryCntrs, 1, endLayer, carryCntrs.Count, plc.taskPri);
+ }
+ return true;
}
- return false;
+
}
catch (Exception ex)
{
+ LogHelper.Info(plc.deviceName + $" 鎶ラ敊: {ex.Message}");
return false;
}
}
--
Gitblit v1.9.1