From 30b008a25cc30a32f1e2fdee4a34ae71146e990e Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 21 七月 2025 17:28:09 +0800
Subject: [PATCH] 取消，异常流程，修改
---
wms/TaskHelper.cs | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/wms/TaskHelper.cs b/wms/TaskHelper.cs
index 12578b6..59dfbe5 100644
--- a/wms/TaskHelper.cs
+++ b/wms/TaskHelper.cs
@@ -1,4 +1,5 @@
锘縰sing HH.WCS.ZhongCeJinTan.api;
+using HH.WCS.ZhongCeJinTan.core;
using HH.WCS.ZhongCeJinTan.device;
using HH.WCS.ZhongCeJinTan.dispatch;
using HH.WCS.ZhongCeJinTan.util;
@@ -12,6 +13,7 @@
using System.Threading.Tasks;
using System.Web.Services.Description;
using System.Xml.Linq;
+using Top.Api;
using static HH.WCS.ZhongCeJinTan.util.Settings;
using static HH.WCS.ZhongCeJinTan.wms.WcsModel;
@@ -64,7 +66,7 @@
internal static WmsWork GetWmsWork(string no) {
var db = new SqlHelper<WmsWork>().GetInstance();
- return db.Queryable<WmsWork>().Where(it => it.S_CODE == no).First();
+ return db.Queryable<WmsWork>().Where(it => it.S_CODE == no).OrderByDescending(b=>b.T_CREATE).First();
}
@@ -682,6 +684,17 @@
return ac;
}
+ internal static WcsSafety GetWcsSafety(string taskNo, string action)
+ {
+ var db = new SqlHelper<WcsSafety>().GetInstance();
+
+ var ac = db.Queryable<WcsSafety>().Where(a => a.TaskNo == taskNo && a.Sign.ToString() == action).First();
+
+ return ac;
+ }
+
+
+
/// <summary>
/// 浠诲姟鎷︽埅
@@ -874,6 +887,14 @@
internal static bool CreateTask(WMSTask wmsTask) {
var db = new SqlHelper<WMSTask>().GetInstance();
+
+ var task = db.Queryable<WMSTask>().Where(a => a.S_CODE == wmsTask.S_CODE).First();
+
+ if (task!=null)
+ {
+ return false;
+ }
+
return db.Insertable(wmsTask).ExecuteCommand() > 0;
}
@@ -923,6 +944,8 @@
return db.Queryable<WorkFlow>().Where(a => a.FLOWCODE == flowCode && a.TOOLSTYPE == type).First();
}
+
+
//鏍规嵁娴佺▼缂栧彿鍜岃捣鐐瑰簱鍖烘煡鎵句綔涓氭祦绋� public static WorkFlow selectWorkFlowByStratArea(string flowCode, string startArea)
{
@@ -930,6 +953,14 @@
return db.Queryable<WorkFlow>().Where(a => a.FLOWCODE == flowCode && a.STARTAREA==startArea).First();
}
+ //鏍规嵁娴佺▼缂栧彿鍜岀粓鐐瑰簱鍖烘煡鎵句綔涓氭祦绋�+ public static WorkFlow selectWorkFlowByEndArea(string flowCode, string endArea)
+ {
+ var db = new SqlHelper<WorkFlow>().GetInstance();
+ return db.Queryable<WorkFlow>().Where(a => a.FLOWCODE == flowCode && a.ENDAREA == endArea).First();
+ }
+
+
/// <summary>
/// 鏍规嵁浠诲姟鐘舵�鑾峰彇agv浠诲姟
/// </summary>
--
Gitblit v1.9.1