From d944fda9f2fbf27d83e8fdf880e8fe5267e1f541 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 04 六月 2025 17:24:13 +0800
Subject: [PATCH] 优化空托空箱入库兼容出库容器回库场景，修复货位容器绑定的类型丢失问题
---
api/DebugController.cs | 424 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 397 insertions(+), 27 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index 2ce3d54..105b0e6 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -4,12 +4,15 @@
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>
@@ -26,6 +29,14 @@
[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();
+ //}
+
var agvTaskState = new AgvTaskState() {
task_no = model.TaskID,
forklift_no = model.ForkliftNo,
@@ -61,14 +72,76 @@
}
/// <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>
[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[] {
@@ -82,41 +155,92 @@
//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);
- //}
+ //var areaNameList = new List<string>();
+ //foreach (var area in Settings.Areas) {
+ // areaNameList.AddRange(area.Codes);
+ //}
- // 鍒涘缓鏂拌〃
- db.CodeFirst.InitTables(entityTypes);
+ //var locationList = new List<TN_Location>();
+ //foreach (var area in areaNameList) {
+ // int i = 0;
+ // int j = 0;
+ // int k = 0;
- //db.CodeFirst.BackupTable().InitTables(entityTypes);
- }
- else {
- db.CodeFirst.InitTables(entityTypes);
- }
+ // 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;
+ // }
- tran.CommitTran();
- }
+ // 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) {
LogHelper.Info($"鍙戠敓浜嗗紓甯�);
return "鍒濆鍖栨暟鎹簱閿欒" + ex.Message;
}
-
return "鎴愬姛";
}
@@ -130,7 +254,6 @@
var db = new SqlHelper<object>().GetInstance();
try {
-
using (var tran = db.UseTran()) {
LogHelper.Info("LogCntrCg锛� + JsonConvert.SerializeObject(locCntrCg));
@@ -203,6 +326,248 @@
return $"Error reading CSV file: {ex.Message}";
}
}
+
+ /// <summary>
+ /// DEBUG锛氭牴鎹鍣ㄧ墿鏂欎俊鎭〃锛屾彃鍏ュ鍣ㄧ墿鏂欑櫥璁颁俊鎭〃
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("InsertContainerItemByCgDetail")]
+ public string InsertContainerItemByCgDetail(FalseOk _) {
+ var db = new SqlHelper<object>().GetInstance();
+ try {
+ var cgDetailList = db.Queryable<TN_CG_Detail>().ToList();
+ var cntrItemList = new List<TN_Container_ItemType>();
+ foreach (var cgDetail in cgDetailList) {
+ if (db.Queryable<TN_Container_ItemType>().Where(i => i.S_CNTR_CODE == cgDetail.S_CNTR_CODE).Any()) {
+ continue;
+ }
+
+ cntrItemList.Add(new TN_Container_ItemType {
+ S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ S_ITEM_CODE = cgDetail.S_ITEM_CODE,
+ });
+ }
+
+ if (db.Insertable<TN_Container_ItemType>(cntrItemList).ExecuteCommand() <= 0) {
+ return "鎻掑叆澶辫触";
+ }
+
+ return "鎻掑叆鎴愬姛";
+ }
+ catch (Exception ex) {
+
+ LogHelper.InfoEx(ex);
+ return ex.Message;
+ }
+ }
+
+ /// <summary>
+ /// DEBUG锛氭牴鎹鍣ㄧ墿鏂欎俊鎭〃锛屾彃鍏ュ鍣ㄧ墿鏂欑櫥璁颁俊鎭〃
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("InsertContainerItem")]
+ public string InsertContainerItem(InsertCntrItemInfo cgDetail) {
+ var db = new SqlHelper<object>().GetInstance();
+ try {
+ var cntrItem = new TN_Container_ItemType {
+ S_CNTR_CODE = cgDetail.Cntr,
+ S_ITEM_CODE = cgDetail.Item,
+ };
+
+ if (db.Insertable<TN_Container_ItemType>(cntrItem).ExecuteCommand() <= 0) {
+ return "鎻掑叆澶辫触";
+ }
+
+ return "鎻掑叆鎴愬姛";
+ }
+ catch (Exception ex) {
+
+ LogHelper.InfoEx(ex);
+ return ex.Message;
+ }
+ }
+
+ /// <summary>
+ /// DEBUG锛氭ā鎷熻緭閫佺嚎浜х嚎婊℃墭鐩樹笅绾挎祦绋�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("AddInboundTask")]
+ public string AddInboundTask(AddInboundTaskInfo model) {
+ var db = new SqlHelper<object>().GetInstance();
+ var info = "";
+
+ var taskName = TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱;
+ var startAreaName = AreaName.B鍖呰鍖�
+
+ 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,
+ };
+
+ // BEG 姣忔杞閮芥鏌ュ搴斿鍣ㄦ槸鍚﹀凡鐧昏锛岀櫥璁颁繚鎸佷笉鍙橈紝鏈櫥璁板垯鎻掑叆
+ // TODO 鍙兘浼氶噰鐢ㄦ瘡娆′笂绾块兘鏇存柊鐨勯�杈戯紝鍚庨潰鍐嶇湅
+ var cntrItemRel = db.Queryable<TN_Container_ItemType>()
+ .Where(i => i.S_CNTR_CODE == cntrCode).First();
+
+ var insertTable = cntrItemRel == null;
+
+ if (insertTable) {
+ // 鏆傚畾鍦ㄦ弧鎵樹笅绾垮叆搴撶殑鏃跺�锛岀櫥璁版墭鐩樺鍣�鐗╂枡鍙峰叧绯伙紙鍚庨潰鍙兘浼氭敼鎴愮郴缁熺淮鎶わ級
+ cntrItemRel = new TN_Container_ItemType {
+ S_ITEM_CODE = itemCode,
+ S_CNTR_CODE = cntrCode,
+ S_CNTR_TYPE = "鎵樼洏",
+ };
+ }
+ // END
+
+ 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)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .First();
+
+ if (startLoc == null) {
+ info = $"璧风偣浣嶇疆 '{startLocCode}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+ LogHelper.Info(info);
+ return info;
+ }
+
+ // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+ var locCntrRel = new TN_Loc_Container {
+ S_LOC_CODE = startLocCode,
+ S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ S_CNTR_TYPE = "鎵樼洏",
+ };
+
+ var endLoc = db.Queryable<TN_Location>()
+ .Where(a => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.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 = "绌烘墭鍏ュ簱鏆傛椂娌℃湁鍚堥�鐨勮揣浣嶅彲浠ュ叆搴�;
+ 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 (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鎻掑叆瀹瑰櫒璐у搧淇℃伅琛ㄥけ璐ワ細鐗╂枡缂栫爜{cgDetail.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cgDetail.S_CNTR_CODE}";
+ LogHelper.Info(info);
+ return info;
+ }
+
+ // BEG 鎻掑叆鎴栨洿鏂板鍣ㄤ笌鐗╂枡绫诲瀷鐨勭粦瀹氳〃
+ if (insertTable) {
+ if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鐧昏瀹瑰櫒鐗╂枡绫诲瀷缁戝畾琛ㄥけ璐ワ細鐗╂枡缂栫爜{cntrItemRel.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cntrItemRel.S_CNTR_CODE}";
+ LogHelper.Info(info);
+ return info;
+ }
+ }
+ //else {
+ // if (db.Updateable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // info = $"鐧昏瀹瑰櫒鐗╂枡绫诲瀷缁戝畾琛ㄥけ璐ワ細鐗╂枡缂栫爜{cntrItemRel.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cntrItemRel.S_CNTR_CODE}";
+ // LogHelper.Info(info);
+ // return info;
+ // }
+ //}
+ // END
+
+ 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
+ }).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) {
+ 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>
@@ -217,14 +582,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