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 | 213 +++++++++++++++-------------------------------------
1 files changed, 62 insertions(+), 151 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index e6b697f..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;
@@ -15,6 +16,7 @@
using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
using static HH.WCS.Mobox3.DSZSH.api.OtherModel;
+using static HH.WCS.Mobox3.DSZSH.Config;
using static HH.WCS.Mobox3.DSZSH.core.Monitor;
namespace HH.WCS.Mobox3.DSZSH.api {
@@ -67,133 +69,6 @@
}
/// <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);
-
- 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>
/// 鍒濆鍖栨暟鎹簱
/// </summary>
/// <returns></returns>
@@ -226,7 +101,60 @@
}
/// <summary>
- /// 妯℃嫙Erp涓嬪彂鍑哄簱璁″垝鍗�+ /// DEBUG锛氭ā鎷熶汉宸ュ皢鏂欑鎼繍鍒颁骇绾夸笂绾垮彛锛堢洿鎺ヤ慨鏀规暟鎹簱锛�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("GoodpackToProdLine")]
+ public string GoodpackToProdLine(GoodpackToProdLineInfo model) {
+
+ var db = new SqlHelper<object>().GetInstance();
+ try {
+ // 鏌ヨ璧风偣璐т綅锛氭暟閲�0
+ var startLoc = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
+ .Where((l,c) => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == model.CntrCode).First();
+ if (startLoc == null) {
+ return $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛佽姹傦細閿佺姸鎬�'鏃�锛屽綋鍓嶅鍣ㄦ暟閲�1";
+ }
+
+ // 鏌ヨ缁堢偣璐т綅
+ // Order锛氭寜璐т綅灞傛暟锛屼粠灏忓埌澶ф帓鍒�+ var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.N_CURRENT_NUM == 0).First();
+ if (endLoc == null) {
+ return $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒瑕佹眰锛氶攣鐘舵�='鏃�锛屽綋鍓嶅鍣ㄦ暟閲�0";
+ }
+
+ var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_CNTR_CODE == model.CntrCode).First() ;
+ if (locCntrRel == null) {
+ return $"璇ュ鍣ㄤ笉瀛樺湪缁戝畾鐨勮揣浣嶏紒";
+ }
+
+ locCntrRel.S_LOC_CODE = model.StartLoc;
+ startLoc.N_CURRENT_NUM = 0;
+ endLoc.N_CURRENT_NUM = 1;
+
+ using (var tran = db.Ado.UseTran()) {
+ if (db.Updateable(startLoc).ExecuteCommand() <= 0 &&
+ db.Updateable(endLoc).ExecuteCommand() <= 0 &&
+ db.Updateable(locCntrRel).ExecuteCommand() <= 0) {
+
+ tran.RollbackTran();
+ return "鏁版嵁搴撴搷浣滃け璐ワ紒";
+ }
+
+ tran.CommitTran() ;
+ return "鏁版嵁搴撴搷浣滄垚鍔�;
+ }
+ }
+ catch (Exception ex) {
+
+ return ex.Message;
+ }
+ }
+
+ /// <summary>
+ /// DEBUG锛氭ā鎷烢rp涓嬪彂鍑哄簱璁″垝鍗� /// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -289,6 +217,12 @@
}
}
+ public class GoodpackToProdLineInfo {
+ public string CntrCode { get; set; }
+ public string StartLoc { get; set; }
+ public string EndLoc { get; set; }
+ }
+
public class TestErpSendOutboundPlanInfo {
/// <summary>
/// 鍑哄簱璁″垝鍗曞彿锛堣鍒掑崟鍙�jhdh锛�@@ -340,10 +274,6 @@
/// AGV 灏忚溅鍙� /// </summary>
public string ForkliftNo { set; get; }
- ///// <summary>
- ///// AGV 涓嬩竴涓姸鎬�- ///// </summary>
- //public int NextState { set; get; }
}
public class AgvReportsInfo {
@@ -361,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>
@@ -377,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