From a0677de5d70cdd3e0deb7fca02819495b5d6622c Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期二, 17 六月 2025 11:08:22 +0800
Subject: [PATCH] mnnnn
---
HH.WCS.QingXiNongfu/core/Monitor.cs | 189 ++++++++++++++++++++++++++++-------------------
1 files changed, 113 insertions(+), 76 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index cc5e417..8e4c336 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();
@@ -1301,11 +1302,17 @@
{
try
{
+ LogHelper.Info($" 鏃犺弻鍑哄簱 鏌ュ伐鍗�);
var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
if (!yuworders.Any())
+ {
YwlBQ_CreInwork(locsFirst, WJ_BQ.RK_BQDDQ, WJ_BQ.RK_BBHJQ);
+ }
else
+ {
+ LogHelper.Info($" 鏃犺弻鍑哄簱 宸ュ崟寮�惎涓�);
YwlBQ_CreWJOutOrder();
+ }
YwlBQ_CreWJTK();
}
catch (Exception ex)
@@ -1331,12 +1338,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 +1389,17 @@
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)
{
+ LogHelper.Info("-鏀剁缉鑶� 閫�簱锛�);
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 == "鏃�)
@@ -1482,19 +1478,24 @@
else
//YwlPETKOutOrder("YWLTKMKQ", "", "PE鍙夎繍");// PE灏忓嚭搴� {
+ LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛�);
var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2鎻愬崌鏈�鏀剁缉鑶� && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
- if (!yuworders.Any()) return;
+ if (!yuworders.Any())
+ {
+ LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛佹病鏈夊嚭搴撳崟銆�);
+ return;
+ }
var ploc = plc.location[0];
retuse:
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)
{
@@ -1515,6 +1516,7 @@
LogHelper.CErrorLog("灏忔按鍑哄簱锛� + (order.SQL_WorkNo) + "娌℃湁銆愭寚瀹氱墿鏂欙紱");
goto retuse;
}
+ LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛� + oic + oin);
string v = "YWLTKMKQ";
int ord = -1;
@@ -1541,15 +1543,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)
+ LogHelper.Info($"鏀剁缉鑶�鍑哄簱锛亄item.Key}鎺�[{cir.S_ITEM_CODE}-{order.SQL_ItemCode}] [{cir.S_ITEM_NAME}-{order.SQL_ItemName}] [{cir.S_CJ_NAME}-{order.S_CJ_NAME}] {(cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName && cir.S_CJ_NAME == order.S_CJ_NAME)}");
+ 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)
{
@@ -1572,30 +1577,32 @@
if (StartBit != null)
{
var tagLoc = StartBit;
- if (tagLoc.N_LAYER == 1 || tagLoc.N_CURRENT_NUM == 1)
- {
- // 鐩存帴鍑烘彁鍗囨満浣�- //var pc = Settings.GetDeviceInfoList().Where(a => a.deviceName == "姘寸嚎鏍囩鎻愬崌鏈�).FirstOrDefault();
+ // 鐩存帴鍑烘彁鍗囨満浣�
- if (!string.IsNullOrEmpty(ploc) && plc != null && DeviceProcess.doorStatus[ploc]?.info == "1")
+ LogHelper.Info(order.SQL_PLineNo + $"-鏀剁缉鑶滃嚭搴擄紒缁堢偣{ploc}-{DeviceProcess.doorStatus[ploc]?.info}");
+ if (!string.IsNullOrEmpty(ploc) && plc != null && DeviceProcess.doorStatus[ploc]?.info == "1")
+ {
+ var loc = LocationHelper.GetLoc(ploc);
+ LogHelper.Info(order.SQL_PLineNo + $"-鏀剁缉鑶滃嚭搴擄紒缁堢偣{loc.N_CURRENT_NUM}-{loc.S_LOCK_STATE}");
+ if (loc.N_CURRENT_NUM == 0 && loc.S_LOCK_STATE == "鏃�)
{
- var loc = LocationHelper.GetLoc(ploc);
- if (loc.N_CURRENT_NUM == 0 && loc.S_LOCK_STATE == "鏃�)
+ var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), loc.S_LOC_CODE, "鏀剁缉鑶滃弶杩�璐ф灦鍑烘彁鍗囨満", new List<string> { tagLoc.S_CNTR_CODE }, StartBit.N_CURRENT_NUM, 1, 1, 62);
+ LogHelper.CSucessLog($"from {tagLoc.S_LOC_CODE} to {loc.S_LOC_CODE} 鏀剁缉鑶滃弶杩�璐ф灦鍑烘彁鍗囨満 锛屽垱寤簕re} ");
+ if (re)
{
- var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), loc.S_LOC_CODE, "鏀剁缉鑶滃弶杩�璐ф灦鍑烘彁鍗囨満", new List<string> { tagLoc.S_CNTR_CODE }, StartBit.N_CURRENT_NUM, 1, 1, 62);
- LogHelper.CSucessLog($"from {tagLoc.S_LOC_CODE} to {loc.S_LOC_CODE} 鏀剁缉鑶滃弶杩�璐ф灦鍑烘彁鍗囨満 锛屽垱寤簕re} ");
- if (re)
+ oto.Add(oic);
+ if (outlock == null)
{
- oto.Add(oic);
- if (outlock == null)
- {
- var r = new RowLock { S_LOCK_SRC = (StartBit.S_NOTE /*+ StartBit.HalfOrFull*/), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍑哄簱閿�, S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
- db.Insertable(r).ExecuteCommand();
- }
+ var r = new RowLock { S_LOCK_SRC = (StartBit.S_NOTE /*+ StartBit.HalfOrFull*/), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍑哄簱閿�, S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
+ db.Insertable(r).ExecuteCommand();
}
}
}
}
+ }
+ else
+ {
+ LogHelper.Info(order.SQL_PLineNo + "-鏀剁缉鑶� 鍑哄簱锛�娌℃湁鍙敤鐗╂枡");
}
var set1 = new HashSet<string>(oto);
@@ -1833,15 +1840,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)
{
@@ -2280,11 +2289,11 @@
return;
//1 鍗婃墭鐩存帴涓婅揣鏋朵竴灞傘�
lgrx = locsFirst.GroupBy(X => X.N_ROW).Select(x =>
- {
- var y11 = x.OrderBy(y => y.N_COL).ToList();
- var y1 = y11.FindAll(z => z.N_CURRENT_NUM > 0).LastOrDefault();
- return y1;
- }).ToList();
+ {
+ var y11 = x.OrderBy(y => y.N_COL).ToList();
+ var y1 = y11.FindAll(z => z.N_CURRENT_NUM > 0).LastOrDefault();
+ return y1;
+ }).ToList();
foreach (var lastfull in lgrx.FindAll(x => x.HalfOrFull == 2).OrderBy(x => x.HalfOrFull).ThenBy(x => x.N_ROW))
{
//var y = item.OrderBy(x => x.N_COL).ToList();
@@ -2456,13 +2465,14 @@
internal static void YwlBQ_CreWJOutOrder()
{
-
+ LogHelper.Info($" 鏃犺弻鍑哄簱 寮�");
//1.妫�煡鏄惁鏈夐�搴� var db = new SqlHelper<object>().GetInstance();
///绗笁娈碉細鎺ラ┏鍖�杞�绾胯竟
var JQBS = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
foreach (var jbr in JQBS.GroupBy(x => x.N_ROW))
{
+ LogHelper.Info($" 鏃犺弻鍑哄簱 鎺ラ┏鏈夋暟鎹�);
var y2 = jbr.OrderBy(x => x.N_COL).ToList();
var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
if (l2 != null)
@@ -2471,15 +2481,21 @@
if (!c.Any() || c.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
{
//鍥炲簱銆�+ LogHelper.Info($"寰幆鏈夋棤閫�簱==> 鏈�閫�簱" + l2.S_LOC_CODE);
continue;
}
var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
- if (!cirs.Any()) continue;
+ if (!cirs.Any())
+ {
+ LogHelper.Info($"寰幆鏈夋棤閫�簱==> 娌℃湁鐗╂枡淇℃伅 鎵樼洏:" + c.FirstOrDefault().S_CNTR_CODE);
+ continue;
+ }
var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
var xbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_XBKQ);
foreach (var x1 in xbqs.GroupBy(x => x.N_ROW))
{
+ LogHelper.Info($" 鏃犺弻鍑哄簱 绾胯竟鏈夋暟鎹�);
var x2 = x1.OrderBy(x => x.N_COL).ToList();
var l3 = x2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
if (l3 != null)
@@ -2487,15 +2503,25 @@
var xc = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l3.S_LOC_CODE);
if (!xc.Any() || xc.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
{
+ LogHelper.Info($"寰幆绾胯竟==> 鏈�閫�簱" + xc.FirstOrDefault()?.S_TYPE);
continue;
}
var xcirs = ContainerHelper.GetCntrItemRel(xc.FirstOrDefault().S_CNTR_CODE);
- if (!xcirs.Any()) continue;
+ if (!xcirs.Any())
+ {
+ LogHelper.Info($"寰幆绾胯竟==> 娌℃湁鐗╂枡淇℃伅 鎵樼洏:" + xc.FirstOrDefault().S_CNTR_CODE);
+ continue;
+ }
+
var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
if (xcir.S_ITEM_CODE != cir.S_ITEM_CODE || xcir.S_ITEM_NAME != cir.S_ITEM_CODE)
+ {
+ LogHelper.Info($"寰幆绾胯竟==> 鐗╂枡涓嶅尮閰�鎵樼洏:" + xc.FirstOrDefault().S_CNTR_CODE);
continue;
+ }
}
var e = x2.FindAll(x => x.N_COL > (l3?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
+ LogHelper.Info($"鏃犺弻 鐢熸垚浠诲姟==> 鏄惁鏈夊悎閫傜殑璐т綅淇℃伅" + e?.S_LOC_CODE);
if (e != null)
{
var re = TaskProcess.CreateTransport("", l2.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-鎺ラ┏杞嚎杈�, new List<string> { c.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62, BQ_PRA.Out);
@@ -2505,7 +2531,7 @@
}
}
}
-
+ LogHelper.Info($" 鏃犺弻鍑哄簱 鍒扮嚎杈�缁撴潫");
///鎷嗗灈鍖哄彇娑堛�
if (false)
{
@@ -3121,22 +3147,22 @@
}
else
WCSHelper.Do(db =>
- {
- //var LCRLIST = db.Queryable<LocCntrRel>().Includes(x => x.CntrItemRel).Where(x => x.S_LOC_CODE.StartsWith("QX-") && (x.CntrItemRel.S_ITEM_CODE == outOer.S_ITEM_CODE || x.CntrItemRel.S_ITEM_CODE == outOer.S_ITEM_NAME)).ToList();
- List = db.Queryable<LocCntrRel>()
- .LeftJoin<CntrItemRel>((lcr, cir) => lcr.S_CNTR_CODE == cir.S_CNTR_CODE)
- .LeftJoin<Location>((lcr, cir, lo) => lcr.S_LOC_CODE == lo.S_LOC_CODE)
- .Where((lcr, cir) => lcr.S_LOC_CODE.StartsWith("QX-") && (cir.S_ITEM_CODE == outOer.S_ITEM_CODE || cir.S_ITEM_CODE == outOer.S_ITEM_NAME))
- .Select((lcr, cir, lo) => new Location
{
- S_AREA_CODE = lo.S_AREA_CODE,
- S_WH_CODE = lcr.S_TYPE,
- T_CREATE = lcr.T_CREATE,
- N_ROW = lo.N_ROW,
- N_COL = lcr.S_CNTR_CODE.StartsWith("TP") ? 0 : 1
- }).ToList();
+ //var LCRLIST = db.Queryable<LocCntrRel>().Includes(x => x.CntrItemRel).Where(x => x.S_LOC_CODE.StartsWith("QX-") && (x.CntrItemRel.S_ITEM_CODE == outOer.S_ITEM_CODE || x.CntrItemRel.S_ITEM_CODE == outOer.S_ITEM_NAME)).ToList();
+ List = db.Queryable<LocCntrRel>()
+ .LeftJoin<CntrItemRel>((lcr, cir) => lcr.S_CNTR_CODE == cir.S_CNTR_CODE)
+ .LeftJoin<Location>((lcr, cir, lo) => lcr.S_LOC_CODE == lo.S_LOC_CODE)
+ .Where((lcr, cir) => lcr.S_LOC_CODE.StartsWith("QX-") && (cir.S_ITEM_CODE == outOer.S_ITEM_CODE || cir.S_ITEM_CODE == outOer.S_ITEM_NAME))
+ .Select((lcr, cir, lo) => new Location
+ {
+ S_AREA_CODE = lo.S_AREA_CODE,
+ S_WH_CODE = lcr.S_TYPE,
+ T_CREATE = lcr.T_CREATE,
+ N_ROW = lo.N_ROW,
+ N_COL = lcr.S_CNTR_CODE.StartsWith("TP") ? 0 : 1
+ }).ToList();
- });
+ });
if (!List.Any())
{
LogHelper.Info($"澶囪揣鍗曪細{outOer.S_Work_NO} 搴撳尯涓病鏈夋壘鍒板彲鐢ㄧ墿鏂欍�");
@@ -3501,6 +3527,8 @@
{
public string ItemCode { get; set; }
public string ItemName { get; set; }
+
+ public string S_CJ_NAME { get; set; }
/// <summary>
/// 鏈�珮灞� /// </summary>
@@ -3511,6 +3539,9 @@
public string Row { get; set; }
}
+ /// <summary>
+ /// 鍘熺墿鏂欑焊绠卞嚭搴�+ /// </summary>
public static void AutoRun13TSJ()
{
var list = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
@@ -3541,7 +3572,7 @@
source.SQL_PLineNo = source1.SQL_PLineNo;
source.FuLe_PLine_No = source1.FuLe_PLine_No;
source.SQL_LinkLineNO = source1.SQL_LinkLineNO;
- source.SQL_Area = source1.SQL_Area;
+ source.SQL_Area = item;
source.SQL_UsingNow = source1.SQL_UsingNow;
source.SQL_State = source1.SQL_State;
source.SQL_WorkNo = source1.SQL_WorkNo;
@@ -3573,7 +3604,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;
@@ -3608,8 +3639,8 @@
LogHelper.Info(rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
if (_clcntitem != null)
{
- 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)
+ 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 + " od.S_CJ_NAME:" + od.S_CJ_NAME);
+ 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;
@@ -3647,8 +3678,12 @@
{
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);
+ 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)
{
@@ -3723,7 +3758,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)
@@ -3739,6 +3774,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}"
});
@@ -3752,6 +3788,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