From f703b278956736aa14c12d1d25c8e8f23b822760 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 26 六月 2025 17:27:32 +0800
Subject: [PATCH] 优化国自辅助调度和任务推送逻辑
---
api/DebugController.cs | 206 +++++++++++++++++++++++----------------------------
1 files changed, 93 insertions(+), 113 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index 4bee184..e6b697f 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -14,6 +14,7 @@
using SqlSugar;
using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
+using static HH.WCS.Mobox3.DSZSH.api.OtherModel;
using static HH.WCS.Mobox3.DSZSH.core.Monitor;
namespace HH.WCS.Mobox3.DSZSH.api {
@@ -65,6 +66,12 @@
return returnResult;
}
+ /// <summary>
+ /// 妯℃嫙AGV鍥炴姤浠诲姟鐘舵�锛堟寚瀹氫笅涓�釜鐘舵�锛岀敤浜庨渶瑕佸垎娈垫祴璇曠殑鍦烘櫙锛�br/>
+ /// 鎬ц兘鐩稿杈冨樊锛屼粎鐢ㄤ簬娴嬭瘯锛屼竴鑸笉浣跨敤
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
[HttpPost]
[Route("AgvReports")]
public ReturnResults AgvReports(AgvReportsInfo model) {
@@ -196,9 +203,9 @@
try {
var db = new SqlHelper<object>().GetInstance();
- var entityTypes = new Type[] {
- };
+ var entityTypes = new Type[] { };
+ //db.CodeFirst.InitTables(entityTypes);
}
catch (Exception ex) {
LogHelper.Info($"鍙戠敓浜嗗紓甯�);
@@ -215,118 +222,91 @@
[HttpPost]
[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 cntrCode = model.CntrCode;
- var startLocCode = model.StartLoc;
-
- 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 (startLoc == null) {
- 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 = 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_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) {
- LogHelper.InfoEx(ex);
- return ex.Message;
- }
+ return WCSCore.CreateInboundTask(model.StartLoc, model.CntrCode).Content;
}
+
+ /// <summary>
+ /// 妯℃嫙Erp涓嬪彂鍑哄簱璁″垝鍗�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [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 = "瀹炲彂浠舵暟鏈‘瀹�
+ };
+ }
+
+ 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 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 {
--
Gitblit v1.9.1