From b3d20305722ae41ca0093ea034b12373dfdd2b3b Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期二, 10 六月 2025 16:21:23 +0800
Subject: [PATCH] 变更需求开发
---
HH.WCS.QingXiNongfu/core/Monitor.cs | 62 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 815bcb1..808024a 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -5,16 +5,9 @@
using SqlSugar;
using System;
using System.Collections.Generic;
-using System.Globalization;
using System.Linq;
-using System.Runtime.ConstrainedExecution;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using System.Security.Policy;
using System.Threading;
using System.Threading.Tasks;
-using Topshelf.Runtime.Windows;
-using static HH.WCS.QingXigongchang.dispatch.NDC;
namespace HH.WCS.QingXigongchang.core
{
@@ -1059,7 +1052,6 @@
dsll.Add(cir1.S_ITEM_CODE, rowlist);
}
}
-
if (dsll.Any())
foreach (var r in dsll)
{
@@ -1130,7 +1122,9 @@
isCd = true;
inlock = LocationHelper.GetList<RowLock>(x => x.S_AREA_CODE == EdnRarea && x.S_LOCK_SRC == cir1.S_ITEM_CODE + cir1.S_ITEM_NAME && x.S_LOCK_STATE == "鍏ュ簱閿�).FirstOrDefault();
if (inlock != null)
- arloclist = arloclist.FindAll(x => x.N_ROW == inlock.N_ROW);
+ {
+ arloclist = arloclist.FindAll(x => x.N_ROW == inlock.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))
{
@@ -1209,7 +1203,7 @@
}
}
}
- else if(InworkLock) InworkLock = false;
+ else if (InworkLock) InworkLock = false;
}
catch (Exception ex)
{
@@ -1329,12 +1323,20 @@
var Syuworders = 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 => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(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 tk = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 1 && x.SQL_State == "鎵ц涓�).FirstOrDefault();
-
+ var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 1 && x.SQL_State == "鎵ц涓�);
if (!Syuworders.Any())
- YwlBQ_CreInwork(SlocsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
- if (tk != null)
{
+ YwlBQ_CreInwork(SlocsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
+ }
+ if (tklist.Count() > 0)
+ {
+ var tk = tklist.FirstOrDefault();
+ var Cjsj = LocationHelper.GetList<CjTimeOrder>(x => tklist.Select(c => c.S_CJ_NAME).ToList().Contains(x.S_CJ_NAME) && tklist.Select(c => c.SQL_ItemCode).ToList().Contains(x.S_ITEM_CODE));
+ if (Cjsj.Count() > 0)
+ {
+ var Cj = Cjsj.OrderBy(e => e.T_CJ_TIME).ToList().FirstOrDefault();
+ tk = tklist.Find(e => e.S_CJ_NAME == Cj.S_CJ_NAME && e.SQL_ItemCode == Cj.S_ITEM_CODE);
+ }
var loc = LocationHelper.GetLoc(plc.location[0]);
if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "鏃�)
{
@@ -1392,9 +1394,17 @@
YwlPETK_CreInwork(TKlocsFirst, "YWLTKMKQ", "鏀剁缉鑶滃弶杩�); // PE鍏ュ簱
//YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "鏀剁缉鑶滃弶杩�);
//YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "鏀剁缉鑶滃弶杩�);// PE涓嚭搴�- var tk = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2鎻愬崌鏈�鏀剁缉鑶� && x.WorkType == 1 && x.SQL_State == "鎵ц涓�).FirstOrDefault();
- if (tk != null)
+ var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2鎻愬崌鏈�鏀剁缉鑶� && x.WorkType == 1 && x.SQL_State == "鎵ц涓�);
+ if (tklist.Count() > 0)
{
+ var tk = tklist.FirstOrDefault();
+ var Cjsj = LocationHelper.GetList<CjTimeOrder>(x => tklist.Select(c => c.S_CJ_NAME).ToList().Contains(x.S_CJ_NAME) && tklist.Select(c => c.SQL_ItemCode).ToList().Contains(x.S_ITEM_CODE));
+ if (Cjsj.Count() > 0)
+ {
+ var Cj = Cjsj.OrderBy(e => e.T_CJ_TIME).ToList().FirstOrDefault();
+ tk = tklist.Find(e => e.S_CJ_NAME == Cj.S_CJ_NAME && e.SQL_ItemCode == Cj.S_ITEM_CODE);
+ }
+
var loc = LocationHelper.GetLoc(plc.location[0]);
if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "鏃�)
{
@@ -1477,6 +1487,15 @@
var ploc = plc.location[0];
retuse:
var order = yuworders.FirstOrDefault();
+ if (yuworders.Count() > 0)
+ {
+ var Cjsj = LocationHelper.GetList<CjTimeOrder>(x => yuworders.Select(c => c.S_CJ_NAME).ToList().Contains(x.S_CJ_NAME) && yuworders.Select(c => c.SQL_ItemCode).ToList().Contains(x.S_ITEM_CODE));
+ if (Cjsj.Count() > 0)
+ {
+ var Cj = Cjsj.OrderBy(e => e.T_CJ_TIME).ToList().FirstOrDefault();
+ order = yuworders.Find(e => e.S_CJ_NAME == Cj.S_CJ_NAME && e.SQL_ItemCode == Cj.S_ITEM_CODE);
+ }
+ }
if (order != null)
{
var Porder = WCSHelper.GetWorkOrder(order.SQL_LinkLineNO);
@@ -1728,7 +1747,7 @@
if (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();
+ 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);
@@ -1770,7 +1789,7 @@
}
//鎵ц閫�簱銆傘�銆�
- // Console.WriteLine($"{v.FirstOrDefault()?.S_LOC_CODE} 闇�閫�簱-- 鑷姩閫�簱-鏈疄鐜�);
+ // Console.WriteLine($"{v.FirstOrDefault()?.S_LOC_CODE} 闇�閫�簱-- 鑷姩閫�簱-鏈疄鐜�);
}
}
@@ -3786,7 +3805,7 @@
else InworkLock = true;
}
else InworkLock = false;
- var zzlocs = LocationHelper.GetAreaNormalLocList(od.S_ZZ_AREA);
+ var zzlocs = LocationHelper.GetAreaNormalLocList(od.S_ZZ_AREA);
Location Endbit = null;
foreach (var zzrs in zzlocs.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
{
@@ -3816,8 +3835,9 @@
//鐢熸垚鎺ラ┏鍖轰换鍔★紝鏍囪涓虹粓鐐瑰簱鍖恒�
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, od.S_END_AREA);
if (od.S_ZZ_AREA == "YWLWJJB") InworkLock = false;
- break;
- }else if (od.S_ZZ_AREA == "YWLWJJB") InworkLock = false;
+ break;
+ }
+ else if (od.S_ZZ_AREA == "YWLWJJB") InworkLock = false;
}
}
}
--
Gitblit v1.9.1