From 2ca90a404fa1ab94eb6374f50c6ddd47a2b7f0e6 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 31 七月 2025 17:23:57 +0800
Subject: [PATCH] 删除有问题的TCP旧代码, 优化事务处理和ERP数据模型
---
core/WCSCore.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 6938961..8404866 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -58,13 +58,13 @@
// AGV 浠诲姟 134562(7) 鐘舵�澶勭悊
switch (model.state) {
case 1: // 鎵ц
- WCSHelper.Begin(TN_Task, model.forklift_no); // 宸叉帹閫佺殑浠诲姟鐨勭姸鎬佹敼鎴愭墽琛�+ WCSHelper.SetTaskBegin(TN_Task, model.forklift_no); // 宸叉帹閫佺殑浠诲姟鐨勭姸鎬佹敼鎴愭墽琛� break;
case 3: // 寮�鍙栬揣
- WCSHelper.UpdateStatus(TN_Task, "寮�鍙栬揣"); // 浠诲姟鐘舵�鏀规垚寮�鍙栬揣
+ WCSHelper.UpdateTaskState(TN_Task, "寮�鍙栬揣"); // 浠诲姟鐘舵�鏀规垚寮�鍙栬揣
break;
case 4: // 鍙栬揣瀹屾垚
- WCSHelper.UpdateStatus(TN_Task, "鍙栬揣瀹屾垚"); // 浠诲姟鐘舵�鏀规垚鍙栬揣瀹屾垚
+ WCSHelper.UpdateTaskState(TN_Task, "鍙栬揣瀹屾垚"); // 浠诲姟鐘舵�鏀规垚鍙栬揣瀹屾垚
TaskProcess.OperateStatus(TN_Task, 4); // 璧风偣瀹瑰櫒璐т綅瑙ｇ粦,瑙ｉ攣璧风偣
if (TN_Task.S_TYPE == ETask.C鎴愬搧鑳跺嚭搴�Name()) {
@@ -78,14 +78,14 @@
break;
case 5: // 寮�鍗歌揣
- WCSHelper.UpdateStatus(TN_Task, "寮�鍗歌揣"); // 浠诲姟鐘舵�鏀规垚寮�鍗歌揣
+ WCSHelper.UpdateTaskState(TN_Task, "寮�鍗歌揣"); // 浠诲姟鐘舵�鏀规垚寮�鍗歌揣
break;
case 6: // 鍗歌揣瀹屾垚
- WCSHelper.UpdateStatus(TN_Task, "鍗歌揣瀹屾垚"); // 浠诲姟鐘舵�鏀规垚鍗歌揣瀹屾垚
+ WCSHelper.UpdateTaskState(TN_Task, "鍗歌揣瀹屾垚"); // 浠诲姟鐘舵�鏀规垚鍗歌揣瀹屾垚
TaskProcess.OperateStatus(TN_Task, 6); // 缁堢偣瀹瑰櫒璐т綅缁戝畾,瑙ｉ攣缁堢偣
break;
case 2: // 瀹屾垚
- WCSHelper.End(TN_Task); // 浠诲姟鐘舵�鏀规垚缁撴潫
+ WCSHelper.SetTaskEnd(TN_Task); // 浠诲姟鐘舵�鏀规垚缁撴潫
//if (TN_Task.S_TYPE == TaskName.鎶芥_鍑哄簱) {
// var checkCompleteTask = Task.Run(() => {
@@ -100,7 +100,7 @@
break;
case 7: // 寮傚父
TaskProcess.OperateStatus(TN_Task, 7); // 寮傚父澶勭悊
- WCSHelper.Fail(TN_Task); // 浠诲姟鐘舵�鏀规垚閿欒
+ WCSHelper.SetTaskFail(TN_Task); // 浠诲姟鐘舵�鏀规垚閿欒
break;
}
@@ -195,7 +195,7 @@
try {
ModbusHelper.Relink();
- var BZQ = Settings.GetTaskInfo(ETask.M婊℃墭涓嬬嚎鍏ュ簱).StartAreas;
+ var BZQ = ETask.M婊℃墭涓嬬嚎鍏ュ簱.StartAreas();
var loc = db.Queryable<TN_Location>()
.Where(l => BZQ.Contains(l.S_AREA_CODE) && l.S_AGV_SITE == model.station_name).First();
@@ -327,7 +327,7 @@
LogHelper.Info($"鐗╂枡缂栫爜涓嶅瓨鍦�");
}
- var model = new OtherModel.PickUpReturnErpInfo {
+ var model = new ErpModel.PickUpReturnErpInfo {
jhdh = plan.JHDH, // 璁″垝鍗曞彿 (鍞竴鏍囪瘑)
ckzt = plan.CKZT, // 鍑哄簱鐘舵� (闇�杩斿洖)
jhlb = plan.JHLB, // 璁″垝绫诲埆
@@ -491,10 +491,10 @@
public static (bool, string) CreateInboundTask(string startLocCode, string cntrCode) {
var db = new SqlHelper<object>().GetInstance();
- var taskInfo = Settings.GetTaskInfo(ETask.M婊℃墭涓嬬嚎鍏ュ簱);
- var taskName = taskInfo.TaskName;
- var startAreas = taskInfo.StartAreas;
- var endAreas = taskInfo.EndAreas;
+ var tInfo = ETask.M婊℃墭涓嬬嚎鍏ュ簱.Info();
+ var taskName = tInfo.TaskName;
+ var startAreas = tInfo.StartAreas;
+ var endAreas = tInfo.EndAreas;
const string cntrType = "鎵樼洏";
try {
@@ -533,7 +533,7 @@
}
var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTaskWithLocLock(startLoc, endLoc, cntId, taskName);
+ var task = WCSHelper.BuildTaskAndLockLoc(startLoc, endLoc, cntId, taskName);
using (var tran = db.Ado.UseTran()) {
if (locCntrRelOld != null) {
--
Gitblit v1.9.1