From 1b6bf29ff7daa1987de65940af52f452cabd6881 Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期二, 15 七月 2025 17:27:50 +0800 Subject: [PATCH] 优化AGV任务部分日志、货位绑定内部方法 --- api/DebugController.cs | 485 +++++++++++++++++++++++++++++++++-------------------- 1 files changed, 298 insertions(+), 187 deletions(-) diff --git a/api/DebugController.cs b/api/DebugController.cs index 425fc6e..dd1d711 100644 --- a/api/DebugController.cs +++ b/api/DebugController.cs @@ -4,20 +4,26 @@ 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 SqlSugar; + 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 - { + public class DebugController : ApiController { /// <summary> /// AGV鐘舵�涓�敭鍥炴姤134562 /// </summary> @@ -26,14 +32,15 @@ [HttpPost] [Route("AGVSeriesReports")] public ReturnResults AGVSeriesReports(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 agvTaskState = new AgvTaskState() { + task_no = model.TaskID, + forklift_no = model.ForkliftNo, + }; + + agvTaskState.state = 1; var temp1 = WCSCore.OperateAgvTaskStatus(agvTaskState); returnResult.ResultList.Add(temp1); @@ -61,212 +68,324 @@ } /// <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> [HttpPost] [Route("CreateDatabase")] - public string CreateDatabase(CoverInfo model) { - var cover = model.IsCover; + public string CreateDatabase() { try { 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), + var entityTypes = new Type[] { }; - //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), - }; - - 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); - //} - - // 鍒涘缓鏂拌〃 - db.CodeFirst.InitTables(entityTypes); - - //db.CodeFirst.BackupTable().InitTables(entityTypes); - } - else { - db.CodeFirst.InitTables(entityTypes); - } - - tran.CommitTran(); - } - + //db.CodeFirst.InitTables(entityTypes); } 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) { - 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}"; - } + [Route("AddInboundTask")] + public string AddInboundTask(AddInboundTaskInfo model) { + return WCSCore.CreateInboundTask(model.StartLoc, model.CntrCode).Content; } /// <summary> - /// DEBUG锛氭牴鎹鍣ㄧ墿鏂欎俊鎭〃锛屾彃鍏ュ鍣ㄧ墿鏂欑櫥璁颁俊鎭〃 + /// DEBUG锛氭ā鎷熶汉宸ュ皢鏂欑鎼繍鍒颁骇绾夸笂绾垮彛锛堢洿鎺ヤ慨鏀规暟鎹簱锛� /// </summary> + /// <param name="model"></param> /// <returns></returns> [HttpPost] - [Route("InsertContainerItemByCgDetail")] - public string InsertContainerItemByCgDetail(CoverInfo _) { + [Route("GoodpackToProdLine")] + public string GoodpackToProdLine(GoodpackToProdLineInfo model) { + var db = new SqlHelper<object>().GetInstance(); try { - var cgDetailList = db.Queryable<TN_CG_Detail>().ToList(); - var cntrItemList = new List<TN_Container_Item>(); - foreach (var cgDetail in cgDetailList) { - if (db.Queryable<TN_Container_Item>().Where(i => i.S_CNTR_CODE == cgDetail.S_CNTR_CODE).Any()) { - continue; + // 鏌ヨ璧风偣璐т綅锛氭暟閲�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<TN_Location>(startLoc).ExecuteCommand() <= 0 && + db.Updateable<TN_Location>(endLoc).ExecuteCommand() <= 0 && + db.Updateable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) { + + tran.RollbackTran(); + return "鏁版嵁搴撴搷浣滃け璐ワ紒"; } - cntrItemList.Add(new TN_Container_Item { - S_CNTR_CODE = cgDetail.S_CNTR_CODE, - S_ITEM_CODE = cgDetail.S_ITEM_CODE, - }); + tran.CommitTran() ; + return "鏁版嵁搴撴搷浣滄垚鍔�; } - - if (db.Insertable<TN_Container_Item>(cntrItemList).ExecuteCommand() <= 0) { - return "鎻掑叆澶辫触"; - } - - return "鎻掑叆鎴愬姛"; } catch (Exception ex) { - LogHelper.InfoEx(ex); return ex.Message; } } /// <summary> - /// DEBUG锛氭牴鎹鍣ㄧ墿鏂欎俊鎭〃锛屾彃鍏ュ鍣ㄧ墿鏂欑櫥璁颁俊鎭〃 + /// DEBUG锛氭ā鎷烢rp涓嬪彂鍑哄簱璁″垝鍗� /// </summary> + /// <param name="model"></param> /// <returns></returns> [HttpPost] - [Route("InsertContainerItem")] - public string InsertContainerItem(InsertCntrItemInfo cgDetail) { - var db = new SqlHelper<object>().GetInstance(); - try { - var cntrItem = new TN_Container_Item { - S_CNTR_CODE = cgDetail.Cntr, - S_ITEM_CODE = cgDetail.Item, + [Route("TestErpSendOutboundPlan")] + public ErpResult TestErpSendOutboundPlan(TestErpSendOutboundPlanInfo model) { + var apiName = "ERP涓嬪彂鍑哄簱璁″垝鍗�; + //LogHelper.InfoApi(apiName, model); + + var erpModel = new ErpSendOutboundPlanInfo(); + erpModel.jhdh = model.PlanNo; + erpModel.cpdm = model.ItemCode; + erpModel.pzjs = model.ItemNum; + + LogHelper.InfoApi(apiName, erpModel); + + return ApiHelper.ErpSendOutboundPlan(erpModel); + } + + /// <summary> + /// 锛堝唴閮ㄦ柟娉曡鍕胯皟鐢級妯℃嫙鍙栬揣瀹屾垚鍙嶉Erp鍥炴姤缁撴灉锛堥粯璁や负success锛�+ /// </summary> + /// <param name="model"></param> + /// <returns></returns> + [HttpPost] + [Route("PickUpReturn")] + public TestErpResult PickUpReturn(PickUpReturnErpInfo model) { + if (model.sfjs == 0) { + return new TestErpResult { + code = 1, + message = "瀹炲彂浠舵暟鏈‘瀹� }; - - if (db.Insertable<TN_Container_Item>(cntrItem).ExecuteCommand() <= 0) { - return "鎻掑叆澶辫触"; - } - - return "鎻掑叆鎴愬姛"; } - catch (Exception ex) { - LogHelper.InfoEx(ex); - return ex.Message; - } + return new TestErpResult { + code = 0, + message = "success" + }; } + + /// <summary> + /// 锛堝唴閮ㄦ柟娉曡鍕胯皟鐢級妯℃嫙浠诲姟鍒涘缓瀹屾垚鍙嶉Erp鍥炴姤缁撴灉锛堥粯璁や负success锛�+ /// </summary> + /// <param name="model"></param> + /// <returns></returns> + [HttpPost] + [Route("CreateTaskReturn")] + public TestErpResult CreateTaskReturn(CreateTaskReturnErpInfo model) { + if (model.hw == "") { + return new TestErpResult { + code = 1, + message = "璐т綅淇℃伅鏈彁渚� + }; + } + + return new TestErpResult { + code = 0, + message = "success" + }; + } + } + + public class GoodpackToProdLineInfo { + public string CntrCode { get; set; } + public string StartLoc { get; set; } + public string EndLoc { get; set; } + } + + public class TestErpSendOutboundPlanInfo { + /// <summary> + /// 鍑哄簱璁″垝鍗曞彿锛堣鍒掑崟鍙�jhdh锛�+ /// </summary> + public string PlanNo { get; set; } = string.Empty; + /// <summary> + /// 鐗╂枡缂栫爜锛堜骇鍝佷唬鐮�cpdm锛�+ /// </summary> + public string ItemCode { get; set; } = string.Empty; + /// <summary> + /// 鐗╂枡鏁伴噺锛堟淳瑁呬欢鏁�pzjs锛�+ /// </summary> + public float ItemNum { get; set; } = 0; + } + + public class TestErpResult { + public int code { get; set; } + public string message { get; set; } + } + + 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> @@ -281,19 +400,21 @@ /// AGV 灏忚溅鍙� /// </summary> public string ForkliftNo { set; get; } + } + + public class AgvReportsInfo { /// <summary> - /// AGV 涓嬩竴涓姸鎬�+ /// 浠诲姟鍙� /// </summary> - public int NextState { set; get; } - } - - public class CoverInfo { - public bool IsCover { set; get; } = false; - } - - public class InsertCntrItemInfo { - public string Cntr { set; get; } - public string Item { set; get; } + public string TaskId { set; get; } + /// <summary> + /// AGV 灏忚溅鍙�+ /// </summary> + public string ForkliftNo { get; set; } + /// <summary> + /// AGV 涓嬩竴鐘舵�锛堜换鍔″洖鎶ュ彿锛�+ /// </summary> + public int NextState { set; get; } = 0; } /// <summary> @@ -303,14 +424,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