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 | 1813 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 1,431 insertions(+), 382 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index d7fd2b9..972758d 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -8,7 +8,6 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
-using System.Web.UI.WebControls.WebParts;
namespace HH.WCS.QingXigongchang.core
{
@@ -431,13 +430,17 @@
var orders = WCSHelper.GetWorkOrder2();
var thisOrder = orders.Find(x => x.SQL_WorkNo == WorkNo);
LogHelper.Info("绉诲簱瑙ｉ攣 --褰撳墠宸ュ崟 sid:" + thisOrder?.S_ID);
- if (thisOrder != null)
- {
- var other = orders.Find(x => x.SQL_WorkNo != WorkNo && x.start_area == thisOrder.start_area && x.start_row == thisOrder.start_row);
- LogHelper.Info($"绉诲簱瑙ｉ攣 --鍏朵粬宸ュ崟 x.start_area == {thisOrder.start_area} start_row == {thisOrder.start_row} SID:" + other?.S_ID);
- if (other != null)
- j瑙ｉ攣璧风偣搴撳尯鎺�= false;
- }
+ var allarea_rows = orders.FindAll(x => x.S_ID != thisOrder.S_ID && x.start_area == thisOrder.start_area && x.start_row == thisOrder.start_row);
+ LogHelper.Info("绉诲簱瑙ｉ攣 --褰撳墠宸ュ崟 鐨勫悓搴撳尯鎺�鍏朵粬宸ュ崟:" + JsonConvert.SerializeObject(allarea_rows));
+ if (allarea_rows.Any())
+ j瑙ｉ攣璧风偣搴撳尯鎺�= false;
+ //if (thisOrder != null)
+ //{
+ // var other = orders.Find(x => x.SQL_WorkNo != WorkNo && x.start_area == thisOrder.start_area && x.start_row == thisOrder.start_row);
+ // LogHelper.Info($"绉诲簱瑙ｉ攣 --鍏朵粬宸ュ崟 x.start_area == {thisOrder.start_area} start_row == {thisOrder.start_row} SID:" + other?.S_ID);
+ // if (other != null)
+ // j瑙ｉ攣璧风偣搴撳尯鎺�= false;
+ //}
}
//if (sign == 1)
//{
@@ -1027,9 +1030,11 @@
static List<string> ABlist = new List<string> { "YWLAQWJ", "YWLBQWJ" };
static List<string> CDlist = new List<string> { "YWLCQSX", "YWLDQWJ" };
static bool InworkLock = false;
+ //Dictionary<string, List<RowLock>> RGRowList = new Dictionary<string, List<RowLock>>();
+ public static List<RowLock> RGRow = new List<RowLock>();
/// <summary>
/// 鍘熸潗鏂�妫�祴鍚勬祦杞綅缃� 鍐欏叆鎵樼洏璐т綅s_type 涓�涓嬩竴涓洰鐨勫湴銆傚氨寮�涓浆銆�- /// 鍘熺墿鏂欑焊绠憋紝鍏ュ簱鍫嗗彔鍖鸿浆杩�+ /// 鍘熺墿鏂欑焊绠憋紝鍏ュ簱鍫嗗彔鍖鸿浆杩�YWLRGDD--浜哄伐鍫嗗彔鍖� /// </summary>
internal static void BottTask()
{
@@ -1037,15 +1042,16 @@
var usingSpace = new List<string> { "鍏ュ簱鎺ラ┏鍖�, "搴撳唴鎺ラ┏鍖�, "鍑哄簱鎺ラ┏鍖�, "鎻愬崌鏈洪�鏂欏彛" };
//usingSpace = new List<string> { "YWLRGDD", "YWLWJJB", "YWLYLTKQ", "YWLTKKTQ", "YWLKTDDQ", "YWLT1TSJ", "YWLT1TSJCD", "YWLT2TSJ", "YWLT2TSJCD" };
usingSpace = new List<string> { "YWLYLTKQ", "YWLTKKTQ", "YWLWJJB", "YWLRGDD", "YWLT1TSJ", "YWLT2TSJ" };
+ var dbll = new SqlHelper<object>().GetInstance();
///----------------------------閫�綑鏂欎腑闂村簱鍖猴紝閫�┖涓棿搴撳尯锛� /// /*鎵樼洏璐т綅琛ㄧ殑 S_TYPE銆� 搴撳尯1,搴撳尯,*/
-
foreach (var area in usingSpace)
{
try
{
+
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)
{
@@ -1064,6 +1070,8 @@
if (!cntritems.Any())
continue;
var cir1 = cntritems.First();
+
+
//鍙瓫閫夌焊绠辩墿鏂欑殑搴撳尯鏁版嵁銆� if (!string.IsNullOrEmpty(cir1.S_ITEM_NAME) && cir1.S_ITEM_NAME.Contains("绾哥-"))
if (dsll.TryGetValue(cir1.S_ITEM_CODE, out List<Location> ll))
@@ -1075,6 +1083,7 @@
}
}
if (dsll.Any())
+ {
foreach (var r in dsll)
{
foreach (var rows in r.Value.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
@@ -1105,29 +1114,74 @@
//else
var ccr = _clrel0.S_TYPE.Split(',');
string EdnRarea = ccr.First();
+
+ if (EdnRarea == "YWLBQWJ" || EdnRarea == "YWLWJJB")//鍒癇鍖虹殑绉诲簱宸ュ崟鏈�鍙兘鐢熸垚涓ゆ潯浠诲姟
+ {
+ //鏌ヨ浠诲姟鏁�
+ 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() >= 3)
+ //{
+ // LogHelper.Info($"CreateTransport- CreateTask Error" + $"缁堢偣搴撳尯涓篩WLRGDD鎴栬�YWLWJJB 鍒欐渶澶氬彧鑳界敓鎴愪袱涓换鍔�);
+ // continue;
+ //}
+ }
string Last = string.Join(",", ccr.Skip(1));
if (ABlist.Contains(EdnRarea))
{
var ls = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == EdnRarea && (x.S_LOCK_STATE == "鍏ュ簱閿� || x.S_LOCK_STATE == "鍑哄簱閿�));
- if (ls.Any())
+ //var ls = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == EdnRarea && (x.S_LOCK_STATE == "鍏ュ簱閿�));
+ if (ls.Count() > 1)
{
LogHelper.Info($"{EdnRarea}浠诲姟鏁�绠″埗2");
continue;
}
}
+ if (CDlist.Contains(EdnRarea))
+ {
+ var ls = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == EdnRarea && x.S_LOCK_STATE == "鍏ュ簱閿�);
+ //var ls = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == EdnRarea && (x.S_LOCK_STATE == "鍏ュ簱閿�));
+ if (ls.Count() > 2)
+ {
+ LogHelper.Info($"{EdnRarea}浠诲姟鏁�绠″埗3");
+ continue;
+ }
+ }
+
+ //else if (CDlist.Contains(EdnRarea))
+ //{
+ // var ls = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == EdnRarea && (x.S_LOCK_STATE == "鍏ュ簱閿�)).ToList();
+ // if (ls.Count() > 2)
+ // {
+ // LogHelper.Info($"CD鍖哄叆搴撲换鍔＄鍒舵渶澶ф暟3 {EdnRarea}");
+ // continue;
+ // }
+ //}
var cntritems = ContainerHelper.GetCntrItemRel(_clrel0.S_CNTR_CODE);
if (!cntritems.Any())
continue;
var cir1 = cntritems.First();
var arloclist = LocationHelper.GetAreaNormalLocList(EdnRarea);// LocationHelper.GetList<Location>(x => x.S_AREA_CODE == _clrel0.S_TYPE && x.S_LOCK_STATE != "鎶ュ簾");
+
+ //鏈夌Щ搴撳伐鍗�鎺掗櫎绉诲簱宸ュ崟涓婃墍瀵瑰簲鐨勬帓
+ var order = LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "鎵ц").ToList();
+ if (order.Count() > 0)
+ {
+ foreach (var item in order)
+ {
+ LogHelper.Info($"鏈夌Щ搴撳伐鍗曟帓闄ゅ搴旂殑搴撳尯{item.S_START_AREA} 鎺抺item.N_START_ROW}");
+ arloclist.RemoveAll(e => e.S_AREA_CODE == item.S_START_AREA && e.N_ROW == item.N_START_ROW);
+ }
+ }
if (arloclist.Any())
{
- if (EdnRarea == "YWLWJJB")
- // InworkLock = true;
- //else InworkLock = false;
- //if (od.S_ZZ_AREA == "YWLWJJB")
+ if (EdnRarea == "YWLWJJB")//绾哥鏃犺弻鎺ラ┏鍖�+ // InworkLock = true;
+ //else InworkLock = false;
+ //if (od.S_ZZ_AREA == "YWLWJJB")
{
if (InworkLock)
continue;
@@ -1138,14 +1192,43 @@
Location endbit = null;
//foreach (var rss in arloclist.GroupBy(x => x.N_ROW).OrderByDescending(x => x.Count(y => y.N_CURRENT_NUM > 0)).ThenBy(xx => xx.Key))
RowLock inlock = null;
+ List<RowLock> inlockLis = new List<RowLock>();
bool isCd = false;
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 + cir1.S_CJ_NAME && x.S_LOCK_STATE == "鍏ュ簱閿�).FirstOrDefault();
- if (inlock != null)
+
+ if (_cl.S_AREA_CODE == "YWLRGDD")
{
- arloclist = arloclist.FindAll(x => x.N_ROW == inlock.N_ROW).ToList();
+ //鏌ヨ鏄惁鏈夊凡缁忓叆浜嗙殑鎺�+ 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 == cir1.S_ITEM_CODE && t.S_ITEM_NAME == cir1.S_ITEM_NAME && t.S_CJ_NAME == cir1.S_CJ_NAME && o.S_AREA_CODE == EdnRarea);
+ var lstCanOutL = 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(ca.ToExpression()).ToList();
+ LogHelper.Info($"缁堢偣鏈夌浉鍚岀殑鐗╂枡鐨勮揣浣嶆湁{lstCanOutL.Count()}");
+
+ var ca1 = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
+ ca1.And((o, p, t) => o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "鏃� && t.S_ITEM_CODE == cir1.S_ITEM_CODE && t.S_ITEM_NAME == cir1.S_ITEM_NAME && t.S_CJ_NAME == cir1.S_CJ_NAME && o.S_AREA_CODE == "YWLRGDD" && p.S_TYPE == EdnRarea);
+ 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 = 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 = 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())
+ {
+ arloclist = arloclist.FindAll(x => lstCanOutL.Select(e => e.N_ROW).ToList().Contains(x.N_ROW)).ToList();
+ }
+ }
+ }
}
}
foreach (var rss in arloclist.GroupBy(x => x.N_ROW).OrderByDescending(x => x.Count(y => y.N_CURRENT_NUM > 0)).ThenBy(x => x.Key))
@@ -1211,11 +1294,24 @@
var sign = Settings.GetTimeStamp();
var res = TaskProcess.CreateTransport(sign, _cl.S_LOC_CODE, endbit.S_LOC_CODE, "鍘熺墿鏂欐惉杩�绾哥", _clrel.Select(x => x.S_CNTR_CODE).ToList(), 1, endbit.N_CURRENT_NUM + 1, 1, 50, Last);///, EdnRarea == "YWLYLTKQ" ? _clrel0.S_TYPE : "");
LogHelper.Info($"{r.Key}鍘熺墿鏂欐惉杩�{sign} 浠诲姟 锛屽垱寤簕res} ");
- if (res && inlock == null && isCd)
+ if (CDlist.Contains(endbit.S_AREA_CODE) && res)
{
- 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());
+ LogHelper.Info($"娣诲姞鍐呭瓨鎺掗攣");
+ var ggf = inlockLis.Find(e => e.S_LOCK_SRC == cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME && e.S_AREA_CODE == endbit.S_AREA_CODE && e.N_ROW == endbit.N_ROW);
+ LogHelper.Info($"娣诲姞鍐呭瓨鎺掗攣 鏄惁鏌ヨ鍒版暟鎹�{JsonConvert.SerializeObject(ggf)}");
+ if (ggf == null)
+ {
+ 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 };
+ inlockLis.Add(rrrr);
+ LogHelper.Info($"娣诲姞鍐呭瓨鎺掗攣 娣诲姞鏁版嵁鍒板唴瀛樻帓閿佷腑:{JsonConvert.SerializeObject(inlockLis)}");
+ }
}
+ //if (res && inlock == null && isCd)
+ //{
+ // 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 };
+ // LogHelper.Info($"鍘熺墿鏂欏叆搴�娣诲姞鎺掗攣淇℃伅{JsonConvert.SerializeObject(rrrr)} ");
+ // WCSHelper.Do(db => db.Insertable(rrrr).ExecuteCommand());
+ //}
if (EdnRarea == "YWLWJJB") InworkLock = false;
break;
}
@@ -1225,7 +1321,11 @@
}
}
}
- else if (InworkLock) InworkLock = false;
+ }
+ else if (InworkLock)
+ {
+ InworkLock = false;
+ }
}
catch (Exception ex)
{
@@ -1280,66 +1380,107 @@
public static string RK_BQCDQ = "SXBQDDKQ";
+ /// <summary>
+ /// 涓按绾胯竟
+ /// </summary>
+ public static string YWLZSXBKQ = "YWLZSXBKQ";
+
+
}
+
+ public static bool LocLock(string AreaCode)
+ {
+ try
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ var TaskListNum = db.Queryable<Location>().Where(l => l.S_AREA_CODE == AreaCode && (l.S_LOCK_STATE == "鍑哄簱閿� || l.S_LOCK_STATE == "鍏ュ簱閿�)).ToList();
+ if (TaskListNum.Any())
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ return false;
+ }
+ }
+ public static object NewLock = new object();
/// <summary>
/// 鎻愭墸 銆傛爣绛俱�PE鑶滃嚭搴� /// </summary>
internal static void YwlTKPEBQ_Auto()
{
- LogHelper.CoCo(DateTime.Now + "鏍囩-鎻愭墸-PE鑶�>>>>>>>>>>>> ", ConsoleColor.Cyan);
- var locsFirst1 = LocationHelper.GetAreaNormalLocList(BQ_PRA.YWLRGDD);
- var db = new SqlHelper<object>().GetInstance();
- var locsFirstA = db.Queryable<LocCntrRel>()//鏍囩缁戝畾蹇呴』閮芥槸鍗曞眰銆�- 娑夊強鍫嗗彔涓庤揣鏋�灞傞棶棰樸�
- .InnerJoin<CntrItemRel>((lcr, cir) => lcr.S_CNTR_CODE == cir.S_CNTR_CODE)
- //.LeftJoin<ItemInfo>((lcr, cir, item) => cir.S_ITEM_CODE == item.S_ITEM_CODE && cir.S_ITEM_NAME == item.S_ITEM_NAME)
- .InnerJoin<Location>((lcr, cir, lo) => lcr.S_LOC_CODE == lo.S_LOC_CODE)
- .Where((lcr, cir, lo) =>/* cir.S_ITEM_NAME.Contains("鏍囩")&& */ locsFirst1.Select(x => x.S_LOC_CODE).Contains(lo.S_LOC_CODE) && lo.S_AREA_CODE == BQ_PRA.YWLRGDD)
- .Select((lcr, cir, lo) => new locCntItem
- {
- N_CURRENT_NUM = lo.N_CURRENT_NUM,
- S_TYPE = lcr.S_TYPE,
- S_LOC_CODE = lo.S_LOC_CODE,
- S_AREA_CODE = lo.S_AREA_CODE,
- N_ROW = lo.N_ROW,
- N_COL = lo.N_COL,
- 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_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();
- /// 浜哄伐鍫嗗彔鍖虹焊绠�鍜�鏍囩 鏄寜鏍囪瘑+鐗╂枡绛涢�杩涜鍏ュ簱杞繍銆�
- /// 鐗╂枡鍚嶇О鍖呭惈瀵瑰簲绉嶇被杩涜鍏ュ簱銆�- var locsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鏍囩-") && x.S_TYPE == WJ_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("鏀剁缉鑶�"));
-
- //if (mun % 20 == 0)
- //{
- // Console.WriteLine("鏍囩鍙夎繍浜哄伐缁戝畾鍖�鏃犺弻锛� + JsonConvert.SerializeObject(locsFirst));
- // Console.WriteLine("鏍囩鍙夎繍浜哄伐缁戝畾鍖�姘寸嚎锛� + JsonConvert.SerializeObject(SlocsFirst));
- //}
-
- var TASKs = new List<Task>();
- var task1 = Task.Run(() =>
+ lock (NewLock)
{
+ LogHelper.CoCo(DateTime.Now + "鏍囩-鎻愭墸-PE鑶�>>>>>>>>>>>> ", ConsoleColor.Cyan);
+ var locsFirst1 = LocationHelper.GetAreaNormalLocList(BQ_PRA.YWLRGDD);
+ var db = new SqlHelper<object>().GetInstance();
+ var locsFirstA = db.Queryable<LocCntrRel>()//鏍囩缁戝畾蹇呴』閮芥槸鍗曞眰銆�- 娑夊強鍫嗗彔涓庤揣鏋�灞傞棶棰樸�
+ .InnerJoin<CntrItemRel>((lcr, cir) => lcr.S_CNTR_CODE == cir.S_CNTR_CODE)
+ //.LeftJoin<ItemInfo>((lcr, cir, item) => cir.S_ITEM_CODE == item.S_ITEM_CODE && cir.S_ITEM_NAME == item.S_ITEM_NAME)
+ .InnerJoin<Location>((lcr, cir, lo) => lcr.S_LOC_CODE == lo.S_LOC_CODE)
+ .Where((lcr, cir, lo) =>/* cir.S_ITEM_NAME.Contains("鏍囩")&& */ locsFirst1.Select(x => x.S_LOC_CODE).Contains(lo.S_LOC_CODE) && lo.S_AREA_CODE == BQ_PRA.YWLRGDD)
+ .Select((lcr, cir, lo) => new locCntItem
+ {
+ N_CURRENT_NUM = lo.N_CURRENT_NUM,
+ S_TYPE = lcr.S_TYPE,
+ S_LOC_CODE = lo.S_LOC_CODE,
+ S_AREA_CODE = lo.S_AREA_CODE,
+ N_ROW = lo.N_ROW,
+ N_COL = lo.N_COL,
+ 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_ITEM_CODE = cir.S_ITEM_CODE,
+ S_ITEM_NAME = cir.S_ITEM_NAME,
+ S_BATCH_NO = cir.S_BATCH_NO,
+ S_CJ_NAME = cir.S_CJ_NAME,
+ S_CNTR_CODE = cir.S_CNTR_CODE
+ })
+ .ToList();
+ /// 浜哄伐鍫嗗彔鍖虹焊绠�鍜�鏍囩 鏄寜鏍囪瘑+鐗╂枡绛涢�杩涜鍏ュ簱杞繍銆�
+ /// 鐗╂枡鍚嶇О鍖呭惈瀵瑰簲绉嶇被杩涜鍏ュ簱銆�+ foreach (var item in locsFirstA)
+ {
+ if (!string.IsNullOrEmpty(item.S_BATCH_NO))
+ {
+ item.S_NOTE = item.S_NOTE + "&" + item.S_BATCH_NO;
+ }
+ }
+ 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_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("鏀剁缉鑶�"));
+
+ //if (mun % 20 == 0)
+ //{
+ // Console.WriteLine("鏍囩鍙夎繍浜哄伐缁戝畾鍖�鏃犺弻锛� + JsonConvert.SerializeObject(locsFirst));
+ // Console.WriteLine("鏍囩鍙夎繍浜哄伐缁戝畾鍖�姘寸嚎锛� + JsonConvert.SerializeObject(SlocsFirst));
+ //}
+
+ var TASKs = new List<Task>();
+ //var task1 = Task.Run(() =>
+ //{
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();
- if (!yuworders.Any())
+ // 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);
}
- else
+ if (yuworders.Any())
{
LogHelper.Info($" 鏃犺弻鍑哄簱 宸ュ崟寮�惎涓�");
// 鏍囩鍑哄簱銆傝揣鏋剁洿鎺ュ嚭鍒扮嚎杈� YwlBQ_CreWJOutOrder();
}
-
// 鏍囩鏃犺弻閫�簱銆�
YwlBQ_CreWJTK();
}
@@ -1347,79 +1488,116 @@
{
LogHelper.Error(ex.Message, ex);
}
- });
+ //});
- var plc = Settings.GetDeviceInfoList().Where(a => a.deviceName == "T2鎻愬崌鏈�).FirstOrDefault();
- var task2 = Task.Run(() =>
- {
- try
+ var task11 = Task.Run(() =>
{
- string pline = "T2鎻愬崌鏈�鏍囩";
- var Syuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
- //yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == plc.deviceName && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
-
- var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 1 && x.SQL_State == "鎵ц涓�);
- if (!Syuworders.Any())
+ try
{
- YwlBQ_CreInwork(SlocsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
- }
- if (tklist.Count() > 0)
- {
- var tk = tklist.FirstOrDefault();
-
- var loc = LocationHelper.GetLoc(plc.location[0]);
- if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "鏃�)
+ // 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(SX_BQ.RK_BBHJQ))
{
- 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)
+ //姘存爣鍏ュ簱
+ YwlBQ_CreInwork(SblocsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
+ }
+ if (yuworders.Any())
+ {
+ LogHelper.Info($" 鏃犺弻鍑哄簱 宸ュ崟寮�惎涓�");
+ // 涓按鏍囩閫�簱銆傝揣鏋剁洿鎺ュ嚭鍒扮嚎杈�+ ZsBQ_CreWJOutOrder();
+ }
+ // 涓按鏍囩閫�簱銆�
+ ZsBQ_CreWJTK();
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error(ex.Message, ex);
+ }
+ });
+
+ var plc = Settings.GetDeviceInfoList().Where(a => a.deviceName == "T2鎻愬崌鏈�).FirstOrDefault();
+ var task2 = Task.Run(() =>
+ {
+ try
+ {
+ string pline = "T2鎻愬崌鏈�灏忔按鏍囩";
+ var Syuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
+ //yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == plc.deviceName && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
+
+ 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 (tklist.Count() > 0)
+ {
+ var tk = tklist.FirstOrDefault();
+ var loc = LocationHelper.GetLoc(plc.location[0]);
+ if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "鏃�)
{
- var s_type = ContainerHelper.GetCntrItemRel(rr_clrel.FirstOrDefault().S_CNTR_CODE).FirstOrDefault()?.N_BQ_TRAY_TYPE ?? 0;
- if (s_type == 0)
+ 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)
{
- LogHelper.CErrorLog($"{tk.SQL_WorkNo}-{tk.SQL_PLineNo} 閫�簱宸ュ崟寮�惎锛岀粦瀹氱殑 闆舵暣 鏍囪");
- }
- Location Endbit = null;
- var hjs = LocationHelper.GetAreaNormalLocList(SX_BQ.RK_BBHJQ, true, false);
- 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, "鏍囩鍙夎繍-SX鏍囩閫�簱", 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} 鏍囩鍙夎繍-SX鏍囩閫�簱 锛屽垱寤簕re}");
+ var s_type = ContainerHelper.GetCntrItemRel(rr_clrel.FirstOrDefault().S_CNTR_CODE).FirstOrDefault()?.N_BQ_TRAY_TYPE ?? 0;
+ if (s_type == 0)
+ {
+ LogHelper.CErrorLog($"{tk.SQL_WorkNo}-{tk.SQL_PLineNo} 閫�簱宸ュ崟寮�惎锛岀粦瀹氱殑 闆舵暣 鏍囪");
+ }
+ Location Endbit = null;
+ // var hjs = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == SX_BQ.RK_BBHJQ).FindAll(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM == 0);
+ // var hjs = db.Queryable<Location>().Where(l => l.S_AREA_CODE == SX_BQ.RK_BBHJQ && l.S_LOCK_STATE.Trim() == "鏃�).ToList();
+ var hjs = LocationHelper.GetAreaNormalLocList(SX_BQ.RK_BBHJQ, true, false);
+ 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, "鏍囩鍙夎繍-SX鏍囩閫�簱", 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} 鏍囩鍙夎繍-SX鏍囩閫�簱 锛屽垱寤簕re}");
+ }
}
}
}
+ else if (Syuworders.Any())
+ {
+ YwlBQ_CreSXOutOrder(plc, Syuworders.FindAll(x => x.OutNum > 0));
+ }
}
- else if (Syuworders.Any())
+ catch (Exception ex)
{
- YwlBQ_CreSXOutOrder(plc, Syuworders.FindAll(x => x.OutNum > 0));
+ LogHelper.Error(ex.Message, ex);
}
- }
- catch (Exception ex)
- {
- LogHelper.Error(ex.Message, ex);
- }
- });
- var task3 = Task.Run(() =>
- {
+ });
+ //var task3 = Task.Run(() =>
+ //{
try
{
//return;
- YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "鎻愭墸鍙夎繍");//鎻愭墸 涓按 閫�簱銆�+ if (LocLock("YWLTKMKQ"))
+ {
+ YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "鎻愭墸鍙夎繍");//鎻愭墸 涓按 閫�簱銆�+ }
YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "鎻愭墸鍙夎繍", 1);//鎻愭墸涓按鍑哄簱
+
+ YwlPEZsOutOrder("YWLTKMKQ", "YWLZSXBKQ", "涓按鑶滃弶杩�, 1);//涓按鍑哄簱
}
catch (Exception ex)
{
LogHelper.Error(ex.Message, ex);
}
- });
- var task4 = Task.Run(() =>
- {
+ //});
+ //var task4 = Task.Run(() =>
+ //{
try
{
//return;
///璧风偣鏁版嵁銆� 缁堢偣搴撳尯 鍫嗗彔灞傛暟銆�- YwlPETK_CreInwork(PElocsFirst, "YWLTKMKQ", "鎻愭墸鍙夎繍", 3);//鎻愭墸鍏ュ簱--PE鑶�- YwlPETK_CreInwork(TKlocsFirst, "YWLTKMKQ", "鏀剁缉鑶滃弶杩�, 1); // PE鍏ュ簱 --鎻愭墸
+ if (LocLock("YWLTKMKQ"))
+ {
+ YwlPETK_CreInwork(PElocsFirst, "YWLTKMKQ", "鏀剁缉鑶滃弶杩�, 2);//PE鑶�+ YwlPETK_CreInwork(TKlocsFirst, "YWLTKMKQ", "鎻愭墸鍙夎繍", 1); //鎻愭墸
+ }
//YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "鏀剁缉鑶滃弶杩�);
//YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "鏀剁缉鑶滃弶杩�);// PE涓嚭搴�
@@ -1453,6 +1631,7 @@
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);
@@ -1580,8 +1759,8 @@
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 && 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)
+ 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
@@ -1628,11 +1807,11 @@
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();
- }
+ //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();
+ //}
}
}
}
@@ -1641,7 +1820,6 @@
{
LogHelper.Info(order.SQL_PLineNo + "-鏀剁缉鑶� 鍑哄簱锛�娌℃湁鍙敤鐗╂枡");
}
-
var set1 = new HashSet<string>(oto);
var set2 = new HashSet<string>(taglist);
@@ -1662,9 +1840,10 @@
{
LogHelper.Error(ex.Message, ex);
}
- });
- Task.WaitAll(task1, task2, task3, task4);
- LogHelper.CoCo(DateTime.Now + "鏍囩-鎻愭墸-PE鑶� Over=============== ", ConsoleColor.Cyan);
+ // });
+ // Task.WaitAll(task1, task2, task3, task4);
+ LogHelper.CoCo(DateTime.Now + "鏍囩-鎻愭墸-PE鑶� Over=============== ", ConsoleColor.Cyan);
+ }
}
/// <summary>
/// 鎻愭墸锛屼腑姘�閫�簱
@@ -1681,6 +1860,7 @@
LeftJoin<LocCntrRel>((l, c) => l.S_LOC_CODE == c.S_LOC_CODE)
.Where((l, c) => (l.S_AREA_CODE == v1) && c.S_TYPE == BQ_PRA.B)
.ToList();
+
if (v.Any())
{
foreach (var area in v.Select(x => x.S_AREA_CODE).Distinct())
@@ -1698,68 +1878,105 @@
var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
if (!cirs.Any()) continue;
var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
- if (CNTR.FirstOrDefault().S_TYPE == BQ_PRA.B)
+ if (cirs.FirstOrDefault().S_ITEM_NAME.Contains("鏍囩-"))
{
- var s_type = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE).FirstOrDefault()?.N_BQ_TRAY_TYPE ?? 0;
+ 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();
- var rklist = LocationHelper.GetRowLock(v2);
- int hof = (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3));
- var inlock = rklist.Find(x => x.S_AREA_CODE == v2 && 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(v2);
- //鏈夊叆搴撻攣鎺掋� 鑳藉叆灏卞叆銆備笉鑳藉氨绛夈�
- if (inlock != null)
+ Location EndBit = null;
+ var NormalList = LocationHelper.GetAreaNormalLocList(v2);
+ 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)
{
- 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();
- 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;
- }
+ NormalList = NormalListt;
}
- 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("", lastfull1.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, v3 + "-閫�簱", new List<string> { cir.S_CNTR_CODE }, lastfull1.N_CURRENT_NUM, EndBit.N_CURRENT_NUM + 1, 1, 62);
- LogHelper.CSucessLog($"from {lastfull1.S_LOC_CODE} to {EndBit.S_LOC_CODE} {v3}-閫�簱 锛屽垱寤簕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 };
- db.Insertable(r).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();
- }
+ //鏈夊叆搴撻攣鎺掋� 鑳藉叆灏卞叆銆備笉鑳藉氨绛夈�
+ 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))
+ {
+ 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 < Math.Min(x.N_CAPACITY, 1) && 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("", lastfull1.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, v3 + "-閫�簱", new List<string> { cir.S_CNTR_CODE }, lastfull1.N_CURRENT_NUM, EndBit.N_CURRENT_NUM + 1, 1, 62);
+ LogHelper.CSucessLog($"from {lastfull1.S_LOC_CODE} to {EndBit.S_LOC_CODE} {v3}-閫�簱 锛屽垱寤簕res} ");
+
}
}
}
}
-
//鎵ц閫�簱銆傘�銆�
Console.WriteLine($"{v.FirstOrDefault()?.S_LOC_CODE} 闇�閫�簱-- 鑷姩閫�簱-鏈疄鐜�);
}
}
//鏍囩閫�簱銆�绾胯竟杞埌 璐ф灦銆�+ private static void ZsBQ_CreWJTK()
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ var v = db.Queryable<Location>().
+ LeftJoin<LocCntrRel>((l, c) => l.S_LOC_CODE == c.S_LOC_CODE)
+ .Where((l, c) => (l.S_AREA_CODE == SX_BQ.YWLZSXBKQ /*|| l.S_AREA_CODE == WJ_BQ.RK_BQJBQ*/) && c.S_TYPE == BQ_PRA.B)
+ .ToList();
+ if (v.Any())
+ {
+ foreach (var area in v.Select(x => x.S_AREA_CODE).Distinct())
+ {
+ var rowsss = v.FindAll(x => x.S_AREA_CODE == area).Select(x => x.N_ROW).Distinct();
+ var locs = LocationHelper.GetAreaNormalLocList(area).FindAll(x => rowsss.Contains(x.N_ROW));
+ foreach (var item in locs.GroupBy(x => x.N_ROW))
+ {
+ 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;
+ var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ if (CNTR.FirstOrDefault().S_TYPE == BQ_PRA.B)
+ {
+ var s_type = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE).FirstOrDefault()?.N_BQ_TRAY_TYPE ?? 0;
+ Location Endbit = null;
+ var hjs = LocationHelper.GetAreaNormalLocListAll(SX_BQ.RK_BBHJQ);
+ Endbit = hjs.FindAll(x => x.N_CURRENT_NUM == 0 && 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("", lastfull.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "鏍囩鍙夎繍-绾胯竟鏍囩閫�簱", CNTR.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
+ LogHelper.CSucessLog($"from {lastfull.S_LOC_CODE} to {Endbit.S_LOC_CODE} 鏍囩鍙夎繍-鎺ラ┏鏍囩閫�簱 锛屽垱寤簕re}");
+ }
+
+ }
+ }
+ }
+ }
+ }
+
+ }
private static void YwlBQ_CreWJTK()
{
var db = new SqlHelper<object>().GetInstance();
@@ -1788,16 +2005,16 @@
{
var s_type = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE).FirstOrDefault()?.N_BQ_TRAY_TYPE ?? 0;
Location Endbit = null;
- if (area == area/* WJ_BQ.RK_BQJBQ*/)
+ //if (area == area/* WJ_BQ.RK_BQJBQ*/)
+ //{
+ var hjs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BBHJQ, true, false);
+ Endbit = hjs.FindAll(x => x.N_CURRENT_NUM == 0 && 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 hjs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BBHJQ, true, false);
- Endbit = hjs.FindAll(x => x.N_CURRENT_NUM == 0 && 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("", lastfull.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "鏍囩鍙夎繍-绾胯竟鏍囩閫�簱", CNTR.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
- LogHelper.CSucessLog($"from {lastfull.S_LOC_CODE} to {Endbit.S_LOC_CODE} 鏍囩鍙夎繍-鎺ラ┏鏍囩閫�簱 锛屽垱寤簕re}");
- }
+ var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "鏍囩鍙夎繍-绾胯竟鏍囩閫�簱", CNTR.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
+ LogHelper.CSucessLog($"from {lastfull.S_LOC_CODE} to {Endbit.S_LOC_CODE} 鏍囩鍙夎繍-鎺ラ┏鏍囩閫�簱 锛屽垱寤簕re}");
}
+ // }
//else
//{
@@ -1878,7 +2095,7 @@
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 && cir.S_CJ_NAME == od.S_CJ_NAME)
+ if (cir.S_ITEM_CODE == od.SQL_ItemCode && cir.S_ITEM_NAME == od.SQL_ItemName)
{
//plg 2025骞�鏈�3鏃�09:09:25
Temp = new locCntItem
@@ -1914,39 +2131,249 @@
//var rklist = LocationHelper.GetRowLock(v);
//var inlock = rklist.Find(x => x.S_LOCK_SRC == (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3))) && x.S_LOCK_STATE.Contains("鍑哄簱閿�));
var NormalList2 = LocationHelper.GetAreaNormalLocList(v1);
+ if (NormalList2.Any())
+ {
+ 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)
+
+ ////}
+ ////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))
+ //{
+ // var y = item.OrderBy(x => x.N_COL).ToList();
+ // var lastfull = y.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ // EndBit = y.Find(x => x.N_COL >= (lastfull?.N_COL ?? 0) && x.N_CURRENT_NUM == 0);
+ // 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;
+ // }
+ // if (EndBit != null)
+ // break;
+ //}
+ 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 re = TaskProcess.CreateTransport("", StartBit.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, (oin.Contains("鎻愭墸") ? "鎻愭墸" : "鏀剁缉鑶�) + "鍙夎繍-鍑哄簱绾胯竟", new List<string> { StartBit.S_CNTR_CODE }, StartBit.N_CURRENT_NUM, 1, 1, 62);
+ LogHelper.Info($"from {StartBit.S_LOC_CODE} to {EndBit.S_LOC_CODE} {pline}-鍑哄簱绾胯竟 锛屽垱寤簕re} ");
+ if (re)
{
- EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
+ od.TagOverTime = DateTime.Now;
+ od.OutNum--;
+ WCSHelper.Do(db =>
+ {
+ db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.OutNum }).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 };
+ //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
+ 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();
+ }
+ });
+ }
+ break;
+ }
+ }
+ }
+ }
+ }
+ private static void YwlPEZsOutOrder(string v, string v1, string v2, int v3 = 3)
+ {
+ List<YWLWorkOrder> Orders = new List<YWLWorkOrder>();
+
+ foreach (var pline in new[] { "涓按PE鑶滃嚭搴� })
+ {
+ Orders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && 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();
+ foreach (var od in Orders)
+ {
+ var oic = od.SQL_ItemCode?.Trim();
+ var oin = od.SQL_ItemName?.Trim();
+ if (string.IsNullOrEmpty(oic) || string.IsNullOrEmpty(oin))
+ {
+ LogHelper.CErrorLog("涓按PE鑶滐細" + (od.SQL_WorkNo) + "娌℃湁銆愭寚瀹氱墿鏂欙紱");
+ continue;
+ }
+ int ord = oin.Contains("涓按") ? 1 : -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));
+ }
+ 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();
+ if (cir.S_ITEM_CODE == od.SQL_ItemCode && cir.S_ITEM_NAME == od.SQL_ItemName)
+ {
+ //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,
+ 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 rklist = LocationHelper.GetRowLock(v);
+ //var inlock = rklist.Find(x => x.S_LOCK_SRC == (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3))) && x.S_LOCK_STATE.Contains("鍑哄簱閿�));
+ var NormalList2 = LocationHelper.GetAreaNormalLocList(v1);
+ if (NormalList2.Any())
+ {
+ NormalList2 = NormalList2.FindAll(e => e.N_ROW == 1).ToList();
+ }
+ //if (inlock != null)
+ //{
+ // var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
+ 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;
+ }
+ }
+ //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))
//{
@@ -2004,7 +2431,6 @@
}
}
-
/// <summary>
/// 鍏ュ簱閫�簱銆�鐭ラ亾 闆跺ご婊℃墭銆傛甯稿尮閰嶃�
/// </summary>
@@ -2015,27 +2441,79 @@
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;
- var rsfull = ptR.OrderBy(X => X.N_COL).ToList().FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ var ptrlist = ptR.OrderBy(X => X.N_COL).ToList();
+ var rsfull = ptrlist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
if (rsfull != null)
{
+ var cntrlist = ptrlist.FindAll(x => x.S_LOC_CODE == rsfull.S_LOC_CODE).Select(x => x.S_CNTR_CODE);
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 < 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
{
@@ -2046,39 +2524,85 @@
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 + "-鍏ュ簱", new List<string> { rsfull.S_CNTR_CODE }, rsfull.N_CURRENT_NUM, EndBit.N_CURRENT_NUM + 1, 1, 62);
+ 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)
{
@@ -2145,12 +2669,12 @@
if (order != null)
{
var Porder = WCSHelper.GetWorkOrder(order.SQL_LinkLineNO);
- if (Porder == null)
- {
- LogHelper.CErrorLog("SX鏍囩鍑哄簱锛� + (order.SQL_LinkLineNO) + "娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
- yuworders.Remove(order);
- goto retuse;
- }
+ //if (Porder == null)
+ //{
+ // LogHelper.CErrorLog("SX鏍囩鍑哄簱锛� + (order.SQL_LinkLineNO) + "娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
+ // yuworders.Remove(order);
+ // goto retuse;
+ //}
var oto = new List<string>();
//if (!string.IsNullOrEmpty(order.TagOver))
// oto = order.TagOver.Split(',').ToList();
@@ -2639,12 +3163,12 @@
if (order != null)
{
var Porder = WCSHelper.GetWorkOrder(order.SQL_LinkLineNO);
- if (Porder == null)
- {
- LogHelper.CErrorLog("鏃犺弻鏍囩鍑哄簱锛� + (order.SQL_LinkLineNO) + "娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
- yuworders.Remove(order);
- goto retuse;
- }
+ //if (Porder == null)
+ //{
+ // LogHelper.CErrorLog("鏃犺弻鏍囩鍑哄簱锛� + (order.SQL_LinkLineNO) + "娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
+ // yuworders.Remove(order);
+ // goto retuse;
+ //}
var oto = new List<string>();
//if (!string.IsNullOrEmpty(order.TagOver))
@@ -2773,6 +3297,290 @@
}
}
+
+
+
+ internal static void ZsBQ_CreWJOutOrder()
+ {
+ LogHelper.Info($" 鏃犺弻鍑哄簱 寮�");
+ //1.妫�煡鏄惁鏈夐�搴�+ var db = new SqlHelper<object>().GetInstance();
+
+ if (false)
+ {
+ ///绗笁娈碉細鎺ラ┏鍖�杞�绾胯竟
+ 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)
+ {
+ var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
+ 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())
+ {
+ 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)
+ {
+ 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())
+ {
+ 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);
+ LogHelper.Info($"from {l2.S_LOC_CODE} to {e.S_LOC_CODE} 鏍囩鍙夎繍-鎺ラ┏杞嚎杈�锛屽垱寤簕re} ");
+ break;
+ }
+ }
+ }
+ }
+ LogHelper.Info($" 鏃犺弻鍑哄簱 鍒扮嚎杈�缁撴潫");
+ ///鎷嗗灈鍖哄彇娑堛�
+ ///绗簩娈碉細鎷嗗灈鍖恒�鎷嗗幓鎺ラ┏銆�鎴栬�鍥炲簱銆�+ var v = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQCDQ);
+ ///鎷嗗灈鐨勫嚭搴撱� 鍗曞眰鐨勫洖搴� 鍗曞眰涓嶅叆鎷嗗灈鍖�+ foreach (var item in v.GroupBy(x => x.N_ROW))
+ {
+ 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 (lastfull.N_CURRENT_NUM == 2)
+ {
+ if (CNTR.Find(x => x.S_TYPE == BQ_PRA.Out) == null)
+ {
+ LogHelper.CError($" 寮�惎鍑哄簱娴佺▼銆�鍫嗗彔鍖烘槸鍏ュ簱鍫嗗彔鎵樼洏锛岀粓姝㈠嚭搴撱� 杩欓噷鍙互鎵ц鍏ュ簱銆�);
+ return;
+ }
+ //鎷嗕竴涓埌鎺ラ┏ - 鎺ラ┏浣嶆帓锛屽鏋滄槸閫�簱鐨勶紝灏辨崲涓�帓銆�+ var jbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
+ foreach (var rowloc in jbqs.GroupBy(x => x.N_ROW))
+ {
+ var y2 = rowloc.OrderBy(x => x.N_COL).ToList();
+ var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (l2 != null && l2.N_CURRENT_NUM == 1)
+ {
+ var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
+ if (c.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
+ {
+ continue;
+ }
+ }
+ var e = y2.FindAll(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
+ if (e != null)
+ {
+ var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-鎷嗗灈鎺ラ┏", new List<string> { CNTR.FirstOrDefault().S_CNTR_CODE }, 2, 1, 1, 62);
+ LogHelper.Info($"from {lastfull.S_LOC_CODE} to {e.S_LOC_CODE} 鏍囩鍙夎繍-鎷嗗灈鎺ラ┏ 锛屽垱寤簕re} ");
+ break;
+ }
+ }
+ }
+ else
+ {
+ //鍥炶揣鏋�+ var hjs = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == WJ_BQ.RK_BBHJQ).FindAll(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM == 0).OrderBy(x => x.N_LAYER).ThenBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
+ if (hjs != null)
+ {
+ var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), hjs.S_LOC_CODE, "鏍囩鍙夎繍-鎷嗗灈鍥�, new List<string> { CNTR.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62);
+ LogHelper.Info($"from {lastfull.S_LOC_CODE} to {hjs.S_LOC_CODE} 鏍囩鍙夎繍-鎷嗗灈鍥�锛屽垱寤簕re} ");
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ ///绗竴娈碉細鍑哄簱 -鍒版媶鍨涙垨鑰�鎺ラ┏銆�+ 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();
+
+ //foreach (var order in yuworders)
+ retuse:
+ var order = yuworders.FirstOrDefault();
+ 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;
+ var oin = order.SQL_ItemName;
+ if (string.IsNullOrEmpty(oic) || string.IsNullOrEmpty(oin))
+ {
+ LogHelper.CErrorLog("涓按鏍囩鍑哄簱锛� + (order.SQL_WorkNo) + "娌℃湁銆愭寚瀹氱墿鏂欙紱");
+ goto retuse;
+ }
+ //var item_ = ContainerHelper.GetItem(x => x.S_ITEM_CODE == oic && x.S_ITEM_NAME == oin);
+
+ //鎸夐『搴忓尮閰嶆爣绛撅紝鐩村埌瀹屾垚鎵�湁鏍囩銆傚悗 娓呯┖鏍囩锛屽苟閲嶇疆鏍囩瀹屾垚鏃堕棿= 褰撳墠鏃堕棿銆�+ var hjs = db.Queryable<Location>()
+ .LeftJoin<LocCntrRel>((l, lc) => l.S_LOC_CODE == lc.S_LOC_CODE)
+ .LeftJoin<CntrItemRel>((l, lc, ci) => lc.S_CNTR_CODE == ci.S_CNTR_CODE)
+ .Where((l, lc, ci) => l.S_AREA_CODE == SX_BQ.RK_BBHJQ && l.S_LOCK_STATE == "鏃�).Select((l, lc, ci) => new locCntItem
+ {
+ N_CURRENT_NUM = l.N_CURRENT_NUM,
+ S_TYPE = lc.S_TYPE,
+ S_LOC_CODE = l.S_LOC_CODE,
+ S_AREA_CODE = l.S_AREA_CODE,
+ HalfOrFull = (ci.N_BQ_TRAY_TYPE == .5 ? 1 : (ci.N_BQ_TRAY_TYPE == .75 ? 2 : 3)), // 鍗婃墭涓�.5 鏁存墭涓� 銆�杞崲涓烘暣鏁� *2 )銆� 鍗婃墭涓�1锛屾暣鎵�2
+ N_LAYER = l.N_LAYER,
+ S_NOTE = ci.S_ITEM_CODE.Trim() + "&" + ci.S_ITEM_NAME.Trim(),
+ S_ITEM_CODE = ci.S_ITEM_CODE,
+ S_ITEM_NAME = ci.S_ITEM_NAME,
+ S_CNTR_CODE = ci.S_CNTR_CODE
+ }).ToList();
+ var taglist = new List<string>() { oic };
+ //if (!string.IsNullOrEmpty(item_.S_BQ_NAME))
+ // taglist = item_.S_BQ_NAME.Split(',').ToList();
+ foreach (var item in taglist)
+ {
+ //if (oto.Contains(item))
+ // continue;
+ //var Ii = ContainerHelper.GetItem(x => x.S_ITEM_CODE == item);
+ //if (Ii == null)
+ //{
+ // LogHelper.CError($"{order.SQL_WorkNo} - {order.SQL_PLineNo} - {item} 鐗╂枡椤哄簭涓嶅瓨鍦ㄣ�");
+ // return;
+ //}
+ var tagLoc = hjs.FindAll(x => x.S_ITEM_CODE == oic/* Ii.S_ITEM_CODE*/ && x.S_ITEM_NAME == oin /*Ii.S_ITEM_NAME x.S_NOTE == (Ii.S_ITEM_CODE + "&" + Ii.S_ITEM_NAME)*/).OrderBy(x => x.HalfOrFull).FirstOrDefault();
+ if (tagLoc != null)
+ {
+ if (tagLoc.N_LAYER == 1 || tagLoc.N_CURRENT_NUM == 1)
+ {
+ // 鐩存帴鍑烘帴椹充綅
+ var jbqs = LocationHelper.GetAreaNormalLocList(SX_BQ.YWLZSXBKQ);
+ if (jbqs.Any())
+ {
+ jbqs = jbqs.FindAll(e => e.N_ROW == 3).ToList();
+ }
+ foreach (var rowloc in jbqs.GroupBy(x => x.N_ROW))
+ {
+ var y2 = rowloc.OrderBy(x => x.N_COL).ToList();
+ var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (l2 != null && l2.N_CURRENT_NUM == 1)
+ {
+ var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
+ if (!c.Any() || c.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
+ {
+ continue;
+ }
+ //var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
+ //if (!cirs.Any()) continue;
+ //var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ //if (cir.S_ITEM_CODE != tagLoc.S_ITEM_CODE || cir.S_ITEM_NAME != tagLoc.S_ITEM_NAME)
+ // continue;
+ }
+ var e = y2.FindAll(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
+ if (e != null)
+ {
+ var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-璐ф灦鍑虹嚎杈�, new List<string> { tagLoc.S_CNTR_CODE }, 1, 1, 1, 62);
+ LogHelper.Info($"from {tagLoc.S_LOC_CODE} to {e.S_LOC_CODE} 鏍囩鍙夎繍-璐ф灦鍑烘帴椹�锛屽垱寤簕re} ");
+ if (re)
+ oto.Add(item);
+ break;
+ }
+ }
+ }
+ else
+ {
+ var taglocs = hjs.FindAll(x => x.S_LOC_CODE == tagLoc.S_LOC_CODE);
+ var v = LocationHelper.GetAreaNormalLocList(SX_BQ.YWLZSXBKQ);
+ if (v.Any())
+ {
+ v = v.FindAll(e => e.N_ROW == 3).ToList();
+ }
+ foreach (var cdr in v.GroupBy(x => x.N_ROW))
+ {
+ var y2 = cdr.OrderBy(x => x.N_COL).ToList();
+ var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ var e = y2.FindAll(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
+ if (e != null)
+ {
+ var tgs = taglocs.Select(x => x.S_CNTR_CODE).ToList();
+ var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-璐ф灦鍑烘媶鍨�, tgs, 1, 1, tgs.Count, 62, BQ_PRA.Out);
+ LogHelper.Info($"from {tagLoc.S_LOC_CODE} to {e.S_LOC_CODE} 鏍囩鍙夎繍-璐ф灦鍑烘媶鍨�锛屽垱寤簕re} ");
+ if (re)
+ oto.Add(item);
+ break;
+ }
+ }
+ }
+ }
+ else
+ {
+ LogHelper.CErrorLog("涓按鏍囩鍑哄簱锛� + (order.SQL_LinkLineNO) + $" 璐ф灦涓婃病鏈夎繖涓猍{item}]鏍囩鐗╂枡銆�);
+ }
+ }
+
+ var set1 = new HashSet<string>(oto);
+ var set2 = new HashSet<string>(taglist);
+
+ if (set1.SetEquals(set2))
+ {
+ order.OutNum--;
+ order.TagOverTime = DateTime.Now;
+ //order.TagOver = string.Empty;
+ db.Updateable(order).UpdateColumns(it => new {/* it.TagOver,*/it.OutNum, it.TagOverTime }).ExecuteCommand();
+ LogHelper.CSucess($"{order.SQL_PLineNo}-{order.SQL_LinkLineNO} 鏍囩瀹屾垚銆傞噸缃暟鎹�);
+ }
+ else
+ {
+ //string otgo = string.Join(",", oto);
+ //if (order.TagOver != otgo)
+ //{
+ // order.TagOver = otgo;
+ // db.Updateable(order).UpdateColumns(it => new { it.TagOver }).ExecuteCommand();
+ //}
+ }
+ }
+
+ }
+
+
//鍏ュ簱-鍫嗗彔-璐ф灦
static bool from_mid_to(locCntItem startLoc, string MidArea, List<Location> locHJs)
@@ -3584,66 +4392,182 @@
public int Row { get; set; }
}
+
+ /// <summary>
+ /// AB鍖虹墿鏂欎笉瓒宠嚜鍔ㄨ浆杩�+ /// </summary>
+ public static void ZdzyABArea()
+ {
+ try
+ {
+ var chi = new SqlHelper<object>().GetInstance();
+ var newDb = chi.CopyNew();
+ foreach (var PLC in Settings.GetDeviceInfoList().FindAll(X => X.deviceType == 13 && X.enable == 1))
+ {
+ string pline = PLC.deviceName;
+ if (PLC.deviceName.Contains("T2"))
+ pline = "T2鎻愬崌鏈�绾哥";
+
+ var orkOrd = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 6 && x.SQL_State == "鎵ц涓�);
+ if (orkOrd.Any())
+ {
+ foreach (var od in orkOrd)
+ {
+ var loclist = LocationHelper.GetLocList(x => x.S_AREA_CODE == od.S_ROW);
+ //鏌ヨ鍙敤璐т綅鏈夊灏�+ List<string> Ky = new List<string>() { "鏃�, "鍑哄簱閿�, "鍏ュ簱閿� };
+ var loclistK = loclist.FindAll(x => Ky.Contains(x.S_LOCK_STATE)).Count();
+ var count = loclist.FindAll(x => x.N_CURRENT_NUM > 0 && x.S_LOCK_STATE == "鏃�).Count();
+ LogHelper.Info("AutoRun13TSJ" + $"od.S_ROW 鍑哄簱浣欓噺鍒ゆ柇鏄惁闇�杞繍銆�{count}< 鎬诲叡鑳界敤鐨勮揣浣嶆暟{loclistK} -7");
+ if (count <= loclistK - 7)
+ {
+ LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}瀵瑰簲宸ュ崟鐨剓od.S_ROW} 鐗╂枡鏁伴噺涓嶈冻銆傝Е鍙戣浆杩愩�");
+ // 鍏堢湅鏄惁鏈夊埌璇ュ簱鍖虹殑杞繍浠诲姟銆�
+ var zxs = LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "鎵ц" && X.S_END_AREA == od.S_ROW).ToList();
+ //鏌ヨ鏄惁鏈夐噸澶嶇殑宸ュ崟鍦ㄦ墽琛�+ var ggf = zxs.Find(x => x.S_ITEM_CODE == od.SQL_ItemCode && x.S_ITEM_NAME == od.SQL_ItemName);
+ if (ggf != null)
+ {
+ LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}宸茬粡瀛樺湪杞繍浜嗘棤闇�Е鍙戣浆杩愩�");
+ continue;
+ }
+ //1.鏌ョ湅鐗╂枡鏄惁鍖归厤銆�+ //var itemTRUN = zxs.Any(x => x.S_ITEM_CODE == od.SQL_ItemCode && x.S_ITEM_NAME == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME);
+ //if (itemTRUN)
+ //{ //鏈夊埌璇ュ簱鍖虹殑 鐗╂枡杞繍浠诲姟浜嗐� 涓嶉渶瑕佺户缁簡 銆�+
+ // LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}宸茬粡瀛樺湪杞繍浜嗘棤闇�Е鍙戣浆杩愩�");
+ // return;
+ //}
+ //浜哄伐杞繍娌℃寚瀹氱墿鏂欙紝鎴戜細鑷姩鍐欏洖杞繍鍗�鐗╂枡鏁版嵁銆�+
+ //鎵綜D 鍖�鍝噷鏈夎繖涓墿鏂欍�
+ Dictitems TrunStart = new Dictitems();
+ foreach (var area in CDlist)
+ {
+ //var ca = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
+
+ //ca.And((o, p, t) => o.S_AREA_CODE == area && o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "鏃� && t.S_ITEM_CODE == od.SQL_ItemCode && t.S_ITEM_NAME == od.SQL_ItemName && t.S_CJ_NAME == od.S_CJ_NAME);
+ var lstCanOutL = newDb.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((o, p, t) => o.S_AREA_CODE == area && o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "鏃� && t.S_ITEM_CODE == od.SQL_ItemCode && t.S_ITEM_NAME == od.SQL_ItemName && t.S_CJ_NAME == od.S_CJ_NAME).ToList();
+ if (!lstCanOutL.Any())
+ {
+ lstCanOutL = newDb.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((o, p, t) => o.S_AREA_CODE == area && o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "鏃� && t.S_ITEM_CODE == od.SQL_ItemCode && t.S_ITEM_NAME == od.SQL_ItemName).ToList();
+ }
+ //List<string> CRk = new List<string>() { "鍑哄簱閿�, "鍏ュ簱閿� };
+ //var EndMum = newDb.Queryable<Location>().Where(l => l.S_AREA_CODE == area && CRk.Contains(l.S_LOCK_STATE)).ToList();
+ //var RowLock = EndMum.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
+ //foreach (var item in RowLock)
+ //{
+ // lstCanOutL.RemoveAll(e => e.N_ROW == item.N_ROW);
+ //}
+ if (lstCanOutL.Count() > 0)
+ {
+ //var LstCan = newDb.Queryable<LocCntrRel>().Where(a => lstCanOutL.Select(e => e.S_LOC_CODE).ToList().Contains(a.S_LOC_CODE)).ToList();
+ var loc = lstCanOutL.OrderBy(e => e.T_FULL_TIME).FirstOrDefault();
+ TrunStart.area = area;
+ TrunStart.Row = loc.N_ROW;
+ }
+ //if (dsi.TryGetValue(area, out var dictitems1))
+ //{
+
+ // var arearowsloc = LocationHelper.GetAreaNormalLocList(area);
+ // 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 (arearowsloc.Exists(x => x.N_ROW == d.Row))
+ // {
+ // TrunStart = d;
+ // break;
+ // }
+ // }
+ //}
+ }
+ LogHelper.Info($"ZdzyABArea{od.SQL_WorkNo}瑙﹀彂杞繍銆傝浆杩愭潵婧愭槸{JsonConvert.SerializeObject(TrunStart)}");
+ if (TrunStart?.area != null)
+ {
+ var ggft = new YWLZXtake()
+ {
+ SQL_WorkNo = "CKD" + DateTime.Now.Ticks.ToString(),
+ S_START_AREA = TrunStart.area,
+ N_START_ROW = TrunStart.Row,
+ S_END_AREA = od.S_ROW,
+ S_ZX_STATE = "鎵ц",
+ S_ITEM_CODE = od.SQL_ItemCode,
+ S_ITEM_NAME = od.SQL_ItemName,
+ S_CJ_NAME = od.S_CJ_NAME,
+ S_ZZ_AREA = (od.S_ROW == "YWLAQWJ" ? "YWLWJJB" : od.S_ROW)
+ };
+ var gf = newDb.Insertable(ggft).ExecuteCommand();
+ }
+ }
+ }
+ }
+ }
+
+
+ }
+ catch (Exception ex)
+ {
+
+ LogHelper.Info($"ZdzyABArea 瑙﹀彂杞繍 鎶ラ敊:{ex.Message}");
+ }
+ }
+
/// <summary>
/// 鍘熺墿鏂欑焊绠卞嚭搴� /// </summary>
public static void AutoRun13TSJ()
{
- Action<YWLWorkOrder> _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ = (od) =>
- {
- LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}瀵瑰簲宸ュ崟鐨剓od.S_ROW} 鐗╂枡鏁伴噺涓嶈冻銆傝Е鍙戣浆杩愩�");
- // 鍏堢湅鏄惁鏈夊埌璇ュ簱鍖虹殑杞繍浠诲姟銆�
- var zxs = LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "鎵ц" && X.S_END_AREA == od.S_ROW);
- //1.鏌ョ湅鐗╂枡鏄惁鍖归厤銆�- var itemTRUN = zxs.Any(x => x.S_ITEM_CODE == od.SQL_ItemCode && x.S_ITEM_NAME == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME);
- if (itemTRUN)
- { //鏈夊埌璇ュ簱鍖虹殑 鐗╂枡杞繍浠诲姟浜嗐� 涓嶉渶瑕佺户缁簡 銆�+ //Action<YWLWorkOrder> _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ = (od) =>
+ //{
+ // LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}瀵瑰簲宸ュ崟鐨剓od.S_ROW} 鐗╂枡鏁伴噺涓嶈冻銆傝Е鍙戣浆杩愩�");
+ // // 鍏堢湅鏄惁鏈夊埌璇ュ簱鍖虹殑杞繍浠诲姟銆�
+ // var zxs = LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "鎵ц" && X.S_END_AREA == od.S_ROW);
+ // //1.鏌ョ湅鐗╂枡鏄惁鍖归厤銆�+ // var itemTRUN = zxs.Any(x => x.S_ITEM_CODE == od.SQL_ItemCode && x.S_ITEM_NAME == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME);
+ // if (itemTRUN)
+ // { //鏈夊埌璇ュ簱鍖虹殑 鐗╂枡杞繍浠诲姟浜嗐� 涓嶉渶瑕佺户缁簡 銆�
- LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}宸茬粡瀛樺湪杞繍浜嗘棤闇�Е鍙戣浆杩愩�");
- return;
- }
- //浜哄伐杞繍娌℃寚瀹氱墿鏂欙紝鎴戜細鑷姩鍐欏洖杞繍鍗�鐗╂枡鏁版嵁銆�+ // LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}宸茬粡瀛樺湪杞繍浜嗘棤闇�Е鍙戣浆杩愩�");
+ // return;
+ // }
+ // //浜哄伐杞繍娌℃寚瀹氱墿鏂欙紝鎴戜細鑷姩鍐欏洖杞繍鍗�鐗╂枡鏁版嵁銆�
- //鎵綜D 鍖�鍝噷鏈夎繖涓墿鏂欍�
- Dictitems TrunStart = null;
- foreach (var area in CDlist)
- {
- if (dsi.TryGetValue(area, out var dictitems1))
- {
- var arearowsloc = LocationHelper.GetAreaNormalLocList(area);
- 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 (arearowsloc.Exists(x => x.N_ROW == d.Row))
- {
- TrunStart = d;
- break;
- }
- }
- }
- }
+ // //鎵綜D 鍖�鍝噷鏈夎繖涓墿鏂欍�
+ // Dictitems TrunStart = null;
+ // foreach (var area in CDlist)
+ // {
+ // if (dsi.TryGetValue(area, out var dictitems1))
+ // {
+ // var arearowsloc = LocationHelper.GetAreaNormalLocList(area);
+ // 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 (arearowsloc.Exists(x => x.N_ROW == d.Row))
+ // {
+ // TrunStart = d;
+ // break;
+ // }
+ // }
+ // }
+ // }
- LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}瑙﹀彂杞繍銆傝浆杩愭潵婧愭槸{JsonConvert.SerializeObject(TrunStart)}");
- if (TrunStart != null)
- WCSHelper.Do(db =>
- {
- db.Insertable(new YWLZXtake
- {
- S_START_AREA = TrunStart.area,
- N_START_ROW = TrunStart.Row,
- S_END_AREA = od.S_ROW,
- S_ZX_STATE = "鎵ц",
- S_ITEM_CODE = od.SQL_ItemCode,
- S_ITEM_NAME = od.SQL_ItemName,
- S_CJ_NAME = od.S_CJ_NAME,
- S_ZZ_AREA = (od.S_ROW == "YWLAQWJ" ? "YWLWJJB" : od.S_ROW)
- }).ExecuteCommand();
- });
- };
-
- //var TaskSiggg = Settings.GetTimeStamp();
- //var list = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
- //var WorkOrder = new List<YWLWorkOrder>();
+ // LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}瑙﹀彂杞繍銆傝浆杩愭潵婧愭槸{JsonConvert.SerializeObject(TrunStart)}");
+ // if (TrunStart != null)
+ // WCSHelper.Do(db =>
+ // {
+ // db.Insertable(new YWLZXtake
+ // {
+ // S_START_AREA = TrunStart.area,
+ // N_START_ROW = TrunStart.Row,
+ // S_END_AREA = od.S_ROW,
+ // S_ZX_STATE = "鎵ц",
+ // S_ITEM_CODE = od.SQL_ItemCode,
+ // S_ITEM_NAME = od.SQL_ItemName,
+ // S_CJ_NAME = od.S_CJ_NAME,
+ // S_ZZ_AREA = (od.S_ROW == "YWLAQWJ" ? "YWLWJJB" : od.S_ROW)
+ // }).ExecuteCommand();
+ // });
+ //};
foreach (var PLC in Settings.GetDeviceInfoList().FindAll(X => X.deviceType == 13 && X.enable == 1))
{
string pline = PLC.deviceName;
@@ -3661,34 +4585,6 @@
if (locs.Find(x => x.N_CURRENT_NUM > 0) != null) //鎷嗗灈鏈夎揣 涓嶅垽鏂� continue;
can = true;
-
- //var source1 = orkOrd.FirstOrDefault();
- //foreach (var item in list)
- //{
- // YWLWorkOrder source = new YWLWorkOrder();
- // 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);
- //}
}
orkOrd = orkOrd.FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10);
@@ -3699,18 +4595,21 @@
{
var l2 = new List<string>() { "YWLAQWJ", "YWLBQWJ" };//, "YWLCQSX", "YWLDQWJ" };
l2.Remove(od.S_ROW);
- l2.Remove(od.TagOver);
- var odsr = new List<string> { od.TagOver, od.S_ROW }.Concat(l2).Distinct().ToList();
+ //l2.Remove(od.TagOver);
+ //var odsr = new List<string> { od.TagOver, od.S_ROW }.Concat(l2).Distinct().ToList();
+ var odsr = new List<string> { od.S_ROW }.Concat(l2).Distinct().ToList();
///姹囨�浠撳簱閲屾渶澶у眰鏄嚑灞傘�
Dictitems Lart = null;
foreach (var area in odsr)//od.S_ROW.Split('$'))
{
- if (string.IsNullOrEmpty(area)) continue;
-
+ if (string.IsNullOrEmpty(area))
+ {
+ continue;
+ }
if (dsi.TryGetValue(area, out var dictitems1))
{
- 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))
+ foreach (var d in dictitems1.FindAll(x => x.ItemCode == od.SQL_ItemCode && x.ItemName == od.SQL_ItemName))
{
if (Lart == null)
Lart = d;
@@ -3736,29 +4635,77 @@
foreach (var area in v) //.Concat(od.S_ROW.Split('$')).Distinct())
{
- var AreaRowlist = LocationHelper.GetAreaNormalLocList(area);
- foreach (var item in AreaRowlist.GroupBy(x => x.N_ROW))
+ if (ABlist.Contains(area))
{
- var rl = item.ToList().FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
- if (rl == null) continue;
- _clrel = LocationHelper.GetLocCntrRel(rl.S_LOC_CODE);
- //鏉垮瀷鐩稿悓
- var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).First();
- LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆� + JsonConvert.SerializeObject(_clrel0));
- var _clcntitem = ContainerHelper.GetCntrItemRel(_clrel0.S_CNTR_CODE.Trim()).FirstOrDefault();
- LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
- if (_clcntitem != null)
+ //AreaRowlist = LocationHelper.GetAreaNormalLocList(area);YWLBQWJ
+ // var AreaRowlist = LocationHelper.GetAreaNormalLocList("YWLAQWJ").Union(LocationHelper.GetAreaNormalLocList("YWLBQWJ")).ToList();
+ var db = new SqlHelper<object>().GetInstance();
+ 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 == od.SQL_ItemCode && t.S_ITEM_NAME == od.SQL_ItemName && (o.S_AREA_CODE == "YWLAQWJ" || o.S_AREA_CODE == "YWLBQWJ"));
+ 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)
{
- LogHelper.Info("AutoRun13TSJ" + "鐩镐簰鏄惁鍖归厤 _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 + "缁撴灉:" + (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName && _clcntitem.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)
+ var rl = lstCanOutL.OrderBy(e => e.T_FULL_TIME).FirstOrDefault();
+ _clrel = LocationHelper.GetLocCntrRel(rl.S_LOC_CODE);
+ //鏉垮瀷鐩稿悓
+ var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).First();
+ if (rl != null)
{
StartBit = rl;
- break;
+ }
+ }
+ else
+ {
+ LogHelper.Info($"AutoRun13TSJ 鏈哄彴:{pline} 鐗╂枡缂栫爜:{od.SQL_ItemCode}鐗╂枡鍚嶇О:{od.SQL_ItemName} AB鍖虹己鏂�);
+ }
+
+
+ //if (rl == null) continue;
+ //_clrel = LocationHelper.GetLocCntrRel(rl.S_LOC_CODE);
+ ////鏉垮瀷鐩稿悓
+ //var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).First();
+ //LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆� + JsonConvert.SerializeObject(_clrel0));
+ //var _clcntitem = ContainerHelper.GetCntrItemRel(_clrel0.S_CNTR_CODE.Trim()).FirstOrDefault();
+ //LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
+ //if (_clcntitem != null)
+ //{
+ // LogHelper.Info("AutoRun13TSJ" + "鐩镐簰鏄惁鍖归厤 _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 + "缁撴灉:" + (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName && _clcntitem.S_CJ_NAME == od.S_CJ_NAME));
+ // if (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName)
+ // {
+ // StartBit = rl;
+ // break;
+ // }
+ //}
+
+ }
+ else
+ {
+ var AreaRowlist = LocationHelper.GetAreaNormalLocList(area);
+ foreach (var item in AreaRowlist.GroupBy(x => x.N_ROW))
+ {
+ var rl = item.ToList().FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
+ if (rl == null) continue;
+ _clrel = LocationHelper.GetLocCntrRel(rl.S_LOC_CODE);
+ //鏉垮瀷鐩稿悓
+ var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).First();
+ LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆� + JsonConvert.SerializeObject(_clrel0));
+ var _clcntitem = ContainerHelper.GetCntrItemRel(_clrel0.S_CNTR_CODE.Trim()).FirstOrDefault();
+ LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
+ if (_clcntitem != null)
+ {
+ LogHelper.Info("AutoRun13TSJ" + "鐩镐簰鏄惁鍖归厤 _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 + "缁撴灉:" + (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName && _clcntitem.S_CJ_NAME == od.S_CJ_NAME));
+ if (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName)
+ {
+ StartBit = rl;
+ break;
+ }
}
}
}
if (StartBit != null)
+ {
break;
+ }
}
if (StartBit == null)
{
@@ -3771,15 +4718,18 @@
//妫�祴鎸囧畾搴撳尯鐨勭墿鏂欐帓鎬绘暟閲� if (dsi.TryGetValue(od.S_ROW, out var dictitems1))
{
- var rows = dictitems1.Select(x => x.Row).Distinct();
- var loclist = LocationHelper.GetLocList(x => x.S_AREA_CODE == od.S_ROW && rows.Contains(x.N_ROW));
- var count = loclist.FindAll(x => x.N_CURRENT_NUM > 0 && x.S_LOCK_STATE == "鏃�).Sum(x => x.N_CURRENT_NUM);
- LogHelper.Info("AutoRun13TSJ" + $"od.S_ROW 鍑哄簱浣欓噺鍒ゆ柇鏄惁闇�杞繍銆�{count}< 5");
- if (count < 5)
- {
- autoTurn = true;
- _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ(od);
- }
+ //var rows = dictitems1.Select(x => x.Row).Distinct();
+ //var loclist = LocationHelper.GetLocList(x => x.S_AREA_CODE == od.S_ROW && rows.Contains(x.N_ROW));
+ ////鏌ヨ鍙敤璐т綅鏈夊灏�+ //List<string> Ky = new List<string>() { "鏃�, "鍑哄簱閿�, "鍏ュ簱閿� };
+ //var loclistK = loclist.FindAll(x => Ky.Contains(x.S_LOCK_STATE)).Count();
+ //var count = loclist.FindAll(x => x.N_CURRENT_NUM > 0 && x.S_LOCK_STATE == "鏃�).Sum(x => x.N_CURRENT_NUM);
+ //LogHelper.Info("AutoRun13TSJ" + $"od.S_ROW 鍑哄簱浣欓噺鍒ゆ柇鏄惁闇�杞繍銆�{count}< 鎬诲叡鑳界敤鐨勮揣浣嶆暟{loclistK} -7");
+ //if (count < loclistK - 7)
+ //{
+ // autoTurn = true;
+ // _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ(od);
+ //}
}
}
Location Endbit = null;
@@ -3823,10 +4773,21 @@
b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, jbbit, "鍘熺墿鏂欐惉杩�绾哥", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri, "", Endbit.S_LOC_CODE);
else
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);
+
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();
+ od.TagOverTime = DateTime.Now;
+ od.TagOver = StartBit.S_AREA_CODE;
+ 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 };
+
//缁欑粓鐐归攣瀹氫綇
if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ")
{
@@ -3847,9 +4808,7 @@
// }
//}
//else db.Insertable(r).ExecuteCommand();
- od.TagOverTime = DateTime.Now;
- od.TagOver = StartBit.S_AREA_CODE;
- db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.TagOver }).ExecuteCommand();
+
//break;
}
}
@@ -3860,10 +4819,10 @@
}
}
}
- else
- {
- _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ(od);
- }
+ //else
+ //{
+ // _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ(od);
+ //}
}
}
}
@@ -3892,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);
@@ -3916,6 +4876,11 @@
if (dsi.TryGetValue(area, out dictitems))
{
var ill = dictitems.Find(x => x.Row == rl.N_ROW && x.ItemCode == _clcntitem.S_ITEM_CODE && x.ItemName == _clcntitem.S_ITEM_NAME && _clcntitem.S_CJ_NAME == x.S_CJ_NAME);
+ if (ill == null)
+ {
+ ill = dictitems.Find(x => x.Row == rl.N_ROW && x.ItemCode == _clcntitem.S_ITEM_CODE && x.ItemName == _clcntitem.S_ITEM_NAME);
+ }
+
if (ill != null)
{
if (rl.N_CURRENT_NUM > ill.ItemLayer)
@@ -3957,6 +4922,29 @@
LogHelper.Info($"AutoRunABD abcd鐗╂枡姹囨�瀹屾垚 >>{ReadCCK}|| {dsi.Count}");
}
+ /// <summary>
+ /// 鏍煎紡鍖栧唴瀛樻帓閿�+ /// </summary>
+ public static void Qchc()
+ {
+ try
+ {
+ LogHelper.Info($"鍐呭瓨涓殑鎺掗攣琛ㄤ腑鐨勬暟鎹� + $"{JsonConvert.SerializeObject(RGRow)}");
+ if (RGRow.Count() > 0)
+ {
+ var locs = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == "YWLRGDD" && x.S_LOCK_STATE == "鍑哄簱閿�).ToList();
+ if (locs.Count() == 0)
+ {
+ RGRow = new List<RowLock>();
+ LogHelper.Info($"鏍煎紡鍖栧唴瀛樹腑鐨勬帓閿� + $"{JsonConvert.SerializeObject(RGRow)}");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Info($"鏍煎紡鍖栧唴瀛樹腑鐨勬帓閿�澶辫触" + $"{ex.Message}");
+ }
+ }
public static void chargeCCD()
{
var ods = LocationHelper.GetList<YWLWorkOrder>(x => x.WorkType == 2 && x.SQL_State == "鎵ц涓�);
@@ -4023,11 +5011,26 @@
/// </summary>
internal static void YWL_ZX_Turn()
{
+ var dbcd = new SqlHelper<object>().GetInstance();
+
foreach (var ODs in LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "鎵ц").GroupBy(x => x.S_START_AREA))
{
var locS = LocationHelper.GetAreaNormalLocList(ODs.Key);
foreach (var od in ODs)
{
+ if (od.S_END_AREA == "YWLBQWJ" || od.S_END_AREA == "YWLAQWJ")//鍒癇鍖虹殑绉诲簱宸ュ崟鏈�鍙兘鐢熸垚涓ゆ潯浠诲姟
+ {
+
+ //鏌ヨ浠诲姟鏁�
+ 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;
+ }
+ }
LogHelper.Info($"YWL_ZX_Turn from{od.S_START_AREA} mid:{od.S_ZZ_AREA} to{od.S_END_AREA} 寮� 銆嬨�銆�);
if (string.IsNullOrEmpty(od.S_ZZ_AREA) && string.IsNullOrEmpty(od.S_END_AREA))
{
@@ -4045,6 +5048,26 @@
}
else
{
+ if (od.N_END_ROW > 0)
+ {
+ var EndRow = dbcd.Queryable<Location>().Where(l => l.S_AREA_CODE == od.S_END_AREA && l.N_ROW == od.N_END_ROW && l.N_CURRENT_NUM == 0).ToList();
+ if (EndRow.Count() == 0)
+ {
+ //缃负瀹屾垚銆�
+ od.S_ZX_STATE = "瀹屾垚";
+ WCSHelper.Do(db => db.Updateable(od).UpdateColumns(x => new { x.S_ZX_STATE }).ExecuteCommand());
+ }
+ }
+ else
+ {
+ var EndRow = dbcd.Queryable<Location>().Where(l => l.S_AREA_CODE == od.S_END_AREA && l.N_CURRENT_NUM == 0).ToList();
+ if (EndRow.Count() == 0)
+ {
+ //缃负瀹屾垚銆�
+ od.S_ZX_STATE = "瀹屾垚";
+ WCSHelper.Do(db => db.Updateable(od).UpdateColumns(x => new { x.S_ZX_STATE }).ExecuteCommand());
+ }
+ }
var lastful = rows.FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
if (lastful != null)
{
@@ -4075,27 +5098,52 @@
string nextarea = !string.IsNullOrEmpty(od.S_ZZ_AREA) ? od.S_ZZ_AREA : od.S_END_AREA;
var zzlocs = LocationHelper.GetAreaNormalLocList(nextarea);
Location Endbit = null;
- foreach (var zzrs in zzlocs.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
+ if (od.N_END_ROW == 0 && zzlocs.Any())
{
- var zzrloclist = zzrs.ToList();
- var _cl2 = zzrloclist.FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
- if (_cl2 != null)
+ foreach (var zzrs in zzlocs.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
{
- var rel = LocationHelper.GetLocCntrRel(_cl2.S_LOC_CODE);
- 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 && cntrrel.S_CJ_NAME == cir1.S_CJ_NAME)
+ var zzrloclist = zzrs.ToList();
+ var _cl2 = zzrloclist.FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
+ if (_cl2 != null)
{
+ var rel = LocationHelper.GetLocCntrRel(_cl2.S_LOC_CODE);
+ 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 && cntrrel.S_CJ_NAME == cir1.S_CJ_NAME)
+ {
+ Endbit = zzrloclist.Find(x => x.N_COL > (_cl2?.N_COL ?? 0));
+ }
+ }
+ else
Endbit = zzrloclist.Find(x => x.N_COL > (_cl2?.N_COL ?? 0));
+ if (Endbit != null)
+ {
+ LogHelper.Info($"鍏ヤ腑杞尯{nextarea}浣跨敤{Endbit.S_LOC_CODE}");
+ break;
}
}
- else
- Endbit = zzrloclist.Find(x => x.N_COL > (_cl2?.N_COL ?? 0));
- if (Endbit != null)
+ }
+ else
+ {
+ if (zzlocs.Any() && od.N_END_ROW > 0)//鐢ㄤ簬搴撳唴 姣斿A搴撴煇鎺掔Щ鍒癆搴撶殑鍙︿竴鎺� {
- LogHelper.Info($"鍏ヤ腑杞尯{nextarea}浣跨敤{Endbit.S_LOC_CODE}");
- break;
+ if (ABlist.Contains(od.S_END_AREA))
+ {
+ continue;
+ }
+ zzlocs = zzlocs.FindAll(e => e.N_ROW == od.N_END_ROW);
+ //
+ var EndMt = dbcd.Queryable<Location>().Where(l => l.S_AREA_CODE == od.S_END_AREA && l.N_ROW == od.N_END_ROW && l.N_CURRENT_NUM > 0).ToList();
+ if (EndMt.Any())
+ {
+ var ggh = EndMt.OrderByDescending(e => e.N_COL).FirstOrDefault();
+ zzlocs = zzlocs.FindAll(e => e.N_COL > ggh.N_COL).ToList();
+ }
+ if (zzlocs.Any())
+ {
+ Endbit = zzlocs.OrderBy(e => e.N_COL).FirstOrDefault();
+ }
}
}
LogHelper.Info($"YWL_ZX_Turn from{od.S_START_AREA} mid:{od.S_ZZ_AREA} to{od.S_END_AREA} 鎵惧埌绉诲簱缁堢偣銆媨Endbit?.S_LOC_CODE}");
@@ -4110,6 +5158,7 @@
}
}
}
+
}
}
}
--
Gitblit v1.9.1