From eefaff1848378ea243f655894ce9ac660fd01a84 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期一, 16 六月 2025 13:06:22 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/core/Monitor.cs | 143 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 103 insertions(+), 40 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 808024a..849f5d4 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -1120,7 +1120,7 @@
if (CDlist.Contains(EdnRarea))
{
isCd = true;
- inlock = LocationHelper.GetList<RowLock>(x => x.S_AREA_CODE == EdnRarea && x.S_LOCK_SRC == cir1.S_ITEM_CODE + cir1.S_ITEM_NAME && x.S_LOCK_STATE == "鍏ュ簱閿�).FirstOrDefault();
+ inlock = LocationHelper.GetList<RowLock>(x => x.S_AREA_CODE == EdnRarea && x.S_LOCK_SRC == cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME && x.S_LOCK_STATE == "鍏ュ簱閿�).FirstOrDefault();
if (inlock != null)
{
arloclist = arloclist.FindAll(x => x.N_ROW == inlock.N_ROW).ToList();
@@ -1146,7 +1146,7 @@
if (s_clrel0 != null && string.IsNullOrEmpty(s_clrel0.S_TYPE))
{
var cntrrel = ContainerHelper.GetCntrItemRel(rr_clrel.FirstOrDefault()?.S_CNTR_CODE).FirstOrDefault();
- if (cntrrel.S_ITEM_CODE == cir1.S_ITEM_CODE && cntrrel.S_ITEM_NAME == cir1.S_ITEM_NAME)
+ if (cntrrel.S_ITEM_CODE == cir1.S_ITEM_CODE && cntrrel.S_ITEM_NAME == cir1.S_ITEM_NAME && cntrrel.S_CJ_NAME == cir1.S_CJ_NAME)
{
if (_cl2.N_CURRENT_NUM < _cl2.N_CAPACITY)
endbit = _cl2;
@@ -1166,7 +1166,7 @@
var cntrrel = ContainerHelper.GetCntrItemRel(rel.FirstOrDefault()?.S_CNTR_CODE).FirstOrDefault();
if (cntrrel == null)
continue;
- if (cntrrel.S_ITEM_CODE == cir1.S_ITEM_CODE && cntrrel.S_ITEM_NAME == cir1.S_ITEM_NAME)
+ if (cntrrel.S_ITEM_CODE == cir1.S_ITEM_CODE && cntrrel.S_ITEM_NAME == cir1.S_ITEM_NAME && cntrrel.S_CJ_NAME == cir1.S_CJ_NAME)
{
LogHelper.Info($"鍏ュ簱搴撱�浣跨敤{endbit.S_LOC_CODE}");
}
@@ -1191,7 +1191,7 @@
LogHelper.Info($"{r.Key}鍘熺墿鏂欐惉杩�{sign} 浠诲姟 锛屽垱寤簕res} ");
if (res && inlock == null && isCd)
{
- var rrrr = new RowLock { S_LOCK_SRC = cir1.S_ITEM_CODE + cir1.S_ITEM_NAME, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍏ュ簱閿�, S_AREA_CODE = endbit.S_AREA_CODE, N_ROW = endbit.N_ROW };
+ var rrrr = new RowLock { S_LOCK_SRC = cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍏ュ簱閿�, S_AREA_CODE = endbit.S_AREA_CODE, N_ROW = endbit.N_ROW };
WCSHelper.Do(db => db.Insertable(rrrr).ExecuteCommand());
}
if (EdnRarea == "YWLWJJB") InworkLock = false;
@@ -1281,6 +1281,7 @@
S_NOTE = cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim(),
S_ITEM_CODE = cir.S_ITEM_CODE,
S_ITEM_NAME = cir.S_ITEM_NAME,
+ S_CJ_NAME = cir.S_CJ_NAME,
S_CNTR_CODE = cir.S_CNTR_CODE
})
.ToList();
@@ -1331,12 +1332,7 @@
if (tklist.Count() > 0)
{
var tk = tklist.FirstOrDefault();
- var Cjsj = LocationHelper.GetList<CjTimeOrder>(x => tklist.Select(c => c.S_CJ_NAME).ToList().Contains(x.S_CJ_NAME) && tklist.Select(c => c.SQL_ItemCode).ToList().Contains(x.S_ITEM_CODE));
- if (Cjsj.Count() > 0)
- {
- var Cj = Cjsj.OrderBy(e => e.T_CJ_TIME).ToList().FirstOrDefault();
- tk = tklist.Find(e => e.S_CJ_NAME == Cj.S_CJ_NAME && e.SQL_ItemCode == Cj.S_ITEM_CODE);
- }
+
var loc = LocationHelper.GetLoc(plc.location[0]);
if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "鏃�)
{
@@ -1387,23 +1383,16 @@
try
{
//return;
-
-
///璧风偣鏁版嵁銆� 缁堢偣搴撳尯 鍫嗗彔灞傛暟銆�- YwlPETK_CreInwork(PElocsFirst, "YWLTKMKQ", "鎻愭墸鍙夎繍", 1);//鎻愭墸鍏ュ簱
- YwlPETK_CreInwork(TKlocsFirst, "YWLTKMKQ", "鏀剁缉鑶滃弶杩�); // PE鍏ュ簱
+ YwlPETK_CreInwork(PElocsFirst, "YWLTKMKQ", "鎻愭墸鍙夎繍", 3);//鎻愭墸鍏ュ簱--PE鑶�+ YwlPETK_CreInwork(TKlocsFirst, "YWLTKMKQ", "鏀剁缉鑶滃弶杩�, 1); // PE鍏ュ簱 --鎻愭墸
//YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "鏀剁缉鑶滃弶杩�);
//YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "鏀剁缉鑶滃弶杩�);// PE涓嚭搴� var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2鎻愬崌鏈�鏀剁缉鑶� && x.WorkType == 1 && x.SQL_State == "鎵ц涓�);
if (tklist.Count() > 0)
{
var tk = tklist.FirstOrDefault();
- var Cjsj = LocationHelper.GetList<CjTimeOrder>(x => tklist.Select(c => c.S_CJ_NAME).ToList().Contains(x.S_CJ_NAME) && tklist.Select(c => c.SQL_ItemCode).ToList().Contains(x.S_ITEM_CODE));
- if (Cjsj.Count() > 0)
- {
- var Cj = Cjsj.OrderBy(e => e.T_CJ_TIME).ToList().FirstOrDefault();
- tk = tklist.Find(e => e.S_CJ_NAME == Cj.S_CJ_NAME && e.SQL_ItemCode == Cj.S_ITEM_CODE);
- }
+
var loc = LocationHelper.GetLoc(plc.location[0]);
if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "鏃�)
@@ -1489,12 +1478,12 @@
var order = yuworders.FirstOrDefault();
if (yuworders.Count() > 0)
{
- var Cjsj = LocationHelper.GetList<CjTimeOrder>(x => yuworders.Select(c => c.S_CJ_NAME).ToList().Contains(x.S_CJ_NAME) && yuworders.Select(c => c.SQL_ItemCode).ToList().Contains(x.S_ITEM_CODE));
- if (Cjsj.Count() > 0)
- {
- var Cj = Cjsj.OrderBy(e => e.T_CJ_TIME).ToList().FirstOrDefault();
- order = yuworders.Find(e => e.S_CJ_NAME == Cj.S_CJ_NAME && e.SQL_ItemCode == Cj.S_ITEM_CODE);
- }
+ //var Cjsj = LocationHelper.GetList<CjTimeOrder>(x => yuworders.Select(c => c.S_CJ_NAME).ToList().Contains(x.S_CJ_NAME) && yuworders.Select(c => c.SQL_ItemCode).ToList().Contains(x.S_ITEM_CODE));
+ //if (Cjsj.Count() > 0)
+ //{
+ // var Cj = Cjsj.OrderBy(e => e.T_CJ_TIME).ToList().FirstOrDefault();
+ // order = yuworders.Find(e => e.S_CJ_NAME == Cj.S_CJ_NAME && e.SQL_ItemCode == Cj.S_ITEM_CODE);
+ //}
}
if (order != null)
{
@@ -1541,15 +1530,18 @@
var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
if (!cirs.Any()) continue;
cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
- if (cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName)
+ if (cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName && cir.S_CJ_NAME == order.S_CJ_NAME)
{
+
+ //plg 2025骞�鏈�3鏃�09:08:10
Temp = new locCntItem
{
N_CURRENT_NUM = lastfull.N_CURRENT_NUM,
S_CNTR_CODE = cir.S_CNTR_CODE,
S_LOC_CODE = lastfull.S_LOC_CODE,
HalfOrFull = (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3)),
- S_NOTE = cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim()
+ S_NOTE = cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim(),
+ S_CJ_NAME = cir.S_CJ_NAME
};
if (outlock != null)
{
@@ -1833,15 +1825,17 @@
var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
if (!cirs.Any()) continue;
cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
- if (cir.S_ITEM_CODE == od.SQL_ItemCode && cir.S_ITEM_NAME == od.SQL_ItemName)
+ if (cir.S_ITEM_CODE == od.SQL_ItemCode && cir.S_ITEM_NAME == od.SQL_ItemName && cir.S_CJ_NAME == od.S_CJ_NAME)
{
+ //plg 2025骞�鏈�3鏃�09:09:25
Temp = new locCntItem
{
N_CURRENT_NUM = lastfull.N_CURRENT_NUM,
S_CNTR_CODE = cir.S_CNTR_CODE,
S_LOC_CODE = lastfull.S_LOC_CODE,
HalfOrFull = (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3)),
- S_NOTE = cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim()
+ S_NOTE = cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim(),
+ S_CJ_NAME = cir.S_CJ_NAME
};
if (outlock != null)
{
@@ -3501,6 +3495,8 @@
{
public string ItemCode { get; set; }
public string ItemName { get; set; }
+
+ public string S_CJ_NAME { get; set; }
/// <summary>
/// 鏈�珮灞� /// </summary>
@@ -3511,8 +3507,13 @@
public string Row { get; set; }
}
+ /// <summary>
+ /// 鍘熺墿鏂欑焊绠卞嚭搴�+ /// </summary>
public static void AutoRun13TSJ()
{
+ var list = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
+ var WorkOrder = new List<YWLWorkOrder>();
foreach (var PLC in Settings.GetDeviceInfoList().FindAll(X => X.deviceType == 13 && X.enable == 1))
{
string pline = PLC.deviceName;
@@ -3531,10 +3532,39 @@
if (locs.Find(x => x.N_CURRENT_NUM > 0) != null) //鎷嗗灈鏈夎揣 涓嶅垽鏂� continue;
can = true;
+
+ foreach (var item in list)
+ {
+ YWLWorkOrder source = new YWLWorkOrder();
+ var source1 = orkOrd.FirstOrDefault();
+ source.SQL_PLineNo = source1.SQL_PLineNo;
+ source.FuLe_PLine_No = source1.FuLe_PLine_No;
+ source.SQL_LinkLineNO = source1.SQL_LinkLineNO;
+ source.SQL_Area = item;
+ source.SQL_UsingNow = source1.SQL_UsingNow;
+ source.SQL_State = source1.SQL_State;
+ source.SQL_WorkNo = source1.SQL_WorkNo;
+ source.SQL_ItemCode = source1.SQL_ItemCode;
+ source.SQL_ItemName = source1.SQL_ItemName;
+ source.SQL_charge = source1.SQL_charge;
+ source.SQL_Total = source1.SQL_Total;
+ source.SQL_PLAN_END = source1.SQL_PLAN_END;
+ source.SQL_Modify_TIme = source1.SQL_Modify_TIme;
+ source.OutNum = source1.OutNum;
+ source.WorkType = source1.WorkType;
+ source.MidArea = source1.MidArea;
+ source.TagOver = source1.TagOver;
+ source.TagOverTime = source1.TagOverTime;
+ source.S_BQ_TRAY_TYPE = source1.S_BQ_TRAY_TYPE;
+ source.S_CJ_NAME = source1.S_CJ_NAME;
+ source.S_ROW = item;
+ WorkOrder.Add(source);
+ }
}
ReadCCK = can;
if (orkOrd.Any())
- foreach (var od in orkOrd.OrderByDescending(x => x.OutNum))
+ // foreach (var od in orkOrd.OrderByDescending(x => x.OutNum))
+ foreach (var od in WorkOrder)
{
///姹囨�浠撳簱閲屾渶澶у眰鏄嚑灞傘�
Dictitems Lart = null;
@@ -3542,7 +3572,7 @@
{
if (dsi.TryGetValue(area, out var dictitems1))
{
- foreach (var d in dictitems1.FindAll(x => x.ItemCode == od.SQL_ItemCode && x.ItemName == od.SQL_ItemName))
+ foreach (var d in dictitems1.FindAll(x => x.ItemCode == od.SQL_ItemCode && x.ItemName == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME))
{
if (Lart == null)
Lart = d;
@@ -3572,12 +3602,15 @@
_clrel = LocationHelper.GetLocCntrRel(rl.S_LOC_CODE);
//鏉垮瀷鐩稿悓
var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).First();
- LogHelper.Info(rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆�);
+ LogHelper.Info(rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆� + JsonConvert.SerializeObject(_clrel0));
var _clcntitem = ContainerHelper.GetCntrItemRel(_clrel0.S_CNTR_CODE.Trim()).FirstOrDefault();
+ LogHelper.Info(rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
if (_clcntitem != null)
{
- if (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName)
+ LogHelper.Info("鐩镐簰鏄惁鍖归厤 _clcntitem S_ITEM_CODE:" + _clcntitem.S_ITEM_CODE + " od" + od.SQL_ItemCode + " _clcntitem S_ITEM_NAME:" + _clcntitem.S_ITEM_NAME + "od: " + od.SQL_ItemName);
+ if (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName && _clcntitem.S_CJ_NAME == od.S_CJ_NAME)
{
+
StartBit = rl;
break;
}
@@ -3605,11 +3638,35 @@
if (StartBit != null && Endbit != null)
{
var crs = _clrel.Select(x => x.S_CNTR_CODE).ToList();
- var b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, Endbit.S_LOC_CODE, "鍘熺墿鏂欐惉杩�绾哥", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri);
+ var EndBit = Endbit.S_LOC_CODE;
+ if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ")
+ {
+ var locs1 = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == "YWLWJJB" && x.S_LOCK_STATE != "鎶ュ簾" && x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM == 0).ToList();
+ if (locs1.Count() > 0)
+ {
+ EndBit = locs1.FirstOrDefault().S_LOC_CODE;
+ }
+ else
+ {
+ continue;
+ }
+ }
+ var b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, EndBit, "鍘熺墿鏂欐惉杩�绾哥", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri, "", Endbit.S_LOC_CODE);
if (b)
{
+
var r = new RowLock { S_LOCK_SRC = od.SQL_ItemCode, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍑哄簱閿�, S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
var db = new SqlHelper<object>().GetInstance();
+ //缁欑粓鐐归攣瀹氫綇
+ if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ")
+ {
+ var model = db.Queryable<Location>().Where(a => a.S_LOC_CODE == Endbit.S_LOC_CODE).First();
+
+ model.S_LOCK_STATE = "鍏ュ簱閿�;
+ var res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE }).ExecuteCommand() > 0;
+ LogHelper.Info(Endbit.S_LOC_CODE + "LockLoc:閿佺粨鏋� + res);
+ }
+ //鎺掗攣
var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
if (row != null)
{
@@ -3642,10 +3699,14 @@
pline = "T2鎻愬崌鏈�绾哥";
var orkOrd = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 6 && x.SQL_State == "鎵ц涓�);
if (orkOrd.Any())
- foreach (var ork in orkOrd)
- {
- list = list.Concat(ork.S_ROW.Split('$')).ToList();
- }
+ {
+ list = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
+ //foreach (var ork in orkOrd)
+ //{
+ // list = list.Concat(ork.S_ROW.Split('$')).ToList();
+ //}
+ }
+
}
foreach (var area in list.Distinct())
{
@@ -3665,7 +3726,7 @@
{
if (dsi.TryGetValue(area, out dictitems))
{
- var ill = dictitems.Find(x => x.ItemCode == _clcntitem.S_ITEM_CODE && x.ItemName == _clcntitem.S_ITEM_NAME);
+ var ill = dictitems.Find(x => x.ItemCode == _clcntitem.S_ITEM_CODE && x.ItemName == _clcntitem.S_ITEM_NAME && _clcntitem.S_CJ_NAME == x.S_CJ_NAME);
if (ill != null)
{
if (rl.N_CURRENT_NUM > ill.ItemLayer)
@@ -3681,6 +3742,7 @@
ItemName = _clcntitem.S_ITEM_NAME,
ItemCode = _clcntitem.S_ITEM_CODE,
ItemLayer = rl.N_CURRENT_NUM,
+ S_CJ_NAME = _clcntitem.S_CJ_NAME,
area = area,
Row = $"{rl.S_LOC_CODE}"
});
@@ -3694,6 +3756,7 @@
ItemName = _clcntitem.S_ITEM_NAME,
ItemCode = _clcntitem.S_ITEM_CODE,
ItemLayer = rl.N_CURRENT_NUM,
+ S_CJ_NAME = _clcntitem.S_CJ_NAME,
area = area,
Row = $"{rl.S_LOC_CODE}"
});
--
Gitblit v1.9.1