From 74ca5a83f24c53c48ad7e6f5b7739649fb411546 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 17 七月 2025 17:19:53 +0800
Subject: [PATCH] 优化部分日志和未使用代码
---
api/DebugController.cs | 157 +---------------------------------------------------
1 files changed, 4 insertions(+), 153 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index e725102..d2f7485 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.IO;
using System.Runtime.ConstrainedExecution;
using System.Web.Http;
@@ -53,133 +54,6 @@
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鍥炴姤浠诲姟鐘舵�锛堟寚瀹氫笅涓�釜鐘舵�锛岀敤浜庨渶瑕佸垎娈垫祴璇曠殑鍦烘櫙锛�br/>
- /// 鎬ц兘鐩稿杈冨樊锛屼粎鐢ㄤ簬娴嬭瘯锛屼竴鑸笉浣跨敤
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost]
- [Route("AgvReports")]
- public ReturnResults AgvReports(AgvReportsInfo model) {
- var db = new SqlHelper<object>().GetInstance();
- ReturnResults returnResult = new ReturnResults();
- returnResult.ResultList = new List<ReturnResult>();
- var agvTaskState = new AgvTaskState() {
- task_no = model.TaskId,
- forklift_no = model.ForkliftNo,
- };
-
- var taskAction = db.Queryable<TN_Task_Action>()
- .Where(t => t.S_TASK_CODE == model.TaskId)
- .OrderBy(t => new { create = SqlFunc.Desc(t.T_CREATE) }).First(); // 鏈�悗涓�釜Action鐘舵�
-
- var lastState = taskAction?.N_ACTION_CODE ?? 0;
-
- if (model.NextState <= 0 || model.NextState >= 7) {
- LogHelper.Info("灏忚溅鍥炴姤鐘舵�涓嶅湪134562鐨勮寖鍥村唴");
- }
-
- // 0 ==> 1,3,4,5,6,2
- if (lastState == 0 && model.NextState >= 1) {
- agvTaskState.state = 1;
- var temp = WCSCore.OperateAgvTaskStatus(agvTaskState);
- returnResult.ResultList.Add(temp);
- }
- // 0,1 ==> 3,4,5,6,2
- if (lastState < 2 && model.NextState >= 2) {
- agvTaskState.state = 3;
- var temp = WCSCore.OperateAgvTaskStatus(agvTaskState);
- returnResult.ResultList.Add(temp);
- }
- // 0,1,3 ==> 4,5,6,2
- if (lastState < 4 && lastState != 2 && (model.NextState >= 3 || model.NextState == 2)) {
- agvTaskState.state = 4;
- var temp = WCSCore.OperateAgvTaskStatus(agvTaskState);
- returnResult.ResultList.Add(temp);
- }
- // 0,1,3,4 ==> 5,6,2
- if (lastState < 5 && lastState != 2 && (model.NextState >= 4 || model.NextState == 2)) {
- agvTaskState.state = 5;
- var temp = WCSCore.OperateAgvTaskStatus(agvTaskState);
- returnResult.ResultList.Add(temp);
- }
- // 0,1,3,4,5 ==> 6,2
- if (lastState < 6 && lastState != 2 && (model.NextState >= 5 || model.NextState == 2)) {
- agvTaskState.state = 6;
- var temp = WCSCore.OperateAgvTaskStatus(agvTaskState);
- returnResult.ResultList.Add(temp);
- }
- // 0,1,3,4,5,6 ==> 2
- if (lastState != 2 && model.NextState == 2) {
- agvTaskState.state = 2;
- var temp = WCSCore.OperateAgvTaskStatus(agvTaskState);
- returnResult.ResultList.Add(temp);
- }
-
- 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);
@@ -261,9 +135,9 @@
endLoc.N_CURRENT_NUM = 1;
using (var tran = db.Ado.UseTran()) {
- if (db.Updateable<TN_Location>(startLoc).ExecuteCommand() <= 0 &&
- db.Updateable<TN_Location>(endLoc).ExecuteCommand() <= 0 &&
- db.Updateable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+ if (db.Updateable(startLoc).ExecuteCommand() <= 0 &&
+ db.Updateable(endLoc).ExecuteCommand() <= 0 &&
+ db.Updateable(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
return "鏁版嵁搴撴搷浣滃け璐ワ紒";
@@ -400,10 +274,6 @@
/// AGV 灏忚溅鍙� /// </summary>
public string ForkliftNo { set; get; }
- ///// <summary>
- ///// AGV 涓嬩竴涓姸鎬�- ///// </summary>
- //public int NextState { set; get; }
}
public class AgvReportsInfo {
@@ -421,15 +291,6 @@
public int NextState { set; get; } = 0;
}
- public class FalseOk {
- public bool JumpOut { set; get; } = true;
- }
-
- public class InsertCntrItemInfo {
- public string Cntr { set; get; }
- public string Item { set; get; }
- }
-
/// <summary>
///
/// </summary>
@@ -437,14 +298,4 @@
public List<ReturnResult> ResultList { set; get; }
}
- public class LocCntrCg {
- public string Note { get; set; } // 浠呯敤浜庡娉�-
- public string LocCode { get; set; }
- public string LocArea { get; set; }
- public string CntrCode { get; set; }
- public string CntrType { get; set; }
- public string ItemCode { get; set; }
- public string BatchNo { get; set; }
- }
}
--
Gitblit v1.9.1