From 6be6a1e453861fa0beb818236fdd8183024074c4 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 04 十一月 2025 08:21:40 +0800
Subject: [PATCH] 增加和MES对接接口
---
Wms/Wms/Controllers/DownApiController.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index a4e3fb8..b11c7f2 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -21,6 +21,7 @@
using Microsoft.Extensions.Logging;
using ZXing.QrCode.Internal;
using Model.ModelVm.BllCheckVm;
+using System.DirectoryServices.Protocols;
namespace Wms.Controllers
{
@@ -683,7 +684,7 @@
}
string taskNo = "";
//鍏蜂綋澶勭悊鏂规硶
- _rcsserver.GetPalletNo(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask, out taskNo);
+ _rcsserver.GetPalletNo(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask, _config.MesHost + _config.MesPanClearPallet, out taskNo);
resultModel = new AgvResultModel { code = "0", message = "鍙《鎴愬姛!", data = taskNo, reqCode = "" };
var jsonData2 = JsonConvert.SerializeObject(resultModel);
@@ -757,16 +758,20 @@
}
}
/// <summary>
- /// 灏嗗噣妗舵敼涓鸿剰妗跺苟鎷夊埌鑴忔《鍖�
+ /// MES灏嗗噣妗舵敼涓鸿剰妗跺苟鎷夊埌鑴忔《鍖�
/// </summary>
/// <param name="pallmsg"></param>
/// <returns></returns>
[HttpPost]
public IActionResult ChangePalletStatus(Pallnetmsg pallmsg)
{
+ var logStr = $@".\log\MES\MES灏嗗噣妗舵敼涓鸿剰妗跺苟鎷夊埌鑴忔《鍖�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
var result = new ErpModel { Success = -1, Message = "", };
try
{
+ var jsonData = JsonConvert.SerializeObject(pallmsg);
+ LogFile.SaveLogToFile($"MES灏嗗噣妗舵敼涓鸿剰妗跺苟鎷夊埌鑴忔《鍖�-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
+
if (string.IsNullOrWhiteSpace(pallmsg.PalletNo))
{
result.Message = "妗剁紪鍙蜂笉鑳戒负绌猴紒";
@@ -779,22 +784,28 @@
}
catch (Exception e)
{
+ LogFile.SaveLogToFile($"MES灏嗗噣妗舵敼涓鸿剰妗跺苟鎷夊埌鑴忔《鍖哄紓甯革細( {e.Message} ),", logStr);
+
result.Message = e.Message;
return Ok(result);
}
}
/// <summary>
- /// MES涓嬪彂娓呮礂閿佸畾鑴忔《
+ /// MES涓嬪彂娓呮礂鎸囧畾鑴忔《
/// </summary>
/// <param name="pallmsg"></param>
/// <returns></returns>
[HttpPost]
public IActionResult CleanPallet(Pallnetmsg pallmsg)
{
- var result = new ErpModel { Success = -1, Message = "", };
+ var logStr = $@".\log\MES\MES涓嬪彂娓呮礂鎸囧畾鑴忔《" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ ErpModel result = new ErpModel { Success = -1, Message = "" };
try
{
+ var jsonData = JsonConvert.SerializeObject(pallmsg);
+ LogFile.SaveLogToFile($"MES涓嬪彂娓呮礂鎸囧畾鑴忔《-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
+
if (string.IsNullOrWhiteSpace(pallmsg.Location))
{
result.Message = "鍙枡浣嶇疆涓虹┖锛�";
@@ -812,6 +823,7 @@
}
catch (Exception e)
{
+ LogFile.SaveLogToFile($"MES涓嬪彂娓呮礂鎸囧畾鑴忔《寮傚父锛�( {e.Message} ),", logStr);
result.Message = e.Message;
return Ok(result);
}
--
Gitblit v1.8.0