From f8d23dcf8d6501482db1a5180325194232afe96c Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 18 七月 2025 17:30:09 +0800
Subject: [PATCH] 封装部分业务代码，继续优化日志打印流程
---
api/DebugController.cs | 235 ++++++++++++++++++----------------------------------------
1 files changed, 73 insertions(+), 162 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index e6b697f..57215cd 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,11 +16,12 @@
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 {
/// <summary>
- /// 娴嬭瘯鐢細濡傛灉椤圭洰涓鍜岃澶囧鎺ワ紝鍓嶆湡璁惧鏃犳硶娴嬭瘯锛岀敤鎺ュ彛妯℃嫙
+ /// 娴嬭瘯鐢�濡傛灉椤圭洰涓鍜岃澶囧鎺�鍓嶆湡璁惧鏃犳硶娴嬭瘯,鐢ㄦ帴鍙ｆā鎷� /// </summary>
[RoutePrefix("api")]
public class DebugController : ApiController {
@@ -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>
@@ -215,7 +90,7 @@
}
/// <summary>
- /// DEBUG锛氭ā鎷熻緭閫佺嚎浜х嚎婊℃墭鐩樹笅绾挎祦绋�+ /// DEBUG:妯℃嫙杈撻�绾夸骇绾挎弧鎵樼洏涓嬬嚎娴佺▼
/// </summary>
/// <param name="model"></param>
/// <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:妯℃嫙Erp涓嬪彂鍑哄簱璁″垝鍗� /// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -247,7 +175,7 @@
}
/// <summary>
- /// 锛堝唴閮ㄦ柟娉曡鍕胯皟鐢級妯℃嫙鍙栬揣瀹屾垚鍙嶉Erp鍥炴姤缁撴灉锛堥粯璁や负success锛�+ /// (鍐呴儴鏂规硶璇峰嬁璋冪敤) 妯℃嫙鍙栬揣瀹屾垚鍙嶉Erp鍥炴姤缁撴灉 (榛樿涓簊uccess)
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -268,7 +196,7 @@
}
/// <summary>
- /// 锛堝唴閮ㄦ柟娉曡鍕胯皟鐢級妯℃嫙浠诲姟鍒涘缓瀹屾垚鍙嶉Erp鍥炴姤缁撴灉锛堥粯璁や负success锛�+ /// (鍐呴儴鏂规硶璇峰嬁璋冪敤) 妯℃嫙浠诲姟鍒涘缓瀹屾垚鍙嶉Erp鍥炴姤缁撴灉 (榛樿涓簊uccess)
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -289,17 +217,23 @@
}
}
+ public class GoodpackToProdLineInfo {
+ public string CntrCode { get; set; }
+ public string StartLoc { get; set; }
+ public string EndLoc { get; set; }
+ }
+
public class TestErpSendOutboundPlanInfo {
/// <summary>
- /// 鍑哄簱璁″垝鍗曞彿锛堣鍒掑崟鍙�jhdh锛�+ /// 鍑哄簱璁″垝鍗曞彿 (璁″垝鍗曞彿 jhdh)
/// </summary>
public string PlanNo { get; set; } = string.Empty;
/// <summary>
- /// 鐗╂枡缂栫爜锛堜骇鍝佷唬鐮�cpdm锛�+ /// 鐗╂枡缂栫爜 (浜у搧浠ｇ爜 cpdm)
/// </summary>
public string ItemCode { get; set; } = string.Empty;
/// <summary>
- /// 鐗╂枡鏁伴噺锛堟淳瑁呬欢鏁�pzjs锛�+ /// 鐗╂枡鏁伴噺 (娲捐浠舵暟 pzjs)
/// </summary>
public float ItemNum { get; set; } = 0;
}
@@ -311,11 +245,11 @@
public class AddInboundTaskInfo {
/// <summary>
- /// 鐗╂枡缂栫爜锛堟殏鏃舵病鐢級
+ /// 鐗╂枡缂栫爜 (鏆傛椂娌＄敤)
/// </summary>
public string ItemCode { get; set; }
/// <summary>
- /// 鎵规鍙凤紙鏆傛椂娌＄敤锛�+ /// 鎵规鍙�(鏆傛椂娌＄敤)
/// </summary>
public string BatchNo { get; set; }
/// <summary>
@@ -329,7 +263,7 @@
}
/// <summary>
- /// 妯℃嫙 AGV 浼犻�淇″彿锛岀敤浜庢洿鏀逛换鍔＄姸鎬�+ /// 妯℃嫙 AGV 浼犻�淇″彿,鐢ㄤ簬鏇存敼浠诲姟鐘舵�
/// </summary>
public class UpdateTaskState {
/// <summary>
@@ -340,10 +274,6 @@
/// AGV 灏忚溅鍙� /// </summary>
public string ForkliftNo { set; get; }
- ///// <summary>
- ///// AGV 涓嬩竴涓姸鎬�- ///// </summary>
- //public int NextState { set; get; }
}
public class AgvReportsInfo {
@@ -356,18 +286,9 @@
/// </summary>
public string ForkliftNo { get; set; }
/// <summary>
- /// AGV 涓嬩竴鐘舵�锛堜换鍔″洖鎶ュ彿锛�+ /// AGV 涓嬩竴鐘舵� (浠诲姟鍥炴姤鍙�
/// </summary>
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>
@@ -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