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数据模型
---
api/ForceController.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/api/ForceController.cs b/api/ForceController.cs
index 8c250b5..11c25cf 100644
--- a/api/ForceController.cs
+++ b/api/ForceController.cs
@@ -41,18 +41,17 @@
const string preLog = "DEBUG:寮哄埗鍒涘缓浠诲姟:";
try {
- var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLocUnbind(model.StartLoc, taskInfo.StartAreas)).First();
+ var startLoc = db.Queryable<TN_Location>().Where(DbExpr.LocFilter(0, model.StartLoc, null, -1)).First();
if (startLoc == null) {
- return NewSimpleResult(2, preLog + LogMsg.StartLocUnbindNotFound(model.StartLoc, taskInfo.StartAreas));
+ return NewSimpleResult(2, preLog + LogMsg.StartLocNotFound(model.StartLoc, null, -1));
}
- var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: taskInfo.EndAreas))
- .OrderBy(l => new { l.N_LAYER }).First();
+ var endLoc = db.Queryable<TN_Location>().Where(DbExpr.LocFilter(0, model.EndLoc, null, -1)).First();
if (endLoc == null) {
- return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: taskInfo.EndAreas));
+ return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(model.EndLoc, null, -1));
}
- var task = WCSHelper.BuildTaskWithLocLock(startLoc, endLoc, model.CntId, taskInfo.TaskName);
+ var task = WCSHelper.BuildTaskAndLockLoc(startLoc, endLoc, model.CntId, taskInfo.TaskName);
(ok, msg) = DbTran.CreateTask(new CreateTaskObj {
StartLocToUpdate = startLoc,
--
Gitblit v1.9.1