From d49dd1c4cab48e1e1df74c46d1d6a0f9bcc24e71 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期二, 17 六月 2025 09:37:21 +0800
Subject: [PATCH] 全部代码上传一遍
---
HH.WCS.ZCQTJ/core/TaskCore.cs | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/HH.WCS.ZCQTJ/core/TaskCore.cs b/HH.WCS.ZCQTJ/core/TaskCore.cs
index 654d8cd..2281b39 100644
--- a/HH.WCS.ZCQTJ/core/TaskCore.cs
+++ b/HH.WCS.ZCQTJ/core/TaskCore.cs
@@ -2,6 +2,7 @@
using HH.WCS.Hexafluo.process;
using HH.WCS.Hexafluo.util;
using HH.WCS.Hexafluo.wms;
+using HH.WCS.SJML.Entitys;
using HH.WCS.SJML.util;
using HH.WCS.ZCQTJ.Entitys;
using Newtonsoft.Json;
@@ -90,11 +91,38 @@
//鑾峰彇鎵�湁鏈墽琛岀殑浠诲姟
lock (locko9)
{
- var Lo = SqlSugarHelper.Db.Queryable<TaskLockEntitys>().Where(a => a.DeviceName == "AGV")?.First();
+ var chi = new SqlHelper<object>().GetInstance();
+ var newDb = chi.CopyNew();
+ var Lo = newDb.Queryable<TaskLockEntitys>().Where(a => a.DeviceName == "AGV")?.First();
+ DateTime date = DateTime.Now;
if (Lo != null && Lo.IsEnable == "Y")
{
List<string> state = new List<string> { "鏈墽琛�, "寰呮帹閫� };
var list = TaskHelper.GetTaskListByState(state);
+
+ //鏌ヨ鏄惁鏈夐�婊″彇绌虹殑 绌哄叆浠诲姟 鏈夌殑璇濋渶瑕佺瓑寰�0鍒嗛挓
+ var transportTask = newDb.Queryable<ConfigJsonEntitys>().Where(e => e.Autoindex == "閫佹弧鍙栫┖瀵瑰簲鐨勭┖鎵樼偣浣�)?.First();
+ if (transportTask != null)
+ {
+ var ListString = JsonConvert.DeserializeObject<List<string>>(transportTask.TypeJson);
+ if (ListString.Count() > 0)
+ {
+ //鍓旈櫎鏃堕棿娌″埌20鍒嗛挓鐨勭┖鎵樺叆搴�-鐗瑰埗
+ var TiemTask = list.FindAll(e => ListString.Contains(e.S_START_LOC) && e.S_TYPE == "鍏ュ簱").ToList();
+ if (TiemTask.Count() > 0)
+ {
+ foreach (var item in TiemTask)
+ {
+ if (item.T_CREATE.AddMinutes(20) > date)//娌¤秴鏃�0鍒嗛挓
+ {
+ //鎺掗櫎
+ list.Remove(item);
+ LogHelper.Info("NDC", $"娌¤秴鏃�0鍒嗛挓 鎺掗櫎鐨勪换鍔℃湁:{JsonConvert.SerializeObject(item)}");
+ }
+ }
+ }
+ }
+ }
var RkTask = list.FindAll(e => e.S_TYPE == "鍏ュ簱").ToList();
// var CkTask = list.FindAll(e => e.S_TYPE == "鍑哄簱").ToList();
if (RkTask.Count > 0)
@@ -105,7 +133,7 @@
TaskProcess.SendTask(item);
}
}
- var CkTaskList = SqlSugarHelper.Db.Queryable<WMSTask>().Where(a => state.Contains(a.S_B_STATE.Trim())
+ var CkTaskList = newDb.Queryable<WMSTask>().Where(a => state.Contains(a.S_B_STATE.Trim())
&& a.S_NOTE == "agv浠诲姟" && a.S_TYPE == "鍑哄簱" && a.S_START_LAREA != "TMCKJBW").ToList();
if (CkTaskList.Count > 0)
{
@@ -140,7 +168,7 @@
//else
//{
List<string> States = new List<string>() { "宸叉帹閫�, "鎵ц涓�, "寮�鍙栬揣" };
- var taskList = SqlSugarHelper.Db.Queryable<WMSTask>().Where(e => e.S_START_LOC == item.S_START_LOC
+ var taskList = newDb.Queryable<WMSTask>().Where(e => e.S_START_LOC == item.S_START_LOC
&& States.Contains(e.S_B_STATE.Trim()) && e.S_NOTE == "agv浠诲姟").ToList();
LogHelper.Info("NDC", $"鍑哄簱姝ｅ湪鍒ゆ柇鏄惁鍙互涓嬪彂鐨�agv浠诲姟 璧风偣搴撳尯涓嶆槸LC11M鐨刟gv浠诲姟(鍒ゆ柇鏄惁鏈夌浉鍚岃捣鐐圭殑鍒殑agv浠诲姟):{JsonConvert.SerializeObject(taskList)}");
if (taskList.Count > 0)
@@ -151,7 +179,7 @@
// }
}
}
- var CkTaskList1 = SqlSugarHelper.Db.Queryable<WMSTask>().Where(a => state.Contains(a.S_B_STATE.Trim())
+ var CkTaskList1 = newDb.Queryable<WMSTask>().Where(a => state.Contains(a.S_B_STATE.Trim())
&& a.S_NOTE == "agv浠诲姟" && a.S_TYPE == "鍑哄簱" && a.S_START_LAREA == "TMCKJBW").OrderBy(e => e.T_CREATE).ToList();
if (CkTaskList1.Count() > 0)
@@ -162,7 +190,7 @@
{
LogHelper.Info("NDC", $"鍑哄簱姝ｅ湪鍒ゆ柇鏄惁鍙互涓嬪彂鐨�agv浠诲姟鍙�{item.S_TASK_NO}");
//鏌ヨ涓讳换鍔＄殑璧风偣搴撳尯
- var ZhuTask = SqlSugarHelper.Db.Queryable<WMSTask>().Where(e => e.S_SRC_NO == item.S_SRC_NO).ToList();
+ var ZhuTask = newDb.Queryable<WMSTask>().Where(e => e.S_SRC_NO == item.S_SRC_NO).ToList();
LogHelper.Info("NDC", $"鍑哄簱姝ｅ湪鍒ゆ柇鏄惁鍙互涓嬪彂鐨�agv浠诲姟 鎵�搴旂殑鎵�湁鐩稿叧浠诲姟:{JsonConvert.SerializeObject(ZhuTask)}");
var hh = ZhuTask.FindAll(e => e.S_START_LAREA == "LC11M").ToList();
if (hh.Any())
--
Gitblit v1.9.1