From ef83aea1ac3325003b4ed8cddd23d295c6a01b1d Mon Sep 17 00:00:00 2001
From: zxx <Zxx@HanInfo>
Date: 星期一, 09 六月 2025 17:31:56 +0800
Subject: [PATCH] jushi
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/core/WMSCore.cs | 96 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 94 insertions(+), 2 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/core/WMSCore.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/core/WMSCore.cs
index dd55966..374ec39 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/core/WMSCore.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/core/WMSCore.cs
@@ -194,7 +194,7 @@
//鎵鹃�妫�叆搴撳尯鍐呮墭鐩樻弧浜嗙殑璐т綅
var locList = db.Queryable<Location>()
- .Where(p => p.S_AREA_CODE == reservoirs.areaCode && p.N_LOCK_STATE == 0)
+ .Where(p => p.S_AREA_CODE == reservoirs.areaCode && p.N_LOCK_STATE == 0 && p.C_ENABLE == "Y")
.Where(s => locCntrs.Contains(s.S_CODE.Trim()))
.ToList();
@@ -318,7 +318,7 @@
dev = "2";
}
var endLocation = db.Queryable<Location>().Where(s => s.S_CODE == endLoc).First();
- if (endLocation == null || endLocation.N_LOCK_STATE != 0)
+ if (endLocation == null || endLocation.N_LOCK_STATE != 0 || endLocation.C_ENABLE != "Y")
{
//LogHelper.Info($"鎷嗘墭鏈鸿揣浣峽endLoc}涓嶅瓨鍦ㄦ垨宸茶閿�);
return;
@@ -422,7 +422,99 @@
}
+ //浜х嚎鑷姩琛ョ┖鎵�+ public static void AutoRepairEmptyTray()
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ try
+ {
+ var reservoirs1 = Settings.ReservoirAreas.Where(s => s.areaName == "3min绌烘墭鍖�).FirstOrDefault();
+ var reservoirs2 = Settings.ReservoirAreas.Where(s => s.areaName == "6min绌烘墭鍖�).FirstOrDefault();
+ var linePlcInfo1 = Settings.linePlcInfos.Where(s => s.deviceNo == "1").FirstOrDefault();
+ var linePlcInfo2 = Settings.linePlcInfos.Where(s => s.deviceNo == "2").FirstOrDefault();
+ ////鎵惧埌绌烘墭缂撳瓨鍖虹殑鎵�湁璐т綅缂栧彿
+ //var locList = db.Queryable<Location>()
+ // .Where(s => s.S_AREA_CODE == reservoirs1.areaCode || s.S_AREA_CODE == reservoirs2.areaCode)
+ // .Where(s => s.N_LOCK_STATE == 0)
+ // .OrderByDescending(s => s.N_ROW).OrderByDescending(s => s.N_COL).OrderBy(s => s.N_LAYER)
+ // .Select(s => s.S_CODE)
+ // .ToList();
+
+
+ //鏌ヨ姣忔帓鏈�悗涓�垪鏈夋墭鐩樼殑璐т綅 鏍规嵁琛屽垎鍖�鍐嶆壘姣忎竴琛岀殑鏈�悗涓�垪鏈夎揣鐨勮揣浣�+ var list = db.Queryable<Location>().
+ Where(a => a.N_CURRENT_NUM > 0).Where(a => a.S_AREA_CODE.Trim() == reservoirs1.areaCode || a.S_AREA_CODE.Trim() == reservoirs2.areaCode)
+ .PartitionBy(a => a.N_ROW)
+ .OrderByDescending(a => a.N_COL).Take(1).ToList();
+ if (list.Count > 0)
+ {
+ for (int i = 0; i < list.Count; i++)
+ {
+ //var loc = list[i];
+ //鍒ゆ柇閫佸線3瀵歌繕鏄�瀵告媶鎵樻満
+ string endLoc = null;
+ string dev = null;
+ if (list[i].S_AREA_CODE == reservoirs1.areaCode)
+ {
+ endLoc = linePlcInfo1.inLoca;
+ dev = "1";
+ }
+ else if (list[i].S_AREA_CODE == reservoirs2.areaCode)
+ {
+ endLoc = linePlcInfo2.inLoca;
+ dev = "2";
+ }
+ var endLocation = db.Queryable<Location>().Where(s => s.S_CODE == endLoc).First();
+ if (endLocation == null || endLocation.N_LOCK_STATE != 0)
+ {
+ //LogHelper.Info($"鎷嗘墭鏈鸿揣浣峽endLoc}涓嶅瓨鍦ㄦ垨宸茶閿�);
+ return;
+ }
+ //鏍￠獙鏄惁鍏佽鏀捐揣
+ var plcDeviceTable = S7Helper.plcDeviceTables;
+ LogHelper.Info($"鑷姩閫佹墭 鎷嗘墭鏈簕dev}:{plcDeviceTable.requestPut1}");
+ if ((plcDeviceTable.requestPut1 && dev == "1") ||
+ (plcDeviceTable.requestPut2 && dev == "2"))
+ {
+ var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == list[i].S_CODE).First();
+
+ LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{list[i].S_CODE}缁堢偣:{endLoc}");
+ var res = TaskProcess.CreateTransport(list[i].S_CODE, endLoc, "閫佹墭", locCntrRel.S_CNTR_CODE, 1, 1);
+ if (res)
+ {
+ LogHelper.Info($"璧风偣:{list[i].S_CODE}缁堢偣:{endLoc}浠诲姟鍒涘缓鎴愬姛");
+ }
+ else
+ {
+ LogHelper.Info($"璧风偣:{list[i].S_CODE}缁堢偣:{endLoc}浠诲姟鍒涘缓澶辫触");
+ }
+ }
+ else
+ {
+ LogHelper.Info($"鎷嗘墭鏈簕endLoc}涓嶅厑璁告斁妗�);
+ }
+ }
+ }
+
+
+
+
+
+
+
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine("AutoReplenish:" + ex.Message + ex.StackTrace);
+ LogHelper.Error("AutoReplenish:" + ex.Message, ex);
+ throw;
+ }
+
+
+
+ }
+
}
}
--
Gitblit v1.9.1