From 680743106a8f1f540a4417afdf1947039c52f2f1 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期六, 21 六月 2025 16:17:29 +0800
Subject: [PATCH] 清溪。
---
HH.WCS.QingXiNongfu/core/Monitor.cs | 151 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 125 insertions(+), 26 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 7a90c6f..d7867b5 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -8,6 +8,7 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using System.Web.UI.WebControls.WebParts;
namespace HH.WCS.QingXigongchang.core
{
@@ -1308,7 +1309,7 @@
{
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 => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
+ 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())
{
YwlBQ_CreInwork(locsFirst, WJ_BQ.RK_BQDDQ, WJ_BQ.RK_BBHJQ);
@@ -1316,7 +1317,7 @@
else
{
LogHelper.Info($" 鏃犺弻鍑哄簱 宸ュ崟寮�惎涓�");
- // 鏍囩鍑哄簱銆傝揣鏋剁洿鎺ュ嚭鍒扮嚎杈�+ // 鏍囩鍑哄簱銆傝揣鏋剁洿鎺ュ嚭鍒扮嚎杈� YwlBQ_CreWJOutOrder();
}
@@ -1335,7 +1336,7 @@
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 => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
+ 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 == "鎵ц涓�);
@@ -1496,7 +1497,7 @@
//YwlPETKOutOrder("YWLTKMKQ", "", "PE鍙夎繍");// PE灏忓嚭搴� {
LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛�);
- var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2鎻愬崌鏈�鏀剁缉鑶� && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
+ var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2鎻愬崌鏈�鏀剁缉鑶� && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
if (!yuworders.Any())
{
LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛佹病鏈夊嚭搴撳崟銆�);
@@ -2179,6 +2180,7 @@
//LogHelper.Info($"{plc.deviceName}-鏍囩{tagLoc.S_LOC_CODE}//{DeviceProcess.doorStatus[ploc]?.info}-----{(!string.IsNullOrEmpty(ploc) && plc != null && DeviceProcess.doorStatus[ploc]?.info == "1")}");
if (tagLoc != null)
{
+ // 杩欓噷閮芥槸1灞傜殑锛屾墍浠ュ繀璧� current_num =1
if (tagLoc.N_LAYER == 1 || tagLoc.N_CURRENT_NUM == 1)
{
// 鐩存帴鍑烘彁鍗囨満浣�@@ -2610,7 +2612,7 @@
}
///绗竴娈碉細鍑哄簱 -鍒版媶鍨涙垨鑰�鎺ラ┏銆�- var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
+ 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:
@@ -3556,7 +3558,10 @@
public string area { get; set; }
- public string Row { get; set; }
+ /// <summary>
+ /// 鎺�+ /// </summary>
+ public int Row { get; set; }
}
/// <summary>
@@ -3564,7 +3569,60 @@
/// </summary>
public static void AutoRun13TSJ()
{
- var list = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
+
+ 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;
+ }
+ //浜哄伐杞繍娌℃寚瀹氱墿鏂欙紝鎴戜細鑷姩鍐欏洖杞繍鍗�鐗╂枡鏁版嵁銆�+
+ //鎵綜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>();
foreach (var PLC in Settings.GetDeviceInfoList().FindAll(X => X.deviceType == 13 && X.enable == 1))
{
@@ -3619,13 +3677,17 @@
foreach (var od in orkOrd.OrderBy(x => x.TagOverTime).ThenBy(x => x.OutNum))
//foreach (var od in od2.ToList())
{
- var l2 = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
+ var l2 = new List<string>() { "YWLAQWJ", "YWLBQWJ" };//, "YWLCQSX", "YWLDQWJ" };
l2.Remove(od.S_ROW);
- var odsr = new List<string> { 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();
+
///姹囨�浠撳簱閲屾渶澶у眰鏄嚑灞傘�
Dictitems Lart = null;
foreach (var area in odsr)//od.S_ROW.Split('$'))
{
+ 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))
@@ -3638,13 +3700,14 @@
Lart = d;
}
}
-
}
}
-
+ //绛変笅瑕佹娴嬶紝濡傛灉娌℃湁鍙敤鎺掞紝鎴栬�AB搴撳尯鍐呯墿鏂欐暟<5 灏辫浠嶤D 寮�杞繍銆�+ var autoTurn = false;
LogHelper.Info($"AutoRun13TSJ 绛涢�鐗╂枡 搴撳尯鎺掓暟鎹� {od.SQL_PLineNo} >>{od.OutNum}> {JsonConvert.SerializeObject(Lart)}");
// 闇�鏁伴噺 >= 浠撳簱鏈�ぇ鏁伴噺銆�灏卞紑濮嬪嚭搴撱�
if (Lart != null)
+ {
if (od.OutNum >= Lart?.ItemLayer)
{
var v = new List<string>() { Lart.area };
@@ -3661,15 +3724,14 @@
_clrel = LocationHelper.GetLocCntrRel(rl.S_LOC_CODE);
//鏉垮瀷鐩稿悓
var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).First();
- LogHelper.Info(rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆� + JsonConvert.SerializeObject(_clrel0));
+ LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆� + JsonConvert.SerializeObject(_clrel0));
var _clcntitem = ContainerHelper.GetCntrItemRel(_clrel0.S_CNTR_CODE.Trim()).FirstOrDefault();
- LogHelper.Info(rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
+ LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
if (_clcntitem != null)
{
- LogHelper.Info("鐩镐簰鏄惁鍖归厤 _clcntitem S_ITEM_CODE:" + _clcntitem.S_ITEM_CODE + " od" + od.SQL_ItemCode + " _clcntitem S_ITEM_NAME:" + _clcntitem.S_ITEM_NAME + "od: " + od.SQL_ItemName + " od.S_CJ_NAME:" + od.S_CJ_NAME);
+ 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)
{
-
StartBit = rl;
break;
}
@@ -3680,18 +3742,40 @@
}
if (StartBit == null)
{
- LogHelper.Info($"{od.SQL_PLineNo} 鍑哄簱 {Lart.area}鍖哄煙娌℃湁鐗╂枡鍙敤璧风偣");
+ autoTurn = true;
+ LogHelper.Info("AutoRun13TSJ" + $"{od.SQL_PLineNo} 鍑哄簱 {Lart.area}鍖哄煙娌℃湁鐗╂枡鍙敤璧风偣");
continue;
+ }
+ else
+ {
+ //妫�祴鎸囧畾搴撳尯鐨勭墿鏂欐帓鎬绘暟閲�+ 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);
+ }
+ }
}
Location Endbit = null;
var loc = LocationHelper.GetLoc(PLC.location[0]);
- if (loc?.N_CURRENT_NUM == 0 && StartBit.N_CURRENT_NUM == 1 && DeviceProcess.doorStatus.ContainsKey(PLC.location[0]))
+ if (StartBit.N_CURRENT_NUM == 1)
{
- if (DeviceProcess.doorStatus[PLC.location[0]].info == "1")
+ if (loc?.N_CURRENT_NUM == 0 && DeviceProcess.doorStatus.ContainsKey(PLC.location[0]))
{
- Endbit = LocationHelper.GetLoc(PLC.location[0]);
+ if (DeviceProcess.doorStatus[PLC.location[0]].info == "1")
+ {
+ Endbit = LocationHelper.GetLoc(PLC.location[0]);
+ }
}
+ if (Endbit == null)
+ break;
}
else
{
@@ -3702,7 +3786,7 @@
{
var crs = _clrel.Select(x => x.S_CNTR_CODE).ToList();
var jbbit = "";
- if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ")
+ if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ" || Endbit.S_AREA_CODE == "YWLDQWJ" || Endbit.S_AREA_CODE == "YWLCQSX")
{
var locs1 = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == "YWLWJJB" && x.S_LOCK_STATE != "鎶ュ簾" && x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM == 0).ToList();
if (locs1.Count() > 0)
@@ -3717,7 +3801,8 @@
var b = false;
if (!string.IsNullOrEmpty(jbbit))
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);
+ 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 };
@@ -3743,7 +3828,8 @@
//}
//else db.Insertable(r).ExecuteCommand();
od.TagOverTime = DateTime.Now;
- db.Updateable(od).UpdateColumns(it => new { it.TagOverTime }).ExecuteCommand();
+ od.TagOver = StartBit.S_AREA_CODE;
+ db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.TagOver }).ExecuteCommand();
//break;
}
}
@@ -3753,6 +3839,11 @@
continue;
}
}
+ }
+ else
+ {
+ _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ(od);
+ }
}
}
}
@@ -3804,14 +3895,14 @@
{
if (dsi.TryGetValue(area, out dictitems))
{
- var ill = dictitems.Find(x => x.ItemCode == _clcntitem.S_ITEM_CODE && x.ItemName == _clcntitem.S_ITEM_NAME && _clcntitem.S_CJ_NAME == x.S_CJ_NAME);
+ 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)
{
if (rl.N_CURRENT_NUM > ill.ItemLayer)
{
ill.ItemLayer = rl.N_CURRENT_NUM;
ill.area = area;
- ill.Row = $"{rl.S_LOC_CODE}";
+ ill.Row = rl.N_ROW;
}
else continue;
}
@@ -3822,7 +3913,7 @@
ItemLayer = rl.N_CURRENT_NUM,
S_CJ_NAME = _clcntitem.S_CJ_NAME,
area = area,
- Row = $"{rl.S_LOC_CODE}"
+ Row = rl.N_ROW
});
dsi[area] = dictitems;
}
@@ -3836,7 +3927,7 @@
ItemLayer = rl.N_CURRENT_NUM,
S_CJ_NAME = _clcntitem.S_CJ_NAME,
area = area,
- Row = $"{rl.S_LOC_CODE}"
+ Row = rl.N_ROW
});
dsi.Add(area, dictitems);
}
@@ -3983,6 +4074,14 @@
//鐢熸垚鎺ラ┏鍖轰换鍔★紝鏍囪涓虹粓鐐瑰簱鍖恒�
var b = TaskProcess.CreateTransport(od.S_ID, lastful.S_LOC_CODE, Endbit.S_LOC_CODE, "鍘熺墿鏂欐惉杩�绾哥", crs.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, crs.Count, 50, nextarea == od.S_END_AREA ? "" : od.S_END_AREA);
if (od.S_ZZ_AREA == "YWLWJJB") InworkLock = false;
+ if (!string.IsNullOrEmpty(od.S_ITEM_CODE))
+ {
+ ///缁欑Щ搴撳崟 鍐欎笂杞繍鐨勭墿鏂欐暟鎹�
+ od.S_ITEM_CODE = cir1.S_ITEM_CODE;
+ od.S_ITEM_NAME = cir1.S_ITEM_NAME;
+ od.S_CJ_NAME = cir1.S_CJ_NAME;
+ WCSHelper.Do(db => db.Updateable(od).UpdateColumns(it => new { it.S_ITEM_NAME, it.S_ITEM_CODE, it.S_CJ_NAME }).ExecuteCommand());
+ }
break;
}
else if (od.S_ZZ_AREA == "YWLWJJB") InworkLock = false;
--
Gitblit v1.9.1