From f700376f49e285b5f743361f2487b871e7a1eeab Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期三, 07 五月 2025 10:38:33 +0800
Subject: [PATCH] 修改问题
---
Wms/Wms/Controllers/DownApiController.cs | 195 +++++++++++++++++++++++++++++-------------------
1 files changed, 119 insertions(+), 76 deletions(-)
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index c1f00c4..1064126 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -19,6 +19,8 @@
using Utility;
using System.Threading.Tasks;
using Model.ModelVm.BllCheckVm;
+using System.Collections.Generic;
+using System.Security.Policy;
namespace Wms.Controllers
{
@@ -101,7 +103,7 @@
/// <returns></returns>
[Authorize]
[HttpGet]
- public IActionResult IssueOutHouse(string soNo, string unstackingMode, string outMode, string loadingAddre)
+ public IActionResult IssueOutHouse(string soNo, string outMode)
{
try
{
@@ -121,11 +123,23 @@
//{
// return Ok(new { code = 1, msg = "璇烽�夋嫨鍑哄簱鍙�" });
//}
+ var house = _exNoticeSvc.GetHouseBySo(soNo);
+ if (house == "W01")
+ {
- var list = _exNoticeSvc.IssueOutHouse(soNo, unstackingMode, outMode, loadingAddre, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
+ return Ok(new { code = 0, msg = "str" });
+ }
+ else if (house == "W02")
+ {
+ var list = _exNoticeSvc.IssueOutHouseLk(soNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
- return Ok(new { code = 0, msg = str, data = list });
-
+ return Ok(new { code = 0, msg = str, data = list });
+ }
+ else
+ {
+ return Ok(new { code = 1, msg = "浠撳簱淇℃伅閿欒锛岃鏍稿疄鍗曟嵁淇℃伅"});
+ }
+
}
catch (Exception e)
{
@@ -263,32 +277,32 @@
/// </summary>
/// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
/// <returns></returns>
- [AllowAnonymous]
- [HttpPost]
- public IActionResult BindRequestRoadWay(BoxPalletBindVm model)
- {
- var logStr = $@".\log\WCS\WCS鎵樼洏缁戝畾-鐢宠宸烽亾" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ //[AllowAnonymous]
+ //[HttpPost]
+ //public IActionResult BindRequestRoadWay(BoxPalletBindVm model)
+ //{
+ // var logStr = $@".\log\WCS\WCS鎵樼洏缁戝畾-鐢宠宸烽亾" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
- try
- {
+ // try
+ // {
- var jsonData = JsonConvert.SerializeObject(model);
- LogFile.SaveLogToFile($"WCS鎵樼洏缁戝畾-鐢宠宸烽亾锛�( {jsonData} ),", logStr);
+ // var jsonData = JsonConvert.SerializeObject(model);
+ // LogFile.SaveLogToFile($"WCS鎵樼洏缁戝畾-鐢宠宸烽亾锛�( {jsonData} ),", logStr);
- _asnPalletBindSvc.BindPalletStock(model, 0);
- //鐢宠宸烽亾
- var list = _asnPalletBindSvc.RequestRoadWay(model.PalletNo, "W01");
- LogFile.SaveLogToFile($"WCS鎵樼洏缁戝畾-鐢宠宸烽亾杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
+ // _asnPalletBindSvc.BindPalletStock(model, 0);
+ // //鐢宠宸烽亾
+ // var list = _asnPalletBindSvc.RequestRoadWay(model.PalletNo, "W01");
+ // LogFile.SaveLogToFile($"WCS鎵樼洏缁戝畾-鐢宠宸烽亾杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
- return Ok(new { Success = 0, Message = "鎵樼洏缁戝畾-鐢宠宸烽亾鎴愬姛", TaskList = list });
- }
- catch (Exception e)
- {
- LogFile.SaveLogToFile($"WCS鎵樼洏缁戝畾-鐢宠宸烽亾杩斿洖锛�( {e.Message} ),", logStr);
+ // return Ok(new { Success = 0, Message = "鎵樼洏缁戝畾-鐢宠宸烽亾鎴愬姛", TaskList = list });
+ // }
+ // catch (Exception e)
+ // {
+ // LogFile.SaveLogToFile($"WCS鎵樼洏缁戝畾-鐢宠宸烽亾杩斿洖锛�( {e.Message} ),", logStr);
- return Ok(new ErpModel { Success = -1, Message = e.Message });
- }
- }
+ // return Ok(new ErpModel { Success = -1, Message = e.Message });
+ // }
+ //}
/// <summary>
/// PDA 浜哄伐鐢宠鍌ㄤ綅 锛堢珛浣撳簱锛�
@@ -316,15 +330,15 @@
try
{
var list = _asnPalletBindSvc.RequestLocation(model.PalletNo, model.HouseNo);
- _asnPalletBindSvc.IssueAsnTask(list, _config.ErpHost+ _config.AsnFinishUrl);//agv璺緞
+ _asnPalletBindSvc.IssueAsnTask(list, _config.WcsHost+ _config.IssueComApiUrl);//WCS璺緞
- new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo, "鐢宠鍌ㄤ綅", $"鐢宠鍌ㄤ綅鎵樼洏鍙凤細{model.PalletNo}鐨勬垚鍔熶俊鎭�", int.Parse(userId));
+ new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "鐢宠鍏ュ簱", model.PalletNo, "娣诲姞", $"鐢宠鍌ㄤ綅鎵樼洏鍙凤細{model.PalletNo}鐨勬垚鍔熶俊鎭�", int.Parse(userId));
return Ok(new HttpReturnModel { Success = "0", Message = "鐢宠鍌ㄤ綅鎴愬姛", Data = list });
}
catch (Exception e)
{
- new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo, "鐢宠鍌ㄤ綅", $"鐢宠鍌ㄤ綅鎵樼洏鍙凤細{model.PalletNo}鐨勫け璐ヤ俊鎭�", int.Parse(userId));
+ new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "鐢宠鍏ュ簱", model.PalletNo, "娣诲姞", $"鐢宠鍌ㄤ綅鎵樼洏鍙凤細{model.PalletNo}鐨勫け璐ヤ俊鎭�", int.Parse(userId));
return Ok(new HttpReturnModel { Success = "-1", Message = e.Message });
}
@@ -337,7 +351,7 @@
/// <returns></returns>
[AllowAnonymous]
[HttpPost]
- public IActionResult RequestRoadWay(RequestLocate model)
+ public IActionResult RequestMiJiRoadWay(RequestLocate model)
{
var logStr = "";
@@ -349,7 +363,7 @@
var jsonData = JsonConvert.SerializeObject(model);
LogFile.SaveLogToFile($"WCS鐢宠宸烽亾锛�( {jsonData} ),", logStr);
- var list = _asnPalletBindSvc.RequestRoadWay(model.PalletNo, model.HouseNo);
+ var list = _asnPalletBindSvc.RequestMiJiRoadWay(model.PalletNo, model.HouseNo);
LogFile.SaveLogToFile($"WCS鐢宠宸烽亾杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
//new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo.Substring(0, 8),
@@ -391,59 +405,29 @@
//string palletno = model.PalletNo;
var logStr = "";
- if (model.PalletNo.Length == 9)
- {
- logStr = $@".\log\WCS\WMS鐢宠鍌ㄤ綅" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
- }
- else if (model.PalletNo.Length == 8)
- {
- logStr = $@".\log\WCS\WCS鐢宠鍌ㄤ綅" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
- }
+
+ logStr = $@".\log\WCS\WCS鐢宠鍌ㄤ綅" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+
try
{
- if (model.PalletNo.Length == 9)
- {
- var jsonData = JsonConvert.SerializeObject(model);
- LogFile.SaveLogToFile($"WMS鐢宠鍌ㄤ綅锛�( {jsonData} ),", logStr);
- }
- else if (model.PalletNo.Length == 8)
- {
- var jsonData = JsonConvert.SerializeObject(model);
- LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅锛�( {jsonData} ),", logStr);
- }
-
+
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅锛�( {jsonData} ),", logStr);
+
string pallet = model.PalletNo.Substring(0, 8);
- var list = _asnPalletBindSvc.RequestLocation(pallet, model.HouseNo, model.RoadwayNo);
+ var list = _asnPalletBindSvc.RequestMiJiLocation(pallet, model.HouseNo, model.RoadwayNo);
- if (model.PalletNo.Length == 9)
- {
- new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo.Substring(0, 8), "鐢宠鍌ㄤ綅", $"鐢宠鍌ㄤ綅鎵樼洏鍙凤細{model.PalletNo.Substring(0, 8)}鐨勬垚鍔熶俊鎭�", 2);// int.Parse(userId)
- LogFile.SaveLogToFile($"WMS鐢宠鍌ㄤ綅鎴愬姛锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
- }
- else if (model.PalletNo.Length == 8)
- {
- LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
- }
- if (model.PalletNo.Length == 9)
- {
-
- }
-
+ LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
+ //new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo.Substring(0, 8), "鐢宠鍌ㄤ綅", $"鐢宠鍌ㄤ綅鎵樼洏鍙凤細{model.PalletNo.Substring(0, 8)}鐨勬垚鍔熶俊鎭�", 2);// int.Parse(userId)
+ //LogFile.SaveLogToFile($"WMS鐢宠鍌ㄤ綅鎴愬姛锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
+
return Ok(new { Success = 0, Message = "鐢宠鍌ㄤ綅鎴愬姛", TaskList = list });
}
catch (Exception e)
{
- if (model.PalletNo.Length == 9)
- {
- new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo.Substring(0, 8), "鐢宠鍌ㄤ綅", $"鐢宠鍌ㄤ綅鎵樼洏鍙凤細{model.PalletNo.Substring(0, 8)}鐨勫け璐ヤ俊鎭�", 2);//int.Parse(userId)
- LogFile.SaveLogToFile($"WMS鐢宠鍌ㄤ綅澶辫触杩斿洖锛�( {e.Message} ),", logStr);
- }
- else if (model.PalletNo.Length == 8)
- {
- LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅杩斿洖锛�( {e.Message} ),", logStr);
- }
-
+ LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅杩斿洖锛�( {e.Message} ),", logStr);
+
return Ok(new ErpModel { Success = -1, Message = e.Message });
}
}
@@ -491,7 +475,7 @@
}
break;
case "2"://鐩樺簱瀹屾垚浠诲姟
- if (model.TaskType == "1")//0锛氬叆搴� 1锛氬嚭搴� 3锛氱Щ搴�
+ if (model.TaskType == "1")//0锛氬叆搴� 1锛氬嚭搴� 2锛氱Щ搴�
{
_crCheckSvc.CheckSuccess(model.TaskNo, 0);
return Ok(new WcsModel { StatusCode = 0, Msg = "鐩樼偣鍑哄簱瀹屾垚" });
@@ -503,7 +487,7 @@
}
break;
case "3"://绉诲簱瀹屾垚浠诲姟銆佷紭鍖栧偍浣�
- if (model.TaskType == "3") //0锛氬叆搴� 1锛氬嚭搴� 3锛氱Щ搴�
+ if (model.TaskType == "3") //0锛氬叆搴� 1锛氬嚭搴� 2锛氱Щ搴�
{
//濉啓绉诲簱瀹屾垚浠ｇ爜
}
@@ -519,6 +503,31 @@
}
}
+
+ /// <summary>
+ /// WCS鍙嶉AGV浠诲姟鍙栬揣瀹屾垚
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult AGVQuHuoSuccess(ReceiveWcsSignal model)
+ {
+ var logStr = $@".\log\WCS\AGV鍙栬揣瀹屾垚鍙嶉" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ try
+ {
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"AGV鍙栬揣瀹屾垚鍙嶉锛�( {jsonData} ),", logStr);
+
+ _exNoticeSvc.AGVQuHuoSuccess(model.TaskNo);
+ var data = new HttpReturnModel { Success = "0", Message = "鎴愬姛" };
+ LogFile.SaveLogToFile($"AGV鍙栬揣瀹屾垚鍙嶉锛�({JsonConvert.SerializeObject(data)}),", logStr);
+ return Ok(data);
+ }
+ catch (Exception e)
+ {
+ LogFile.SaveLogToFile($"AGV鍙栬揣瀹屾垚鍙嶉锛�( {e.Message} ),", logStr);
+ return Ok(new HttpReturnModel { Success = "-1", Message = e.Message });
+ }
+ }
/// <summary>
/// 绌哄彇寮傚父
@@ -704,5 +713,39 @@
#endregion
+ /// <summary>
+ /// PDA 浜哄伐鐢宠鍌ㄤ綅 锛堢珛浣撳簱锛�
+ /// </summary>
+ /// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
+ public IActionResult ceshiapi()
+ {
+ try
+ {
+ var url = "https://10.26.200.25/rcs/rtas/api/robot/controller/carrier/unbind";
+
+ var requestId = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString();
+ var dic = new Dictionary<string, string>()
+ {
+ {"X-lr-request-id",requestId },
+ {"X-lr-version","4.2" },
+ };
+ var mod = new
+ {
+ carrierCode = "palletNo",
+ siteCode = "locateNo"
+ };
+ var jsonData = JsonConvert.SerializeObject(mod);
+ HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV瑙ｇ粦", "AGV",dic);
+
+ return Ok(new HttpReturnModel { Success = "0", Message = "鐢宠鍌ㄤ綅鎴愬姛", Data = "list" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new HttpReturnModel { Success = "-1", Message = e.Message });
+ }
+ }
}
}
--
Gitblit v1.8.0