From 39524ad447f32505c24d56cd4de4ef707d2aca13 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期二, 03 六月 2025 17:28:27 +0800
Subject: [PATCH] 后端修复记录表问题
---
api/DebugController.cs | 18 +++++++++++++-----
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3c46e31b-92c1-46e5-92fd-f14f17b3bb37.vsidx | 0
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/adcc1e79-4e50-42ee-ad7b-9a8e583b3401.vsidx | 0
/dev/null | 0
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/a8b2e367-f0d3-4c52-a750-33ba036c1ad8.vsidx | 0
api/ApiModel.cs | 3 ---
core/WCSCore.cs | 1 +
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1e814f61-56d2-4923-b635-2c4903d5fcef.vsidx | 0
8 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/08541fd3-d249-4305-a69d-beee9c55e040.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/08541fd3-d249-4305-a69d-beee9c55e040.vsidx
deleted file mode 100644
index 497d0dd..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/08541fd3-d249-4305-a69d-beee9c55e040.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3908d945-9e88-4170-b92a-f2cf0dcb5e54.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1e814f61-56d2-4923-b635-2c4903d5fcef.vsidx
similarity index 66%
rename from .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3908d945-9e88-4170-b92a-f2cf0dcb5e54.vsidx
rename to .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1e814f61-56d2-4923-b635-2c4903d5fcef.vsidx
index f26c45c..e680222 100644
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3908d945-9e88-4170-b92a-f2cf0dcb5e54.vsidx
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1e814f61-56d2-4923-b635-2c4903d5fcef.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3c46e31b-92c1-46e5-92fd-f14f17b3bb37.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3c46e31b-92c1-46e5-92fd-f14f17b3bb37.vsidx
new file mode 100644
index 0000000..3d22c71
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3c46e31b-92c1-46e5-92fd-f14f17b3bb37.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/80a17313-250a-42dd-81db-199b08a9a451.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/80a17313-250a-42dd-81db-199b08a9a451.vsidx
deleted file mode 100644
index b4cc6ae..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/80a17313-250a-42dd-81db-199b08a9a451.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/a8b2e367-f0d3-4c52-a750-33ba036c1ad8.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/a8b2e367-f0d3-4c52-a750-33ba036c1ad8.vsidx
new file mode 100644
index 0000000..32f094a
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/a8b2e367-f0d3-4c52-a750-33ba036c1ad8.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/adcc1e79-4e50-42ee-ad7b-9a8e583b3401.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/adcc1e79-4e50-42ee-ad7b-9a8e583b3401.vsidx
new file mode 100644
index 0000000..5acd7c3
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/adcc1e79-4e50-42ee-ad7b-9a8e583b3401.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f162a79b-274a-47cc-948c-8ef43e6ced25.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f162a79b-274a-47cc-948c-8ef43e6ced25.vsidx
deleted file mode 100644
index 03d305a..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f162a79b-274a-47cc-948c-8ef43e6ced25.vsidx
+++ /dev/null
Binary files differ
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index 30b6b23..54338ca 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -339,19 +339,16 @@
/// </summary>
[JsonProperty("batchNo")]
public string BatchNo { get; set; }
-
/// <summary>
/// 鎵ц鏍囧噯
/// </summary>
[JsonProperty("standard")]
public string Standard { get; set; }
-
/// <summary>
/// 鍑�惈閲� /// </summary>
[JsonProperty("netWeight")]
public string NetWeight { get; set; }
-
/// <summary>
/// 璐ㄩ噺绛夌骇
/// </summary>
diff --git a/api/DebugController.cs b/api/DebugController.cs
index f443eef..105b0e6 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -29,6 +29,14 @@
[HttpPost]
[Route("AGVSeriesReports")]
public ReturnResults AGVSeriesReports(UpdateTaskState model) {
+ //var db = new SqlHelper<object>().GetInstance();
+
+ //var task = db.Queryable<TN_Task>().Where(t => t.S_CODE == model.TaskID).First();
+ //if (task == null) return new ReturnResults();
+ //if (task.S_B_STATE == "瀹屾垚" && task.N_B_STATE == 3 || task.S_B_STATE == "閿欒" && task.N_B_STATE == 4) {
+ // return new ReturnResults();
+ //}
+
var agvTaskState = new AgvTaskState() {
task_no = model.TaskID,
forklift_no = model.ForkliftNo,
@@ -446,7 +454,7 @@
};
var endLoc = db.Queryable<TN_Location>()
- .Where(a => Settings.AreaMap[AreaName.K绌烘墭瀛樻斁鍖篯.Contains(a.S_AREA_CODE))
+ .Where(a => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.Contains(a.S_AREA_CODE))
.Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
.Where(a => a.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
.OrderBy(l => l.N_LAYER)
@@ -574,10 +582,10 @@
/// AGV 灏忚溅鍙� /// </summary>
public string ForkliftNo { set; get; }
- /// <summary>
- /// AGV 涓嬩竴涓姸鎬�- /// </summary>
- public int NextState { set; get; }
+ ///// <summary>
+ ///// AGV 涓嬩竴涓姸鎬�+ ///// </summary>
+ //public int NextState { set; get; }
}
public class FalseOk {
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 312a7a3..b209191 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -147,6 +147,7 @@
if (cgDetail == null) {
info = $"浠诲姟{task.S_CODE}瀹屾垚锛岃褰曞嚭鍏ュ簱澶辫触锛氭棤娉曞湪瀹瑰櫒璐у搧鏄庣粏琛ㄤ腑鎵惧埌鎵樼洏{task.S_CNTR_CODE}瀵瑰簲鐨勭墿鏂�;
LogHelper.Info(info);
+ return;
}
}
--
Gitblit v1.9.1