From 8f0f149d607a7246fa25e81340602ce5e47398fe Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期四, 10 七月 2025 18:14:38 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/core/Monitor.cs | 867 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 510 insertions(+), 357 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 569c8a8..972758d 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -1051,7 +1051,7 @@
{
var lolist = LocationHelper.GetAreaNormalLocList(area);// LocationHelper.GetList<Location>(x => x.S_AREA_CODE == area && x.S_LOCK_STATE != "鎶ュ簾");
- var lgrow = lolist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key);
+ var lgrow = lolist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).ToList();
Dictionary<string, List<Location>> dsll = new Dictionary<string, List<Location>>();
foreach (var rows in lgrow)
{
@@ -1120,12 +1120,12 @@
//鏌ヨ浠诲姟鏁�
List<string> AreaLi = new List<string>() { "YWLBQWJ", "YWLWJJB" };
var db = new SqlHelper<object>().GetInstance();
- var list = db.Queryable<Location>().Where(a => AreaLi.Contains(a.S_AREA_CODE) && a.S_LOCK_STATE == "鍏ュ簱閿�).ToList();
- if (list.Count() >= 2)
- {
- LogHelper.Info($"CreateTransport- CreateTask Error" + $"缁堢偣搴撳尯涓篩WLRGDD鎴栬�YWLWJJB 鍒欐渶澶氬彧鑳界敓鎴愪袱涓换鍔�);
- continue;
- }
+ //var list = db.Queryable<Location>().Where(a => AreaLi.Contains(a.S_AREA_CODE) && a.S_LOCK_STATE == "鍏ュ簱閿�).ToList();
+ //if (list.Count() >= 3)
+ //{
+ // LogHelper.Info($"CreateTransport- CreateTask Error" + $"缁堢偣搴撳尯涓篩WLRGDD鎴栬�YWLWJJB 鍒欐渶澶氬彧鑳界敓鎴愪袱涓换鍔�);
+ // continue;
+ //}
}
string Last = string.Join(",", ccr.Skip(1));
@@ -1211,14 +1211,14 @@
var lstCanOutLSta = dbll.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca1.ToExpression()).ToList();
if (lstCanOutL.Count() > 0)
{
- var ProRow = lstCanOutLSta.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
+ var ProRow = lstCanOutL.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
//杩欎簺鎺掕兘鍏ョ殑璐т綅鏁� var EndMum = dbll.Queryable<Location>().Where(l => l.S_AREA_CODE == EdnRarea && l.N_CURRENT_NUM == 0 && l.S_LOCK_STATE == "鏃� && lstCanOutL.Select(e => e.N_ROW).ToList().Contains(l.N_ROW)).ToList();
//鏌ヨ姣忎竴鎺掓渶澶х殑鍒�灏忎簬杩欎簺鍒楃殑 涓嶅厑璁稿叆
foreach (var item in ProRow)
{
- var MaxCol = lstCanOutLSta.FindAll(d => d.N_ROW == item.N_ROW).OrderByDescending(f => f.N_COL).First();
+ var MaxCol = lstCanOutL.FindAll(d => d.N_ROW == item.N_ROW).OrderByDescending(f => f.N_COL).First();
EndMum.RemoveAll(f => f.N_ROW == item.N_ROW && f.N_COL < MaxCol.N_COL);
}
if (EndMum.Count() > 0)
@@ -1452,7 +1452,7 @@
}
}
var locsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鏍囩-") && x.S_TYPE == WJ_BQ.RK_BBHJQ);
- var SblocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鏍囩-") && x.S_NOTE.Contains("姘�) && x.S_TYPE == WJ_BQ.RK_BBHJQ);
+ var SblocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鏍囩-") && x.S_NOTE.Contains("姘�) && !x.S_NOTE.Contains("楗枡") && x.S_TYPE == SX_BQ.RK_BBHJQ);
var SlocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鏍囩-") && x.S_TYPE == SX_BQ.RK_BBHJQ);
var TKlocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鎻愭墸-"));
var PElocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鏀剁缉鑶�"));
@@ -1464,31 +1464,31 @@
//}
var TASKs = new List<Task>();
- var task1 = Task.Run(() =>
+ //var task1 = Task.Run(() =>
+ //{
+ try
{
- try
+ // 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 => x.TagOverTime).ToList();
+ var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0).OrderBy(x => x.TagOverTime).ToList();
+ if (LocLock(WJ_BQ.RK_BBHJQ))
{
- // 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 => x.TagOverTime).ToList();
- var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0).OrderBy(x => x.TagOverTime).ToList();
- if (LocLock(WJ_BQ.RK_BBHJQ))
- {
- //鏍囩鍏ュ簱
- YwlBQ_CreInwork(locsFirst, WJ_BQ.RK_BQDDQ, WJ_BQ.RK_BBHJQ);
- }
- if (yuworders.Any())
- {
- LogHelper.Info($" 鏃犺弻鍑哄簱 宸ュ崟寮�惎涓�");
- // 鏍囩鍑哄簱銆傝揣鏋剁洿鎺ュ嚭鍒扮嚎杈�- YwlBQ_CreWJOutOrder();
- }
- // 鏍囩鏃犺弻閫�簱銆�
- YwlBQ_CreWJTK();
+ //鏍囩鍏ュ簱
+ YwlBQ_CreInwork(locsFirst, WJ_BQ.RK_BQDDQ, WJ_BQ.RK_BBHJQ);
}
- catch (Exception ex)
+ if (yuworders.Any())
{
- LogHelper.Error(ex.Message, ex);
+ LogHelper.Info($" 鏃犺弻鍑哄簱 宸ュ崟寮�惎涓�");
+ // 鏍囩鍑哄簱銆傝揣鏋剁洿鎺ュ嚭鍒扮嚎杈�+ YwlBQ_CreWJOutOrder();
}
- });
+ // 鏍囩鏃犺弻閫�簱銆�
+ YwlBQ_CreWJTK();
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error(ex.Message, ex);
+ }
+ //});
var task11 = Task.Run(() =>
{
@@ -1527,11 +1527,11 @@
var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 1 && x.SQL_State == "鎵ц涓�);
- if (LocLock(SX_BQ.RK_BBHJQ))
- {
- //姘寸嚎鏍囩鍏ュ簱
- YwlBQ_CreInwork(SblocsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
- }
+ //if (LocLock(SX_BQ.RK_BBHJQ))
+ //{
+ // //姘寸嚎鏍囩鍏ュ簱
+ // YwlBQ_CreInwork(SblocsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
+ //}
if (tklist.Count() > 0)
{
var tk = tklist.FirstOrDefault();
@@ -1569,271 +1569,278 @@
LogHelper.Error(ex.Message, ex);
}
});
- var task3 = Task.Run(() =>
+ //var task3 = Task.Run(() =>
+ //{
+ try
{
- try
+ //return;
+ if (LocLock("YWLTKMKQ"))
{
- //return;
YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "鎻愭墸鍙夎繍");//鎻愭墸 涓按 閫�簱銆�- YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "鎻愭墸鍙夎繍", 1);//鎻愭墸涓按鍑哄簱
- YwlPEZsOutOrder("YWLTKMKQ", "YWLZSXBKQ", "涓按鑶滃弶杩�, 1);//涓按鍑哄簱
}
- catch (Exception ex)
- {
- LogHelper.Error(ex.Message, ex);
- }
- });
- var task4 = Task.Run(() =>
+ YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "鎻愭墸鍙夎繍", 1);//鎻愭墸涓按鍑哄簱
+
+ YwlPEZsOutOrder("YWLTKMKQ", "YWLZSXBKQ", "涓按鑶滃弶杩�, 1);//涓按鍑哄簱
+ }
+ catch (Exception ex)
{
- try
+ LogHelper.Error(ex.Message, ex);
+ }
+ //});
+ //var task4 = Task.Run(() =>
+ //{
+ try
+ {
+ //return;
+ ///璧风偣鏁版嵁銆� 缁堢偣搴撳尯 鍫嗗彔灞傛暟銆�+ if (LocLock("YWLTKMKQ"))
{
- //return;
- ///璧风偣鏁版嵁銆� 缁堢偣搴撳尯 鍫嗗彔灞傛暟銆� YwlPETK_CreInwork(PElocsFirst, "YWLTKMKQ", "鏀剁缉鑶滃弶杩�, 2);//PE鑶� YwlPETK_CreInwork(TKlocsFirst, "YWLTKMKQ", "鎻愭墸鍙夎繍", 1); //鎻愭墸
- //YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "鏀剁缉鑶滃弶杩�);
- //YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "鏀剁缉鑶滃弶杩�);// 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 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 loc = LocationHelper.GetLoc(plc.location[0]);
+ if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "鏃�)
{
- LogHelper.Info("-鏀剁缉鑶� 閫�簱锛�);
- var tk = tklist.FirstOrDefault();
-
- var loc = LocationHelper.GetLoc(plc.location[0]);
- if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "鏃�)
+ var rr_clrel = LocationHelper.GetLocCntrRel(loc.S_LOC_CODE);
+ if (rr_clrel.FirstOrDefault()?.S_TYPE == BQ_PRA.B && DateTime.Now.Subtract(rr_clrel.FirstOrDefault()?.T_CREATE ?? DateTime.Now).TotalSeconds > 10)
{
- var rr_clrel = LocationHelper.GetLocCntrRel(loc.S_LOC_CODE);
- if (rr_clrel.FirstOrDefault()?.S_TYPE == BQ_PRA.B && DateTime.Now.Subtract(rr_clrel.FirstOrDefault()?.T_CREATE ?? DateTime.Now).TotalSeconds > 10)
+ var cir = ContainerHelper.GetCntrItemRel(rr_clrel.FirstOrDefault().S_CNTR_CODE).FirstOrDefault();
+ if (cir == null)
+ { LogHelper.CErrorLog($"{loc.S_LOC_CODE} 娌℃湁鎵樼洏鐗╂枡鏁版嵁锛侊紒"); return; }
+ var s_type = cir?.N_BQ_TRAY_TYPE ?? 0;
+ if (s_type == 0)
{
- var cir = ContainerHelper.GetCntrItemRel(rr_clrel.FirstOrDefault().S_CNTR_CODE).FirstOrDefault();
- if (cir == null)
- { LogHelper.CErrorLog($"{loc.S_LOC_CODE} 娌℃湁鎵樼洏鐗╂枡鏁版嵁锛侊紒"); return; }
- var s_type = cir?.N_BQ_TRAY_TYPE ?? 0;
- if (s_type == 0)
- {
- LogHelper.CErrorLog($"{tk.SQL_WorkNo}-{tk.SQL_PLineNo} 閫�簱宸ュ崟寮�惎锛岀粦瀹氱殑 闆舵暣 鏍囪");
- }
- Location Endbit = null;
- //Endbit = hjs.FindAll(x => x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
- //if (Endbit != null)
- //{
- // var re = TaskProcess.CreateTransport("", loc.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "鏀剁缉鑶滃弶杩�T2閫�簱", rr_clrel.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
- // LogHelper.CSucessLog($"from {loc.S_LOC_CODE} to {Endbit.S_LOC_CODE} 鏍囩鍙夎繍-T2閫�簱 锛屽垱寤簕re}");
- //}
- string v = "YWLTKMKQ";
- var rklist = LocationHelper.GetRowLock(v);
- int hof = (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3));
-
- var inlock = rklist.Find(x => x.S_LOCK_SRC == (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof) && x.S_LOCK_STATE.Contains("鍏ュ簱閿�));
- Location EndBit = null;
- var NormalList = LocationHelper.GetAreaNormalLocList(v);
- //鏈夊叆搴撻攣鎺掋� 鑳藉叆灏卞叆銆備笉鑳藉氨绛夈�
- if (inlock != null)
- {
- var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
- foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * -1))
- {
- var srloclist = rs.OrderBy(x => x.N_COL).ToList();
- var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
- if (lastfull != null)
- {
- var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
- var xcirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
- if (!xcirs.Any()) continue;
- var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
- if (cir.S_ITEM_CODE != xcir.S_ITEM_CODE || cir.S_ITEM_NAME != xcir.S_ITEM_NAME || xcir.S_CJ_NAME != cir.S_CJ_NAME)
- continue;
- }
- EndBit = srloclist.Find(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, 3) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0));
- if (EndBit != null)
- break;
- }
- }
- else
- {
- var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
- var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
- if (EptRowlist.Any())
- {
- EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (-1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
- }
- }
- if (EndBit != null)
- {
- var res = TaskProcess.CreateTransport("", loc.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, "鏀剁缉鑶滃弶杩�鍏ュ簱", new List<string> { cir.S_CNTR_CODE }, 1, EndBit.N_CURRENT_NUM + 1, 1, 62);
- LogHelper.CSucessLog($"from {loc.S_LOC_CODE} to {EndBit.S_LOC_CODE} {("鏀剁缉鑶滃弶杩�鍏ュ簱")} 锛屽垱寤簕res} ");
-
- if (res && inlock == null)
- {
- var r = new RowLock { S_LOCK_SRC = (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍏ュ簱閿�, S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
- 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)
- {
- if (row.S_LOCK_SRC != r.S_LOCK_SRC)
- {
- db.Deleteable(row).ExecuteCommand();
- db.Insertable(r).ExecuteCommand();
- }
- }
- else db.Insertable(r).ExecuteCommand();
- }
- }
- Thread.Sleep(1000);
-
+ LogHelper.CErrorLog($"{tk.SQL_WorkNo}-{tk.SQL_PLineNo} 閫�簱宸ュ崟寮�惎锛岀粦瀹氱殑 闆舵暣 鏍囪");
}
- }
- }
- 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 => x.TagOverTime).ToList();
- 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)
+ Location Endbit = null;
+ //Endbit = hjs.FindAll(x => x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
+ //if (Endbit != null)
//{
- // 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 re = TaskProcess.CreateTransport("", loc.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "鏀剁缉鑶滃弶杩�T2閫�簱", rr_clrel.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
+ // LogHelper.CSucessLog($"from {loc.S_LOC_CODE} to {Endbit.S_LOC_CODE} 鏍囩鍙夎繍-T2閫�簱 锛屽垱寤簕re}");
//}
- }
- if (order != null)
- {
- var Porder = WCSHelper.GetWorkOrder(order.SQL_LinkLineNO);
- if (Porder == null)
- {
- LogHelper.CErrorLog("灏忔按鍑哄簱锛� + (order.SQL_LinkLineNO) + "娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
- yuworders.Remove(order);
- goto retuse;
- }
- var oto = new List<string>();
- //if (!string.IsNullOrEmpty(order.TagOver))
- // oto = order.TagOver.Split(',').ToList();
- var oic = order.SQL_ItemCode?.Trim();
- var oin = order.SQL_ItemName?.Trim();
- if (string.IsNullOrEmpty(oic) || string.IsNullOrEmpty(oin))
- {
- LogHelper.CErrorLog("灏忔按鍑哄簱锛� + (order.SQL_WorkNo) + "娌℃湁銆愭寚瀹氱墿鏂欙紱");
- goto retuse;
- }
- LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛� + oic + oin);
-
string v = "YWLTKMKQ";
- int ord = -1;
- locCntItem StartBit = null;
- Location EndBit = null;
- CntrItemRel cir = null;
var rklist = LocationHelper.GetRowLock(v);
- var outlock = rklist.Find(x => x.S_AREA_CODE == v && x.S_LOCK_SRC == (oic + "&" + oin) && x.S_LOCK_STATE.Contains("鍑哄簱閿�));
- var NormalList = LocationHelper.GetAreaNormalLocList(v);
- if (outlock != null)
- {
- NormalList = NormalList.FindAll(x => outlock.N_ROW == (x.N_ROW));
- }
- var taglist = new List<string>() { oic };
- foreach (var item in NormalList.GroupBy(X => X.N_ROW).OrderBy(x => x.Key * ord))
- {
- locCntItem Temp = null;
- var y = item.OrderBy(x => x.N_COL).ToList();
- var lastfull = y.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
- if (lastfull != null)
- {
- var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
- if (!CNTR.Any()) continue;
- var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
- if (!cirs.Any()) continue;
- cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
- 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)}");
- if (cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName)
- {
- //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_CJ_NAME = cir.S_CJ_NAME
- };
- if (outlock != null)
- {
- StartBit = Temp;
- break;
- }
- }
- if (Temp != null)
- {
- if (StartBit == null)
- StartBit = Temp;
- else if (StartBit.HalfOrFull > Temp.HalfOrFull)
- {
- StartBit = Temp;
- }
- if (StartBit.HalfOrFull == 1) break;
- }
- }
- }
- if (StartBit != null)
- {
- var tagLoc = StartBit;
- // 鐩存帴鍑烘彁鍗囨満浣�+ int hof = (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3));
- LogHelper.Info(order.SQL_PLineNo + $"-鏀剁缉鑶滃嚭搴擄紒缁堢偣{ploc}-{DeviceProcess.doorStatus[ploc]?.info}");
- if (!string.IsNullOrEmpty(ploc) && plc != null && DeviceProcess.doorStatus[ploc]?.info == "1")
+ var inlock = rklist.Find(x => x.S_LOCK_SRC == (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof) && x.S_LOCK_STATE.Contains("鍏ュ簱閿�));
+ Location EndBit = null;
+ var NormalList = LocationHelper.GetAreaNormalLocList(v);
+ //鏈夊叆搴撻攣鎺掋� 鑳藉叆灏卞叆銆備笉鑳藉氨绛夈�
+ if (inlock != null)
+ {
+ var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
+ foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * -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 srloclist = rs.OrderBy(x => x.N_COL).ToList();
+ var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (lastfull != null)
{
- 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)
- // {
- // 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 c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
+ var xcirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
+ if (!xcirs.Any()) continue;
+ var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ if (cir.S_ITEM_CODE != xcir.S_ITEM_CODE || cir.S_ITEM_NAME != xcir.S_ITEM_NAME || xcir.S_CJ_NAME != cir.S_CJ_NAME)
+ continue;
}
+ EndBit = srloclist.Find(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, 3) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0));
+ if (EndBit != null)
+ break;
}
}
else
{
- LogHelper.Info(order.SQL_PLineNo + "-鏀剁缉鑶� 鍑哄簱锛�娌℃湁鍙敤鐗╂枡");
+ var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
+ var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
+ if (EptRowlist.Any())
+ {
+ EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (-1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
+ }
}
- var set1 = new HashSet<string>(oto);
- var set2 = new HashSet<string>(taglist);
-
- if (set1.SetEquals(set2))
+ if (EndBit != null)
{
- //order.OutNum++;
+ var res = TaskProcess.CreateTransport("", loc.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, "鏀剁缉鑶滃弶杩�鍏ュ簱", new List<string> { cir.S_CNTR_CODE }, 1, EndBit.N_CURRENT_NUM + 1, 1, 62);
+ LogHelper.CSucessLog($"from {loc.S_LOC_CODE} to {EndBit.S_LOC_CODE} {("鏀剁缉鑶滃弶杩�鍏ュ簱")} 锛屽垱寤簕res} ");
- order.OutNum--;
- order.TagOverTime = DateTime.Now;
- //order.TagOver = string.Empty;
- db.Updateable(order).UpdateColumns(it => new { /*it.TagOver,*/it.OutNum, it.TagOverTime }).ExecuteCommand();
- LogHelper.CSucessLog($"{order.SQL_PLineNo}-{order.SQL_LinkLineNO} 鏍囩瀹屾垚銆傞噸缃暟鎹�);
+ if (res && inlock == null)
+ {
+ var r = new RowLock { S_LOCK_SRC = (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍏ュ簱閿�, S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
+ 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)
+ {
+ if (row.S_LOCK_SRC != r.S_LOCK_SRC)
+ {
+ db.Deleteable(row).ExecuteCommand();
+ db.Insertable(r).ExecuteCommand();
+ }
+ }
+ else db.Insertable(r).ExecuteCommand();
+ }
}
+ Thread.Sleep(1000);
+
}
}
}
- catch (Exception ex)
+ else
+ //YwlPETKOutOrder("YWLTKMKQ", "", "PE鍙夎繍");// PE灏忓嚭搴� {
- LogHelper.Error(ex.Message, ex);
+ 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 => x.TagOverTime).ToList();
+ 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);
+ //}
+ }
+ if (order != null)
+ {
+ var Porder = WCSHelper.GetWorkOrder(order.SQL_LinkLineNO);
+ if (Porder == null)
+ {
+ LogHelper.CErrorLog("灏忔按鍑哄簱锛� + (order.SQL_LinkLineNO) + "娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
+ yuworders.Remove(order);
+ goto retuse;
+ }
+ var oto = new List<string>();
+ //if (!string.IsNullOrEmpty(order.TagOver))
+ // oto = order.TagOver.Split(',').ToList();
+ var oic = order.SQL_ItemCode?.Trim();
+ var oin = order.SQL_ItemName?.Trim();
+ if (string.IsNullOrEmpty(oic) || string.IsNullOrEmpty(oin))
+ {
+ LogHelper.CErrorLog("灏忔按鍑哄簱锛� + (order.SQL_WorkNo) + "娌℃湁銆愭寚瀹氱墿鏂欙紱");
+ goto retuse;
+ }
+ LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛� + oic + oin);
+
+ string v = "YWLTKMKQ";
+ int ord = -1;
+ locCntItem StartBit = null;
+ Location EndBit = null;
+ CntrItemRel cir = null;
+ var rklist = LocationHelper.GetRowLock(v);
+ var outlock = rklist.Find(x => x.S_AREA_CODE == v && x.S_LOCK_SRC == (oic + "&" + oin) && x.S_LOCK_STATE.Contains("鍑哄簱閿�));
+ var NormalList = LocationHelper.GetAreaNormalLocList(v);
+ if (outlock != null)
+ {
+ NormalList = NormalList.FindAll(x => outlock.N_ROW == (x.N_ROW));
+ }
+ var taglist = new List<string>() { oic };
+ foreach (var item in NormalList.GroupBy(X => X.N_ROW).OrderBy(x => x.Key * ord))
+ {
+ locCntItem Temp = null;
+ var y = item.OrderBy(x => x.N_COL).ToList();
+ var lastfull = y.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (lastfull != null)
+ {
+ var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
+ if (!CNTR.Any()) continue;
+ var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
+ if (!cirs.Any()) continue;
+ cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ 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)}");
+ if (cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName)
+ {
+ //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_CJ_NAME = cir.S_CJ_NAME
+ };
+ if (outlock != null)
+ {
+ StartBit = Temp;
+ break;
+ }
+ }
+ if (Temp != null)
+ {
+ if (StartBit == null)
+ StartBit = Temp;
+ else if (StartBit.HalfOrFull > Temp.HalfOrFull)
+ {
+ StartBit = Temp;
+ }
+ if (StartBit.HalfOrFull == 1) break;
+ }
+ }
+ }
+ if (StartBit != null)
+ {
+ var tagLoc = StartBit;
+ // 鐩存帴鍑烘彁鍗囨満浣�+
+ 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 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)
+ //{
+ // 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);
+ var set2 = new HashSet<string>(taglist);
+
+ if (set1.SetEquals(set2))
+ {
+ //order.OutNum++;
+
+ order.OutNum--;
+ order.TagOverTime = DateTime.Now;
+ //order.TagOver = string.Empty;
+ db.Updateable(order).UpdateColumns(it => new { /*it.TagOver,*/it.OutNum, it.TagOverTime }).ExecuteCommand();
+ LogHelper.CSucessLog($"{order.SQL_PLineNo}-{order.SQL_LinkLineNO} 鏍囩瀹屾垚銆傞噸缃暟鎹�);
+ }
+ }
}
- });
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error(ex.Message, ex);
+ }
+ // });
// Task.WaitAll(task1, task2, task3, task4);
LogHelper.CoCo(DateTime.Now + "鏍囩-鎻愭墸-PE鑶� Over=============== ", ConsoleColor.Cyan);
}
@@ -1875,16 +1882,24 @@
{
continue;
}
-
var ca = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
ca.And((o, p, t) => o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "鏃� && t.S_ITEM_CODE == cir.S_ITEM_CODE && t.S_ITEM_NAME == cir.S_ITEM_NAME && t.S_CJ_NAME == cir.S_CJ_NAME && o.S_AREA_CODE == v2);
var lstCanOutL = db.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca.ToExpression()).ToList();
Location EndBit = null;
var NormalList = LocationHelper.GetAreaNormalLocList(v2);
- NormalList = NormalList.FindAll(e => lstCanOutL.Select(c => c.N_ROW).ToList().Contains(e.N_ROW));
+ if (lstCanOutL.Any())
+ {
+ var NormalListt = NormalList.FindAll(e => lstCanOutL.Select(c => c.N_ROW).ToList().Contains(e.N_ROW));
+ var lastfull = NormalListt.FindAll(x => x.N_CURRENT_NUM > 0).ToList();
+ if (lastfull.Count() > 0)
+ {
+ NormalList = NormalListt;
+ }
+ }
+
//鏈夊叆搴撻攣鎺掋� 鑳藉叆灏卞叆銆備笉鑳藉氨绛夈�
- if (NormalList.Count() > 0)
+ if (NormalList.Count() > 0 && lstCanOutL.Any())
{
var loclist1 = NormalList.ToList();
foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * -1))
@@ -1911,11 +1926,9 @@
LogHelper.CSucessLog($"from {lastfull1.S_LOC_CODE} to {EndBit.S_LOC_CODE} {v3}-閫�簱 锛屽垱寤簕res} ");
}
-
}
}
}
-
//鎵ц閫�簱銆傘�銆�
Console.WriteLine($"{v.FirstOrDefault()?.S_LOC_CODE} 闇�閫�簱-- 鑷姩閫�簱-鏈疄鐜�);
}
@@ -2122,39 +2135,61 @@
{
NormalList2 = NormalList2.FindAll(e => e.N_ROW == 2).ToList();
}
+ if (EndBit == null && NormalList2.Count() > 0)
+ {
+ var NormalList3 = NormalList2.FindAll(e => e.N_CURRENT_NUM == 0).ToList();
+
+ var ManLoc = NormalList2.FindAll(e => e.N_CURRENT_NUM > 0).ToList();
+ if (ManLoc.Count() > 0)
+ {
+ var MaxCol = ManLoc.OrderByDescending(e => e.N_COL).ToList().FirstOrDefault();
+ LogHelper.Info($"鎻愭墸鍑哄簱 鑾峰彇鏈�ぇ鍒�{MaxCol.N_COL} ");
+ NormalList3 = NormalList3.FindAll(e => e.N_COL > MaxCol.N_COL).ToList();
+ var srloclist = NormalList3.OrderBy(x => x.N_COL).FirstOrDefault();
+ EndBit = srloclist;
+ }
+ else
+ {
+ var srloclist = NormalList2.OrderBy(x => x.N_COL).FirstOrDefault();
+ EndBit = srloclist;
+ }
+ }
//if (inlock != null)
//{
// var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
- foreach (var rs in NormalList2.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
- {
- var srloclist = rs.OrderBy(x => x.N_COL).ToList();
- var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
- if (lastfull != null)
- {
- var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
- if (!CNTR.Any()) continue;
- if (CNTR.Find(x => x.S_TYPE == BQ_PRA.B) != null) continue;
- var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
- if (!cirs.Any()) continue;
- var cir2 = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
- if (cir2.S_ITEM_CODE != od.SQL_ItemCode || cir2.S_ITEM_NAME != od.SQL_ItemName || StartBit.HalfOrFull != (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3)))
- continue;
- EndBit = srloclist.Find(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, v3) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0));
- }
- if (EndBit != null)
- break;
- }
+
+ //foreach (var rs in NormalList2.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
+ //{
+ // var srloclist = rs.OrderBy(x => x.N_COL).ToList();
+ // var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM == 0).LastOrDefault();
+ // if (lastfull != null)
+ // {
+ // var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
+ // if (!CNTR.Any()) continue;
+ // if (CNTR.Find(x => x.S_TYPE == BQ_PRA.B) != null) continue;
+ // var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
+ // if (!cirs.Any()) continue;
+ // var cir2 = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ // // if (cir2.S_ITEM_CODE != od.SQL_ItemCode || cir2.S_ITEM_NAME != od.SQL_ItemName || StartBit.HalfOrFull != (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3)))
+ // //if (cir2.S_ITEM_CODE != od.SQL_ItemCode || cir2.S_ITEM_NAME != od.SQL_ItemName)
+ // // continue;
+ // EndBit = srloclist.Find(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, v3) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0));
+ // }
+ // if (EndBit != null)
+ // break;
//}
- //else
- if (EndBit == null)
- {
- var hasNum = NormalList2.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
- var EptRowlist = NormalList2.FindAll(x => !hasNum.Contains(x.N_ROW));
- if (EptRowlist.Any())
- {
- EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
- }
- }
+
+ ////}
+ ////else
+ //if (EndBit == null)
+ //{
+ // var hasNum = NormalList2.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
+ // var EptRowlist = NormalList2.FindAll(x => !hasNum.Contains(x.N_ROW));
+ // if (EptRowlist.Any())
+ // {
+ // EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
+ // }
+ //}
//foreach (var item in sLocs.GroupBy(X => X.N_ROW).OrderBy(x => x.Key * ord))
//{
@@ -2292,35 +2327,53 @@
//if (inlock != null)
//{
// var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
-
- var srloclist = NormalList2.OrderBy(x => x.N_COL).ToList();
- var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
- if (lastfull != null)
+ if (EndBit == null && NormalList2.Count() > 0)
{
- var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
- if (!CNTR.Any()) continue;
- if (CNTR.Find(x => x.S_TYPE == BQ_PRA.B) != null) continue;
- var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
- if (!cirs.Any()) continue;
- var cir2 = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
- if (cir2.S_ITEM_CODE != od.SQL_ItemCode || cir2.S_ITEM_NAME != od.SQL_ItemName)
- continue;
- EndBit = srloclist.Find(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, v3) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0));
- }
- if (EndBit != null)
- break;
+ var NormalList3 = NormalList2.FindAll(e => e.N_CURRENT_NUM == 0).ToList();
- //}
- //else
- if (EndBit == null)
- {
- var hasNum = NormalList2.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
- var EptRowlist = NormalList2.FindAll(x => !hasNum.Contains(x.N_ROW));
- if (EptRowlist.Any())
+ var ManLoc = NormalList2.FindAll(e => e.N_CURRENT_NUM > 0).ToList();
+ if (ManLoc.Count() > 0)
{
- EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
+ var MaxCol = ManLoc.OrderByDescending(e => e.N_COL).ToList().FirstOrDefault();
+ LogHelper.Info($"涓按鍑哄簱 鑾峰彇鏈�ぇ鍒�{MaxCol.N_COL} ");
+ NormalList3 = NormalList3.FindAll(e => e.N_COL > MaxCol.N_COL).ToList();
+ var srloclist = NormalList3.OrderBy(x => x.N_COL).FirstOrDefault();
+ EndBit = srloclist;
+ }
+ else
+ {
+ var srloclist = NormalList2.OrderBy(x => x.N_COL).FirstOrDefault();
+ EndBit = srloclist;
}
}
+ //var srloclist = NormalList2.OrderBy(x => x.N_COL).ToList();
+ //var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ //if (lastfull != null)
+ //{
+ // var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
+ // if (!CNTR.Any()) continue;
+ // if (CNTR.Find(x => x.S_TYPE == BQ_PRA.B) != null) continue;
+ // var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
+ // if (!cirs.Any()) continue;
+ // var cir2 = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ // if (cir2.S_ITEM_CODE != od.SQL_ItemCode || cir2.S_ITEM_NAME != od.SQL_ItemName)
+ // continue;
+ // EndBit = srloclist.Find(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, v3) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0));
+ //}
+ //if (EndBit != null)
+ // break;
+
+ ////}
+ ////else
+ //if (EndBit == null)
+ //{
+ // var hasNum = NormalList2.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
+ // var EptRowlist = NormalList2.FindAll(x => !hasNum.Contains(x.N_ROW));
+ // if (EptRowlist.Any())
+ // {
+ // EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
+ // }
+ //}
//foreach (var item in sLocs.GroupBy(X => X.N_ROW).OrderBy(x => x.Key * ord))
//{
@@ -2388,6 +2441,7 @@
private static void YwlPETK_CreInwork(List<locCntItem> klocsFirst, string v, string v2, int v1 = 3)
{
bool ord = v2.Contains("鎻愭墸");
+ var db = new SqlHelper<object>().GetInstance();
foreach (var ptR in klocsFirst.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
{
Location EndBit = null;
@@ -2399,18 +2453,67 @@
var rklist = LocationHelper.GetRowLock(v);
var inlock = rklist.Find(x => x.S_AREA_CODE == v && x.S_LOCK_SRC == (rsfull.S_NOTE + rsfull.HalfOrFull) && x.S_LOCK_STATE.Contains("鍏ュ簱閿�));
var NormalList = LocationHelper.GetAreaNormalLocList(v);
- //鏈夊叆搴撻攣鎺掋� 鑳藉叆灏卞叆銆備笉鑳藉氨绛夈�
- if (inlock != null)
+
+ //鏌ヨ鏄惁鏈夊凡缁忓叆浜嗙殑鎺�+ var ca = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
+ ca.And((o, p, t) => o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "鏃� && t.S_ITEM_CODE == rsfull.S_ITEM_CODE && t.S_ITEM_NAME == rsfull.S_ITEM_NAME && t.S_CJ_NAME == rsfull.S_CJ_NAME && o.S_AREA_CODE == v);
+ var lstCanOutL = db.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca.ToExpression()).ToList();
+
+ if (lstCanOutL.Count() > 0)
{
- var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
- foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)))
+ //var ProRow = lstCanOutL.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
+ ////杩欎簺鎺掕兘鍏ョ殑璐т綅鏁�+ //var EndMum = db.Queryable<Location>().Where(l => l.S_AREA_CODE == v && l.N_CURRENT_NUM == 0 && l.S_LOCK_STATE == "鏃� && ProRow.Select(e => e.N_ROW).ToList().Contains(l.N_ROW)).ToList();
+
+ ////鏌ヨ姣忎竴鎺掓渶澶х殑鍒�灏忎簬杩欎簺鍒楃殑 涓嶅厑璁稿叆
+ //foreach (var item in ProRow)
+ //{
+ // var MaxCol = lstCanOutL.FindAll(d => d.N_ROW == item.N_ROW).OrderByDescending(f => f.N_COL).First();
+ // EndMum.RemoveAll(f => f.N_ROW == item.N_ROW && f.N_COL < MaxCol.N_COL);
+ //}
+ //if (EndMum.Count() > 0)
+ //{
+ //if (lstCanOutL.Count() <= EndMum.Count())
+ //{
+ // NormalList = NormalList.FindAll(x => lstCanOutL.Select(e => e.N_ROW).ToList().Contains(x.N_ROW)).ToList();
+ //}
+ //var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
+ foreach (var rs in lstCanOutL.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)))
{
var srloclist = rs.OrderBy(x => x.N_COL).ToList();
- var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
- EndBit = srloclist.Find(x => x.S_LOCK_STATE == "鏃� && (x.N_CURRENT_NUM + cntrlist.Count()) <= Math.Min(x.N_CAPACITY, v1) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0));
- if (EndBit != null)
- break;
+
+ var zuidad = NormalList.FindAll(e => e.N_ROW == srloclist.FirstOrDefault().N_ROW).ToList();
+ if (zuidad.Any())
+ {
+ var lastfull = zuidad.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ var EndBitList = zuidad.FindAll(x => x.S_LOCK_STATE == "鏃� && (x.N_CURRENT_NUM + cntrlist.Count()) <= Math.Min(x.N_CAPACITY, v1) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0)).ToList();
+ if (EndBitList.Count() > 0)
+ {
+ EndBit = EndBitList.OrderBy(e => e.N_COL).FirstOrDefault();
+ if (EndBit != null)
+ break;
+ }
+ }
}
+ if (EndBit == null)
+ {
+ var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
+ var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
+ if (EptRowlist.Any())
+ {
+ EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
+ }
+ }
+ //}
+ //else
+ //{
+ // var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
+ // var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
+ // if (EptRowlist.Any())
+ // {
+ // EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
+ // }
+ //}
}
else
{
@@ -2421,39 +2524,84 @@
EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
}
}
+
+ ////鏈夊叆搴撻攣鎺掋� 鑳藉叆灏卞叆銆備笉鑳藉氨绛夈�
+ //if (inlock != null)
+ //{
+ // var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
+ // var Khw = loclist1.FindAll(f => f.N_CURRENT_NUM == 0).ToList();
+ // if (Khw.Count() == 0)
+ // {
+ // db.Deleteable(inlock).ExecuteCommand();
+ // }
+
+ // foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)))
+ // {
+ // var srloclist = rs.OrderBy(x => x.N_COL).ToList();
+ // var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ // EndBit = srloclist.Find(x => x.S_LOCK_STATE == "鏃� && (x.N_CURRENT_NUM + cntrlist.Count()) <= Math.Min(x.N_CAPACITY, v1) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0));
+ // if (EndBit != null)
+ // break;
+ // }
+ //}
+ //else
+ //{
+ // var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
+ // var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
+ // if (EptRowlist.Any())
+ // {
+ // EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
+ // }
+ //}
if (EndBit != null)
{
var res = TaskProcess.CreateTransport("", rsfull.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, v2 + "-鍏ュ簱", cntrlist.ToList(), rsfull.N_CURRENT_NUM + 1 - cntrlist.Count(), EndBit.N_CURRENT_NUM + 1, 1, 62);
LogHelper.CSucessLog($"from {rsfull.S_LOC_CODE} to {EndBit.S_LOC_CODE} {(v2 + "-鍏ュ簱")} 锛屽垱寤簕res} ");
-
- if (res && inlock == null)
- {
- var r = new RowLock { S_LOCK_SRC = rsfull.S_NOTE + rsfull.HalfOrFull, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍏ュ簱閿�, S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
- var db = new SqlHelper<object>().GetInstance();
- db.Insertable(r).ExecuteCommand();
- //else
- //{
- // if (inlock.N_ROW != EndBit.N_ROW)
- // {
- // db.Deleteable(inlock).ExecuteCommand();
- // 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)
- // {
- // if (row.S_LOCK_SRC != r.S_LOCK_SRC)
- // {
- // db.Deleteable(row).ExecuteCommand();
- // db.Insertable(r).ExecuteCommand();
- // }
- // }
- // else db.Insertable(r).ExecuteCommand();
- // }
- //}
- }
+ // var r = new RowLock { S_LOCK_SRC = rsfull.S_NOTE + rsfull.HalfOrFull, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍏ュ簱閿�, S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
+ //if (res && inlock == null)
+ //{
+ // db.Insertable(r).ExecuteCommand();
+ // //else
+ // //{
+ // //if (inlock?.N_ROW != EndBit.N_ROW)
+ // //{
+ // // db.Deleteable(inlock).ExecuteCommand();
+ // // 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)
+ // // {
+ // // if (row.S_LOCK_SRC != r.S_LOCK_SRC)
+ // // {
+ // // db.Deleteable(row).ExecuteCommand();
+ // // db.Insertable(r).ExecuteCommand();
+ // // }
+ // // }
+ // // else db.Insertable(r).ExecuteCommand();
+ // //}
+ // //}
+ //}
+ //else
+ //{
+ // if (inlock?.N_ROW != EndBit.N_ROW)
+ // {
+ // db.Deleteable(inlock).ExecuteCommand();
+ // 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)
+ // {
+ // if (row.S_LOCK_SRC != r.S_LOCK_SRC)
+ // {
+ // db.Deleteable(row).ExecuteCommand();
+ // db.Insertable(r).ExecuteCommand();
+ // }
+ // }
+ // else db.Insertable(r).ExecuteCommand();
+ // }
+ //}
}
Thread.Sleep(1000);
}
}
}
+
private static void YwlBQ_CreSXOutOrder(Settings.deviceInfo plc, List<YWLWorkOrder> yuworders)
@@ -4631,7 +4779,11 @@
var db = new SqlHelper<object>().GetInstance();
od.TagOverTime = DateTime.Now;
od.TagOver = StartBit.S_AREA_CODE;
- var ggf = db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.TagOver }).ExecuteCommand();
+ if (od.OutNum >= StartBit.N_CURRENT_NUM)
+ {
+ od.OutNum = od.OutNum - StartBit.N_CURRENT_NUM;
+ }
+ var ggf = db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.TagOver, it.OutNum }).ExecuteCommand();
LogHelper.Info($"涓婃彁鍗囨満浠诲姟 鏇存柊宸ュ崟鐨勬椂闂村奖鍝嶈鏁� {ggf}");
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 };
@@ -4699,6 +4851,7 @@
}
}
+ // list = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
foreach (var area in list.Distinct())
{
var AreaRowlist = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == area && x.N_CURRENT_NUM > 0);
--
Gitblit v1.9.1