From 19598c8162599f635fb340cf6981bf21f11745ae Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期五, 20 六月 2025 22:36:53 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/core/Monitor.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 164310d..7a90c6f 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -1044,6 +1044,7 @@
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))
{
@@ -1261,7 +1262,7 @@
}
/// <summary>
- /// 鎻愭墸 銆�+ /// 鎻愭墸 銆傛爣绛俱�PE鑶滃嚭搴� /// </summary>
internal static void YwlTKPEBQ_Auto()
{
@@ -1289,7 +1290,8 @@
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("鎻愭墸-"));
@@ -1306,16 +1308,19 @@
{
try
{
- var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && 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 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($" 鏃犺弻鍑哄簱 宸ュ崟寮�惎涓�);
+ LogHelper.Info($" 鏃犺弻鍑哄簱 宸ュ崟寮�惎涓�");
+ // 鏍囩鍑哄簱銆傝揣鏋剁洿鎺ュ嚭鍒扮嚎杈� YwlBQ_CreWJOutOrder();
}
+
+ // 鏍囩鏃犺弻閫�簱銆�
YwlBQ_CreWJTK();
}
catch (Exception ex)
@@ -1734,7 +1739,7 @@
Console.WriteLine($"{v.FirstOrDefault()?.S_LOC_CODE} 闇�閫�簱-- 鑷姩閫�簱-鏈疄鐜�);
}
}
-
+ //鏍囩閫�簱銆�绾胯竟杞埌 璐ф灦銆� private static void YwlBQ_CreWJTK()
{
var db = new SqlHelper<object>().GetInstance();
@@ -2267,7 +2272,7 @@
}
/// <summary>
- ///
+ /// 鏍囩鍏ュ簱銆�浠庝汉宸ョ粦瀹氬尯 鍒�璐ф灦鍖恒�
/// </summary>
/// <param name="locsFirst"></param>
internal static void YwlBQ_CreInwork(List<locCntItem> locsFirst, string RK_BQDDQ, string RK_BBHJQ)
--
Gitblit v1.9.1