From 0b679c8b18e2b598ff27cff2fa9ade2c46bde3be Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 16 六月 2025 17:30:32 +0800
Subject: [PATCH] 优化AGV调试和出库逻辑，完成部分ERP反馈代码
---
api/DebugController.cs | 371 +++++++++++++++-------------------------------------
1 files changed, 108 insertions(+), 263 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index d377395..4bee184 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -11,6 +11,8 @@
using Newtonsoft.Json;
+using SqlSugar;
+
using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
using static HH.WCS.Mobox3.DSZSH.core.Monitor;
@@ -19,8 +21,7 @@
/// 娴嬭瘯鐢細濡傛灉椤圭洰涓鍜岃澶囧鎺ワ紝鍓嶆湡璁惧鏃犳硶娴嬭瘯锛岀敤鎺ュ彛妯℃嫙
/// </summary>
[RoutePrefix("api")]
- public class DebugController : ApiController
- {
+ public class DebugController : ApiController {
/// <summary>
/// AGV鐘舵�涓�敭鍥炴姤134562
/// </summary>
@@ -29,22 +30,15 @@
[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();
- //}
+ ReturnResults returnResult = new ReturnResults();
+ returnResult.ResultList = new List<ReturnResult>();
var agvTaskState = new AgvTaskState() {
task_no = model.TaskID,
forklift_no = model.ForkliftNo,
- state = 1
};
- ReturnResults returnResult = new ReturnResults();
- returnResult.ResultList = new List<ReturnResult>();
+ agvTaskState.state = 1;
var temp1 = WCSCore.OperateAgvTaskStatus(agvTaskState);
returnResult.ResultList.Add(temp1);
@@ -67,6 +61,67 @@
agvTaskState.state = 2;
var temp2 = WCSCore.OperateAgvTaskStatus(agvTaskState);
returnResult.ResultList.Add(temp2);
+
+ return returnResult;
+ }
+
+ [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;
}
@@ -137,104 +192,12 @@
/// <returns></returns>
[HttpPost]
[Route("CreateDatabase")]
- public string CreateDatabase(FalseOk model) {
+ public string CreateDatabase() {
try {
- if (model.JumpOut) {
- return "璺冲嚭";
- }
var db = new SqlHelper<object>().GetInstance();
var entityTypes = new Type[] {
- //typeof(TN_CAR_IN),
- //typeof(TN_CG_Detail),
- //typeof(TN_Container),
- //typeof(TN_Loc_Container),
- //typeof(TN_Location),
- //typeof(TN_Task),
- //typeof(TN_Task_Action),
- //typeof(SysHelper.OI_SYS_MAXID),
-
- //typeof(TN_Inbound_Order),
- //typeof(TN_Check_Detail),
- //typeof(TN_Check_Order),
- //typeof(TN_CNTR_ITEM),
- //typeof(TN_Outbound_Detail),
- //typeof(TN_Outbound_Order),
- //typeof(TN_Shift_Order),
- //typeof(TN_Shift_Detail)
-
- //typeof(TN_Container_Item),
};
-
- //var areaNameList = new List<string>();
- //foreach (var area in Settings.Areas) {
- // areaNameList.AddRange(area.Codes);
- //}
-
- //var locationList = new List<TN_Location>();
- //foreach (var area in areaNameList) {
- // int i = 0;
- // int j = 0;
- // int k = 0;
-
- // if (area == "KXHJQ" || area == "MTHJQ" || area == "MXHJQ") {
- // for (i = 1; i <= 4; i++) {
- // for (j = 1; j <= 5; j++) {
- // for (k = 1; k <= 3; k++) {
- // locationList.Add(new TN_Location() {
- // N_ROW = i,
- // N_COL = j,
- // N_LAYER = k,
- // S_AREA_CODE = area,
- // S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}" +
- // $"-{k.ToString().PadLeft(2, '0')}"
- // });
- // }
- // }
- // }
- // continue;
- // }
-
- // if (area == "BZQ") {
- // for (i = 1; i <= 2; i++) {
- // for (j = 1; j <= 2; j++) {
- // locationList.Add(new TN_Location() {
- // N_ROW = i,
- // N_COL = j,
- // S_AREA_CODE = area,
- // S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}"
- // });
- // }
- // }
- // continue;
- // }
-
- // i = 1;
- // for (j = 1; j <= 5; j++) {
- // locationList.Add(new TN_Location() {
- // N_ROW = i,
- // N_COL = j,
- // S_AREA_CODE = area,
- // S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}"
- // });
- // }
-
-
- //}
-
-
-
- //using (var tran = db.Ado.UseTran()) {
- // //db.CodeFirst.InitTables(entityTypes);
- // if (db.Insertable<TN_Location>(locationList).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // return "澶辫触";
- // }
-
- // tran.CommitTran();
-
-
- //}
}
catch (Exception ex) {
@@ -242,89 +205,6 @@
return "鍒濆鍖栨暟鎹簱閿欒" + ex.Message;
}
return "鎴愬姛";
- }
-
- /// <summary>
- /// DEBUG锛氭彃鍏ヨ揣浣嶃�瀹瑰櫒銆佽揣鍝佷俊鎭�- /// </summary>
- /// <returns></returns>
- [HttpPost]
- [Route("InsertLocCntrCg")]
- public string InsertLocCntrCg(LocCntrCg locCntrCg) {
- var db = new SqlHelper<object>().GetInstance();
-
- try {
-
- using (var tran = db.UseTran()) {
- LogHelper.Info("LogCntrCg锛� + JsonConvert.SerializeObject(locCntrCg));
- if (string.IsNullOrEmpty(locCntrCg.LocCode)) return "";
-
- var loc = db.Queryable<TN_Location>().First(a => a.S_CODE == locCntrCg.LocCode);
- if (loc == null) {
- var newLoc = new TN_Location {
- S_CODE = locCntrCg.LocCode,
- S_AREA_CODE = locCntrCg.LocArea ?? ""
- };
-
- if (db.Insertable<TN_Location>(newLoc).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info($"鎻掑叆浣嶇疆{locCntrCg.LocCode}澶辫触");
- return "鎻掑叆澶辫触";
- }
-
- loc = newLoc;
- }
-
- if (string.IsNullOrEmpty(locCntrCg.CntrCode)) {
- LogHelper.Info("瀹瑰櫒鍙蜂负绌猴紝涓嶅啀璇诲彇鍚庨潰鐨勬暟鎹�);
- return "";
- }
-
- var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == locCntrCg.LocCode
- && a.S_CNTR_CODE == locCntrCg.CntrCode);
-
- if (locCntrRel == null) {
- var newLocCntrRel = new TN_Loc_Container {
- S_LOC_CODE = locCntrCg.LocCode,
- S_CNTR_CODE = locCntrCg.CntrCode,
- S_CNTR_TYPE = locCntrCg.CntrType ?? ""
- };
-
- loc.N_CURRENT_NUM = 1;
-
- if (db.Insertable<TN_Loc_Container>(newLocCntrRel).ExecuteCommand() <= 0
- && db.Updateable<TN_Location>(loc).UpdateColumns(c => c.N_CURRENT_NUM).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info($"鎻掑叆浣嶇疆鎵樼洏鍏崇郴{locCntrCg.LocCode}-{locCntrCg.CntrCode}澶辫触");
- return "鎻掑叆澶辫触";
- }
- }
-
- if (string.IsNullOrEmpty(locCntrCg.ItemCode)) {
- LogHelper.Info("鐗╂枡鍙蜂负绌猴紝涓嶅啀璇诲彇鍚庨潰鐨勬暟鎹�);
- return "";
- }
-
- var cgDetail = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == locCntrCg.CntrCode
- && a.S_ITEM_CODE == locCntrCg.ItemCode);
- if (cgDetail == null) {
- var locList = new List<TN_CG_Detail>();
- locList.Add(new TN_CG_Detail { S_CNTR_CODE = locCntrCg.CntrCode, S_ITEM_CODE = locCntrCg.ItemCode, S_BATCH_NO = locCntrCg.BatchNo ?? "" });
- if (db.Insertable<TN_CG_Detail>(locList).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info($"鎻掑叆鎵樼洏鐗╂枡鍏崇郴{locCntrCg.CntrCode}-{locCntrCg}澶辫触");
- return "鎻掑叆澶辫触";
- }
- }
- tran.CommitTran();
- }
-
- return "鎻掑叆鏁版嵁鎴愬姛";
-
- }
- catch (Exception ex) {
- return $"Error reading CSV file: {ex.Message}";
- }
}
/// <summary>
@@ -338,80 +218,49 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱;
- var startAreaName = AreaName.B鍖呰鍖�
+ const string taskName = TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱;
+ const string startAreaName = AreaName.B鍖呰鍖�
+ const string endAreaName = AreaName.M婊℃墭璐ф灦鍖�
+ const string cntrType = "鎵樼洏";
try {
-
- var itemCode = model.ItemCode;
- var batchNo = model.BatchNo;
var cntrCode = model.CntrCode;
var startLocCode = model.StartLoc;
- var cgDetail = new TN_CG_Detail {
- S_ITEM_CODE = itemCode,
- S_BATCH_NO = batchNo,
- S_CNTR_CODE = cntrCode,
- };
-
- var needInsertContainer = false;
- var needUpdateContainer = false;
- // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�- var cntr = db.Queryable<TN_Container>()
- .Where(c => c.S_CODE == cntrCode).First();
- // 濡傛灉鎵句笉鍒拌瀹瑰櫒锛岄渶瑕佹坊鍔狅紝骞朵笖灏嗗鍣ㄦ潵婧愯缃负浠诲姟鍚嶇О
- if (cntr == null) {
- needInsertContainer = true;
- LogHelper.Info($"杞锛歿taskName}锛氬鍣細{cntrCode}锛屽湪瀹瑰櫒琛ㄤ腑娌℃湁鐧昏锛岀櫥璁板苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
-
- cntr = new TN_Container {
- S_CODE = cntrCode,
- S_TYPE = "鎵樼洏",
- S_SPEC = itemCode,
- S_SOURCE = taskName,
- };
- }
- else {
- // 濡傛灉鎵惧埌璇ュ鍣紝浣嗗鍣ㄧ墿鏂欑被鍨嬩笌涓嬬嚎鐗╂枡涓嶇锛岃褰曞苟鐩存帴瑕嗙洊锛堝緟瀹氾級
- if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != itemCode) {
- needUpdateContainer = true;
- LogHelper.Info($"杞锛歿taskName}锛氬鍣ㄨ〃涓鍣▄cntrCode}瀵瑰簲鐨勭墿鏂欎俊鎭細{cntr.S_SPEC}锛� +
- $"涓庢墍闇�鐨勭墿鏂欎俊鎭瘂itemCode}涓嶇锛岀洿鎺ヨ鐩栫粨鏋�);
-
- cntr.S_SPEC = itemCode;
- cntr.S_SOURCE = taskName;
- }
- }
-
var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == startLocCode) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(l => l.N_CURRENT_NUM == 0)
- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => l.S_CODE == startLocCode)
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓� .First();
if (startLoc == null) {
- info = $"璧风偣浣嶇疆 '{startLocCode}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{startLocCode}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
LogHelper.Info(info);
return info;
}
+ var locCntrRelOld = db.Queryable<TN_Loc_Container>()
+ .Where(c => c.S_CNTR_CODE == cntrCode).First();
+
// 缁戝畾璐т綅鍜屽鍣ㄥ彿
var locCntrRel = new TN_Loc_Container {
S_LOC_CODE = startLocCode,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_CNTR_TYPE = "鎵樼洏",
+ S_CNTR_CODE = cntrCode,
+ S_CNTR_TYPE = cntrType,
};
+ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�+
var endLoc = db.Queryable<TN_Location>()
- .Where(a => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.Contains(a.S_AREA_CODE))
+ .Where(a => Settings.AreaMap[endAreaName].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)
.First();
if (endLoc == null) {
- info = "绌烘墭鍏ュ簱鏆傛椂娌℃湁鍚堥�鐨勮揣浣嶅彲浠ュ叆搴�;
+ info = $"鍦ㄧ粓鐐硅揣鍖�{endAreaName}'涓紝娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0";
LogHelper.Info(info);
return info;
}
@@ -423,25 +272,11 @@
LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鎻掑叆瀹瑰櫒璐у搧淇℃伅琛ㄥけ璐ワ細鐗╂枡缂栫爜{cgDetail.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cgDetail.S_CNTR_CODE}";
- LogHelper.Info(info);
- return info;
- }
-
- if (needInsertContainer) {
- if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
- info = $"鎻掑叆瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
+ if (locCntrRelOld != null) {
+ if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0 &&
+ db.Updateable<TN_Location>().SetColumns(l => l.N_CURRENT_NUM == 0).Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).ExecuteCommand() <= 0) {
tran.RollbackTran();
- LogHelper.Info(info);
- return info;
- }
- }
- else if (needUpdateContainer) {
- if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
- info = $"鏇存柊瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
- tran.RollbackTran();
+ info = $"鍒犻櫎鏃ц揣浣嶅鍣ㄥ叧绯昏〃澶辫触锛氳揣浣嶇紪鐮亄locCntrRelOld.S_LOC_CODE}锛屽鍣ㄧ紪鐮亄locCntrRelOld.S_CNTR_CODE}";
LogHelper.Info(info);
return info;
}
@@ -454,12 +289,7 @@
return info;
}
- if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
- it.N_LOCK_STATE,
- it.S_LOCK_STATE,
- it.S_LOCK_OP,
- it.T_MODIFY
- }).ExecuteCommand() <= 0) {
+ if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
@@ -501,11 +331,11 @@
public class AddInboundTaskInfo {
/// <summary>
- /// 鐗╂枡缂栫爜
+ /// 鐗╂枡缂栫爜锛堟殏鏃舵病鐢級
/// </summary>
public string ItemCode { get; set; }
/// <summary>
- /// 鎵规鍙�+ /// 鎵规鍙凤紙鏆傛椂娌＄敤锛� /// </summary>
public string BatchNo { get; set; }
/// <summary>
@@ -536,6 +366,21 @@
//public int NextState { set; get; }
}
+ public class AgvReportsInfo {
+ /// <summary>
+ /// 浠诲姟鍙�+ /// </summary>
+ public string TaskId { set; get; }
+ /// <summary>
+ /// AGV 灏忚溅鍙�+ /// </summary>
+ public string ForkliftNo { get; set; }
+ /// <summary>
+ /// AGV 涓嬩竴鐘舵�锛堜换鍔″洖鎶ュ彿锛�+ /// </summary>
+ public int NextState { set; get; } = 0;
+ }
+
public class FalseOk {
public bool JumpOut { set; get; } = true;
}
--
Gitblit v1.9.1