From f248d4a25fb196149c9add083e74252d7334b37d Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 05 六月 2025 17:31:45 +0800
Subject: [PATCH] 部分细节优化
---
api/DebugController.cs | 100 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 92 insertions(+), 8 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index 76e5b30..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,
@@ -49,6 +57,66 @@
returnResult.ResultList.Add(temp4);
agvTaskState.state = 5;
+ var temp5 = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp5);
+
+ agvTaskState.state = 6;
+ var temp6 = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp6);
+
+ agvTaskState.state = 2;
+ var temp2 = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp2);
+
+ return returnResult;
+ }
+
+ /// <summary>
+ /// AGV鐘舵�涓�敭鍥炴姤134
+ /// </summary>
+ /// <param name="model">瀹瑰櫒鍙�/param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("AGVSeriesReports14")]
+ public ReturnResults AGVSeriesReports14(UpdateTaskState model) {
+ var agvTaskState = new AgvTaskState() {
+ task_no = model.TaskID,
+ forklift_no = model.ForkliftNo,
+ state = 1
+ };
+ ReturnResults returnResult = new ReturnResults();
+ returnResult.ResultList = new List<ReturnResult>();
+
+ var temp1 = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp1);
+
+ agvTaskState.state = 3;
+ var temp3 = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp3);
+
+ agvTaskState.state = 4;
+ var temp4 = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp4);
+
+ return returnResult;
+ }
+
+ /// <summary>
+ /// AGV鐘舵�涓�敭鍥炴姤562
+ /// </summary>
+ /// <param name="model">瀹瑰櫒鍙�/param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("AGVSeriesReports62")]
+ public ReturnResults AGVSeriesReports62(UpdateTaskState model) {
+ var agvTaskState = new AgvTaskState() {
+ task_no = model.TaskID,
+ forklift_no = model.ForkliftNo,
+ state = 5
+ };
+ ReturnResults returnResult = new ReturnResults();
+ returnResult.ResultList = new List<ReturnResult>();
+
var temp5 = WCSCore.OperateAgvTaskStatus(agvTaskState);
returnResult.ResultList.Add(temp5);
@@ -187,7 +255,6 @@
try {
-
using (var tran = db.UseTran()) {
LogHelper.Info("LogCntrCg锛� + JsonConvert.SerializeObject(locCntrCg));
if (string.IsNullOrEmpty(locCntrCg.LocCode)) return "";
@@ -322,6 +389,11 @@
}
}
+ /// <summary>
+ /// DEBUG锛氭ā鎷熻緭閫佺嚎浜х嚎婊℃墭鐩樹笅绾挎祦绋�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
[HttpPost]
[Route("AddInboundTask")]
public string AddInboundTask(AddInboundTaskInfo model) {
@@ -382,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)
@@ -397,8 +469,8 @@
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
@@ -480,9 +552,21 @@
}
public class AddInboundTaskInfo {
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
public string ItemCode { get; set; }
+ /// <summary>
+ /// 鎵规鍙�+ /// </summary>
public string BatchNo { get; set; }
+ /// <summary>
+ /// 瀹瑰櫒缂栫爜
+ /// </summary>
public string CntrCode { get; set; }
+ /// <summary>
+ /// 璧峰璐т綅
+ /// </summary>
public string StartLoc { get; set; }
}
@@ -498,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 {
--
Gitblit v1.9.1