From e43b6adef17e3cf00d487e4e2084f57c181ab67d Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期二, 22 四月 2025 11:09:10 +0800
Subject: [PATCH] 修改问题 打印模板、打印传输Uniapp
---
Wms/Wms/Controllers/DownApiController.cs | 91 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 84 insertions(+), 7 deletions(-)
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 2c35f9c..210aeea 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -19,6 +19,7 @@
using Utility;
using System.Threading.Tasks;
using Model.ModelVm.BllCheckVm;
+using System.Collections.Generic;
namespace Wms.Controllers
{
@@ -101,7 +102,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 +122,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)
{
@@ -290,6 +303,45 @@
}
}
+ /// <summary>
+ /// PDA 浜哄伐鐢宠鍌ㄤ綅 锛堢珛浣撳簱锛�
+ /// </summary>
+ /// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
+ public IActionResult RequestLocation(RequestLocate model)
+ {
+
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new HttpReturnModel { Success = "1", Message = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new HttpReturnModel { Success = "1", Message = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+
+
+ try
+ {
+ var list = _asnPalletBindSvc.RequestLocation(model.PalletNo, model.HouseNo);
+ _asnPalletBindSvc.IssueAsnTask(list, _config.ErpHost+ _config.AsnFinishUrl);//agv璺緞
+
+ new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", 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));
+
+ return Ok(new HttpReturnModel { Success = "-1", Message = e.Message });
+ }
+ }
/// <summary>
/// 鐢宠宸烽亾
@@ -335,7 +387,7 @@
/// <returns></returns>
[AllowAnonymous]
[HttpPost]
- public IActionResult RequestLocation(RequestLocate model)
+ public IActionResult RequestMiJiLocation(RequestLocate model)
{
//鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
@@ -452,7 +504,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 = "鐩樼偣鍑哄簱瀹屾垚" });
@@ -464,7 +516,7 @@
}
break;
case "3"://绉诲簱瀹屾垚浠诲姟銆佷紭鍖栧偍浣�
- if (model.TaskType == "3") //0锛氬叆搴� 1锛氬嚭搴� 3锛氱Щ搴�
+ if (model.TaskType == "3") //0锛氬叆搴� 1锛氬嚭搴� 2锛氱Щ搴�
{
//濉啓绉诲簱瀹屾垚浠ｇ爜
}
@@ -482,6 +534,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>
/// 绌哄彇寮傚父
/// </summary>
/// <returns></returns>
--
Gitblit v1.8.0