From 99d001bbf2a0371373e15c97d3c6c7dcf45e97e3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 13 六月 2025 15:44:22 +0800
Subject: [PATCH] 修复空托上线与满托下线联调的逻辑错误
---
api/DebugController.cs | 408 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 313 insertions(+), 95 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index 2a5c8bd..836c7d7 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -3,12 +3,16 @@
using System.Runtime.ConstrainedExecution;
using System.Web.Http;
+using HH.WCS.Mobox3.DSZSH.core;
+using HH.WCS.Mobox3.DSZSH.device;
using HH.WCS.Mobox3.DSZSH.models;
using HH.WCS.Mobox3.DSZSH.util;
+using HH.WCS.Mobox3.DSZSH.wms;
using Newtonsoft.Json;
using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
+using static HH.WCS.Mobox3.DSZSH.core.Monitor;
namespace HH.WCS.Mobox3.DSZSH.api {
/// <summary>
@@ -18,15 +22,113 @@
public class DebugController : ApiController
{
/// <summary>
- /// 妯℃嫙 AGV 澶氭鍥炴姤浠诲姟鐘舵�
+ /// AGV鐘舵�涓�敭鍥炴姤134562
/// </summary>
/// <param name="model">瀹瑰櫒鍙�/param>
/// <returns></returns>
[HttpPost]
- [Route("AgvSeriesReports")]
- public ReturnResults AgvSeriesReports(UpdateTaskState model)
- {
- return new ReturnResults();
+ [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,
+ 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);
+
+ 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);
+
+ 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>
@@ -35,9 +137,11 @@
/// <returns></returns>
[HttpPost]
[Route("CreateDatabase")]
- public string CreateDatabase(CoverInfo model) {
- var cover = model.IsCover;
+ public string CreateDatabase(FalseOk model) {
try {
+ if (model.JumpOut) {
+ return "璺冲嚭";
+ }
var db = new SqlHelper<object>().GetInstance();
var entityTypes = new Type[] {
@@ -51,127 +155,236 @@
//typeof(SysHelper.OI_SYS_MAXID),
//typeof(TN_Inbound_Order),
- typeof(TN_Check_Detail),
+ //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),
};
- using (var tran = db.Ado.UseTran()) {
- if (cover) {
- // 鍒犻櫎鎵�湁琛紙鎸変緷璧栧叧绯诲�搴忥級
- //var tables = db.DbMaintenance.GetTableInfoList();
- //foreach (var table in tables.OrderByDescending(t => t.Name)) {
- // db.DbMaintenance.DropTable(table.Name);
- //}
+ //using (var tran = db.Ado.UseTran()) {
+ // //db.CodeFirst.InitTables(entityTypes);
+ // if (db.Insertable<TN_Location>(locationList).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // return "澶辫触";
+ // }
- // 鍒涘缓鏂拌〃
- db.CodeFirst.InitTables(entityTypes);
+ // tran.CommitTran();
- //db.CodeFirst.BackupTable().InitTables(entityTypes);
- }
- else {
- db.CodeFirst.InitTables(entityTypes);
- }
-
- tran.CommitTran();
- }
+
+ //}
}
catch (Exception ex) {
LogHelper.Info($"鍙戠敓浜嗗紓甯�);
return "鍒濆鍖栨暟鎹簱閿欒" + ex.Message;
}
-
return "鎴愬姛";
}
/// <summary>
- /// DEBUG锛氭彃鍏ヨ揣浣嶃�瀹瑰櫒銆佽揣鍝佷俊鎭�+ /// DEBUG锛氭ā鎷熻緭閫佺嚎浜х嚎婊℃墭鐩樹笅绾挎祦绋� /// </summary>
+ /// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- [Route("InsertLocCntrCg")]
- public string InsertLocCntrCg(LocCntrCg locCntrCg) {
+ [Route("AddInboundTask")]
+ public string AddInboundTask(AddInboundTaskInfo model) {
var db = new SqlHelper<object>().GetInstance();
+ var info = "";
+
+ 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,
+ //};
- using (var tran = db.UseTran()) {
- LogHelper.Info("LogCntrCg锛� + JsonConvert.SerializeObject(locCntrCg));
- if (string.IsNullOrEmpty(locCntrCg.LocCode)) return "";
+ //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}");
- 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 ?? ""
- };
+ // 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}涓嶇锛岀洿鎺ヨ鐩栫粨鏋�);
- if (db.Insertable<TN_Location>(newLoc).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info($"鎻掑叆浣嶇疆{locCntrCg.LocCode}澶辫触");
- return "鎻掑叆澶辫触";
- }
+ // cntr.S_SPEC = itemCode;
+ // cntr.S_SOURCE = taskName;
+ // }
+ //}
- loc = newLoc;
- }
+ var startLoc = db.Queryable<TN_Location>()
+ .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 (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();
+ if (startLoc == null) {
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{startLocCode}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
+ LogHelper.Info(info);
+ return info;
}
- return "鎻掑叆鏁版嵁鎴愬姛";
+ 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 = cntrCode,
+ S_CNTR_TYPE = cntrType,
+ };
+
+ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�+
+ var endLoc = db.Queryable<TN_Location>()
+ .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 = $"鍦ㄧ粓鐐硅揣鍖�{endAreaName}'涓紝娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0";
+ LogHelper.Info(info);
+ return info;
+ }
+
+ var cntId = locCntrRel.S_CNTR_CODE;
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+
+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+
+ using (var tran = db.Ado.UseTran()) {
+ 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();
+ info = $"鍒犻櫎鏃ц揣浣嶅鍣ㄥ叧绯昏〃澶辫触锛氳揣浣嶇紪鐮亄locCntrRelOld.S_LOC_CODE}锛屽鍣ㄧ紪鐮亄locCntrRelOld.S_CNTR_CODE}";
+ LogHelper.Info(info);
+ return info;
+ }
+ }
+ //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);
+ // tran.RollbackTran();
+ // LogHelper.Info(info);
+ // return info;
+ // }
+ //}
+ //else if (needUpdateContainer) {
+ // if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ // info = $"鏇存柊瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
+ // tran.RollbackTran();
+ // LogHelper.Info(info);
+ // return info;
+ // }
+ //}
+
+ if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴琛ㄥけ璐ワ細璐т綅缂栫爜{locCntrRel.S_LOC_CODE}锛屽鍣ㄧ紪鐮亄locCntrRel.S_CNTR_CODE}";
+ LogHelper.Info(info);
+ 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, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+ LogHelper.Info(info);
+ return info;
+ }
+
+ if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
+ it.N_LOCK_STATE,
+ it.S_LOCK_STATE,
+ it.S_LOCK_OP,
+ it.T_MODIFY
+ }).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+ LogHelper.Info(info);
+ return info;
+ }
+
+ if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ LogHelper.Info(info);
+ return info;
+ }
+
+ tran.CommitTran();
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ LogHelper.Info(info);
+ return info;
+ }
}
catch (Exception ex) {
- return $"Error reading CSV file: {ex.Message}";
+ LogHelper.InfoEx(ex);
+ return ex.Message;
}
}
+ }
+
+ 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; }
}
/// <summary>
@@ -186,14 +399,19 @@
/// 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 CoverInfo {
- public bool IsCover { set; get; } = false;
+ public class FalseOk {
+ public bool JumpOut { set; get; } = true;
+ }
+
+ public class InsertCntrItemInfo {
+ public string Cntr { set; get; }
+ public string Item { set; get; }
}
/// <summary>
--
Gitblit v1.9.1