From 8bc688f992f70815084e958a728a696871294672 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期二, 01 七月 2025 15:51:50 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi
---
HH.WCS.QingXiNongfu/core/Monitor.cs | 131 ++++++++++++++++++++-----------------------
1 files changed, 61 insertions(+), 70 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index c825c89..ec2cd39 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -430,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)
//{
@@ -1135,6 +1139,17 @@
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();
@@ -1230,12 +1245,19 @@
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 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();
if (EndMum.Count() > 0)
{
- arloclist = arloclist.FindAll(x => lstCanOutL.Select(e => e.N_ROW).ToList().Contains(x.N_ROW)).ToList();
+ if (lstCanOutL.Count() <= EndMum.Count())
+ {
+ arloclist = arloclist.FindAll(x => lstCanOutL.Select(e => e.N_ROW).ToList().Contains(x.N_ROW)).ToList();
+ }
}
}
}
@@ -1487,7 +1509,6 @@
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 == "鏃�)
{
@@ -2128,7 +2149,6 @@
}
}
-
/// <summary>
/// 鍏ュ簱閫�簱銆�鐭ラ亾 闆跺ご婊℃墭銆傛甯稿尮閰嶃�
/// </summary>
@@ -2139,15 +2159,14 @@
private static void YwlPETK_CreInwork(List<locCntItem> klocsFirst, string v, string v2, int v1 = 3)
{
bool ord = v2.Contains("鎻愭墸");
- var chi = new SqlHelper<object>().GetInstance();
- var newDb = chi.CopyNew();
- var yx = klocsFirst.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).ToList();
- foreach (var ptR in klocsFirst.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).ToList())
+ 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);
@@ -2159,83 +2178,55 @@
{
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));
+ 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().ToList();
+ 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
- {
- if (hasNum.Any())
- {
- //鏈夌浉鍚岀墿鏂�鐩稿悓鏍囩鐨勭户缁叆
- List<Location> lstCanOutL = new List<Location>();
- if (!string.IsNullOrEmpty(rsfull.S_BATCH_NO))
- {
- 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 == v && o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "鏃� && hasNum.Contains(o.N_ROW) && t.S_ITEM_CODE == rsfull.S_ITEM_CODE && t.S_ITEM_NAME == rsfull.S_ITEM_NAME && t.S_BATCH_NO == rsfull.S_BATCH_NO).ToList();
-
- }
- else
- {
- 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 == v && o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "鏃� && hasNum.Contains(o.N_ROW) && t.S_ITEM_CODE == rsfull.S_ITEM_CODE && t.S_ITEM_NAME == rsfull.S_ITEM_NAME && string.IsNullOrEmpty(t.S_BATCH_NO)).ToList();
- }
- if (lstCanOutL.Any())
- {
- var loclist1 = NormalList.FindAll(x => lstCanOutL.Select(f => f.N_ROW).Distinct().ToList().Contains(x.N_ROW));
- 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 < Math.Min(x.N_CAPACITY, v1) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0));
- if (EndBit != null)
- break;
- }
- }
- }
- }
}
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();
- // // }
- // //}
- //}
+ 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();
+ // }
+ //}
+ }
}
Thread.Sleep(1000);
}
}
}
+
private static void YwlBQ_CreSXOutOrder(Settings.deviceInfo plc, List<YWLWorkOrder> yuworders)
{
//LogHelper.Info($"{plc.deviceName}-鏍囩 {yuworders.FirstOrDefault()?.SQL_WorkNo}");
--
Gitblit v1.9.1