From 6ae144a5abbacaada8c9dbe6daaef2893384942d Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期一, 16 六月 2025 17:53:50 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/core/Monitor.cs | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index d486159..3d777d5 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -1302,11 +1302,17 @@
{
try
{
+ LogHelper.Info($" 鏃犺弻鍑哄簱 鏌ュ伐鍗�);
var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
if (!yuworders.Any())
+ {
YwlBQ_CreInwork(locsFirst, WJ_BQ.RK_BQDDQ, WJ_BQ.RK_BBHJQ);
+ }
else
+ {
+ LogHelper.Info($" 鏃犺弻鍑哄簱 宸ュ崟寮�惎涓�);
YwlBQ_CreWJOutOrder();
+ }
YwlBQ_CreWJTK();
}
catch (Exception ex)
@@ -2450,13 +2456,14 @@
internal static void YwlBQ_CreWJOutOrder()
{
-
+ LogHelper.Info($" 鏃犺弻鍑哄簱 寮�");
//1.妫�煡鏄惁鏈夐�搴� var db = new SqlHelper<object>().GetInstance();
///绗笁娈碉細鎺ラ┏鍖�杞�绾胯竟
var JQBS = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
foreach (var jbr in JQBS.GroupBy(x => x.N_ROW))
{
+ LogHelper.Info($" 鏃犺弻鍑哄簱 鎺ラ┏鏈夋暟鎹�);
var y2 = jbr.OrderBy(x => x.N_COL).ToList();
var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
if (l2 != null)
@@ -2465,15 +2472,21 @@
if (!c.Any() || c.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
{
//鍥炲簱銆�+ LogHelper.Info($"寰幆鏈夋棤閫�簱==> 鏈�閫�簱" + l2.S_LOC_CODE);
continue;
}
var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
- if (!cirs.Any()) continue;
+ if (!cirs.Any())
+ {
+ LogHelper.Info($"寰幆鏈夋棤閫�簱==> 娌℃湁鐗╂枡淇℃伅 鎵樼洏:" + c.FirstOrDefault().S_CNTR_CODE);
+ continue;
+ }
var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
var xbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_XBKQ);
foreach (var x1 in xbqs.GroupBy(x => x.N_ROW))
{
+ LogHelper.Info($" 鏃犺弻鍑哄簱 绾胯竟鏈夋暟鎹�);
var x2 = x1.OrderBy(x => x.N_COL).ToList();
var l3 = x2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
if (l3 != null)
@@ -2481,15 +2494,25 @@
var xc = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l3.S_LOC_CODE);
if (!xc.Any() || xc.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
{
+ LogHelper.Info($"寰幆绾胯竟==> 鏈�閫�簱" + xc.FirstOrDefault()?.S_TYPE);
continue;
}
var xcirs = ContainerHelper.GetCntrItemRel(xc.FirstOrDefault().S_CNTR_CODE);
- if (!xcirs.Any()) continue;
+ if (!xcirs.Any())
+ {
+ LogHelper.Info($"寰幆绾胯竟==> 娌℃湁鐗╂枡淇℃伅 鎵樼洏:" + xc.FirstOrDefault().S_CNTR_CODE);
+ continue;
+ }
+
var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
if (xcir.S_ITEM_CODE != cir.S_ITEM_CODE || xcir.S_ITEM_NAME != cir.S_ITEM_CODE)
+ {
+ LogHelper.Info($"寰幆绾胯竟==> 鐗╂枡涓嶅尮閰�鎵樼洏:" + xc.FirstOrDefault().S_CNTR_CODE);
continue;
+ }
}
var e = x2.FindAll(x => x.N_COL > (l3?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
+ LogHelper.Info($"鏃犺弻 鐢熸垚浠诲姟==> 鏄惁鏈夊悎閫傜殑璐т綅淇℃伅" + e?.S_LOC_CODE);
if (e != null)
{
var re = TaskProcess.CreateTransport("", l2.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-鎺ラ┏杞嚎杈�, new List<string> { c.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62, BQ_PRA.Out);
@@ -2499,7 +2522,7 @@
}
}
}
-
+ LogHelper.Info($" 鏃犺弻鍑哄簱 鍒扮嚎杈�缁撴潫");
///鎷嗗灈鍖哄彇娑堛�
if (false)
{
@@ -3607,7 +3630,7 @@
LogHelper.Info(rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
if (_clcntitem != null)
{
- LogHelper.Info("鐩镐簰鏄惁鍖归厤 _clcntitem S_ITEM_CODE:" + _clcntitem.S_ITEM_CODE + " od" + od.SQL_ItemCode + " _clcntitem S_ITEM_NAME:" + _clcntitem.S_ITEM_NAME + "od: " + od.SQL_ItemName);
+ LogHelper.Info("鐩镐簰鏄惁鍖归厤 _clcntitem S_ITEM_CODE:" + _clcntitem.S_ITEM_CODE + " od" + od.SQL_ItemCode + " _clcntitem S_ITEM_NAME:" + _clcntitem.S_ITEM_NAME + "od: " + od.SQL_ItemName + " od.S_CJ_NAME:" + od.S_CJ_NAME);
if (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName && _clcntitem.S_CJ_NAME == od.S_CJ_NAME)
{
@@ -3646,6 +3669,10 @@
{
EndBit = locs1.FirstOrDefault().S_LOC_CODE;
}
+ else
+ {
+ continue;
+ }
}
var b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, EndBit, "鍘熺墿鏂欐惉杩�绾哥", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri, "", Endbit.S_LOC_CODE);
if (b)
--
Gitblit v1.9.1