From 2cf8f4a928d3479068fc51be9633db4583eba3c9 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 09 五月 2025 13:05:23 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs | 1
Wms/WMS.IBLL/IBllTransServer/IHopperTransportServer.cs | 18 +++++++++
Wms/Wms/DailyTaskService.cs | 78 ++------------------------------------
Wms/Wms/Controllers/DownApiController.cs | 6 +-
4 files changed, 26 insertions(+), 77 deletions(-)
diff --git a/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs b/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
index 67ed85e..1c4763c 100644
--- a/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
@@ -1224,7 +1224,6 @@
throw new Exception($"缁欏皬杞︿笅鍙戠Щ搴撲换鍔″け璐ワ紝妗跺彿锛歿detailInfo.PalletNo}");
}
-
}
}
//鎻愪氦浜嬪姟
diff --git a/Wms/WMS.IBLL/IBllTransServer/IHopperTransportServer.cs b/Wms/WMS.IBLL/IBllTransServer/IHopperTransportServer.cs
index 45a3ed2..cdda1bb 100644
--- a/Wms/WMS.IBLL/IBllTransServer/IHopperTransportServer.cs
+++ b/Wms/WMS.IBLL/IBllTransServer/IHopperTransportServer.cs
@@ -20,6 +20,24 @@
void jiaoCheHopper(string areaNo, string StartLocate, string plnNo, string plnStatus, decimal weight, string skuNo, string lotNo, string url, int userId);
/// <summary>
+ /// 灏忚溅璧板嚭鍌ㄤ綅鍥炰紶浜嬩欢
+ /// </summary>
+ /// <param name="taskNo"></param>
+ /// <param name="url"></param>
+ /// <exception cref="Exception"></exception>
+ void OutBinAgv(string taskNo, string url);
+
+ /// <summary>
+ /// 灏忚溅鍙嶉浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="taskNo"></param>
+ /// <param name="status"></param>
+ /// <param name="comeFrom"></param>
+ /// <param name="userId"></param>
+ /// <exception cref="Exception"></exception>
+ void RCSFinishTask(string taskNo, string status, string comeFrom, int userId = 0);
+
+ /// <summary>
/// 娓呮礂鏈哄彨鏂欑姸鎬�
/// </summary>
/// <param name="deviceID">娓呮礂鏈虹紪鍙�</param>
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 75d7a71..4656c21 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -22,6 +22,7 @@
using ZXing.QrCode.Internal;
using Model.ModelVm.BllCheckVm;
using Model.ModelVm.SysVm;
+using System.Security.Policy;
namespace Wms.Controllers
{
@@ -899,7 +900,7 @@
LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-璧板嚭鍌ㄤ綅-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
//鍏蜂綋澶勭悊鏂规硶
-
+ _hopper.OutBinAgv(model.taskCode, _config.AgvHost + _config.GenAgvSchedulingTask);
resultModel = new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode };
@@ -934,8 +935,7 @@
LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟缁撴潫-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
//鍏蜂綋澶勭悊鏂规硶
- _rcsserver.RCSFinishTask(model.taskCode, "1", "AGV");
-
+ _hopper.RCSFinishTask(model.taskCode, "1", "AGV");
resultModel = new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode };
var jsonData2 = JsonConvert.SerializeObject(resultModel);
diff --git a/Wms/Wms/DailyTaskService.cs b/Wms/Wms/DailyTaskService.cs
index 99252f7..70c64b9 100644
--- a/Wms/Wms/DailyTaskService.cs
+++ b/Wms/Wms/DailyTaskService.cs
@@ -8,6 +8,7 @@
using Utility.Tools;
using Wms.Tools;
using WMS.BLL.BllSoServer;
+using WMS.BLL.BllTransServer;
using WMS.BLL.DataServer;
using WMS.IBLL.IDataServer;
@@ -30,28 +31,12 @@
//鍒涘缓瀹氭椂浠诲姟
public Task StartAsync(CancellationToken cancellationToken)
{
- #region 姣忓ぉ0鐐规墽琛�
- //璁＄畻璺濈涓嬩竴涓� 0 鐐圭殑鏃堕棿闂撮殧
- DateTime now = DateTime.Now;
- DateTime nextZeroHour = now.AddDays(1).Date;
- TimeSpan delay = nextZeroHour - now;
-
- //鍒涘缓瀹氭椂鍣紝骞惰缃洖璋冨嚱鏁�
- _timer = new Timer(ExecuteDailyTask, null, delay, TimeSpan.FromDays(1));
- _periodicReport = new Timer(PeriodicReport, null, delay, TimeSpan.FromDays(1));
- //TimeSpan delay2 = TimeSpan.FromMinutes(2);
+ TimeSpan delay = TimeSpan.FromMinutes(2);
// 鍒涘缓瀹氭椂鍣紝骞惰缃洖璋冨嚱鏁�
- // _timer2 = new Timer(ExecuteDailyTask2, null, delay2, TimeSpan.FromMinutes(3));
-
- //TimeSpan delay3 = TimeSpan.FromMinutes(2);
-
- // 鍒涘缓瀹氭椂鍣紝骞惰缃洖璋冨嚱鏁�
- //_timer3 = new Timer(ExecuteDailyTask3, null, delay3, TimeSpan.FromMinutes(3));
+ _timer = new Timer(ExecuteDailyTask, null, delay, TimeSpan.FromMinutes(5));
return Task.CompletedTask;
- #endregion
-
}
/// <summary>
@@ -64,8 +49,6 @@
{
// 鍋滄瀹氭椂鍣�
_timer?.Change(Timeout.Infinite, 0);
- _timer2?.Change(Timeout.Infinite, 0);
- _timer3?.Change(Timeout.Infinite, 0);
_periodicReport?.Change(Timeout.Infinite, 0);
return Task.CompletedTask;
@@ -75,9 +58,9 @@
{
try
{
- StockDetailServer _stockDetail = new StockDetailServer();
+ HopperTransportServer _stockDetail = new HopperTransportServer();
//浠诲姟閫昏緫
- _stockDetail.StockCheck();
+ _stockDetail.TransferBackTimer(_agvUrl);
}
catch (Exception ex)
{
@@ -86,58 +69,7 @@
}
}
- //鎵ц浠诲姟閫昏緫
- private void ExecuteDailyTask2(object state)
- {
- try
- {
- ExportNoticeServer _exNotice = new ExportNoticeServer();
- //浠诲姟閫昏緫
- var list = _exNotice.BeiLiaoIssueOutHouse(_wcsUrl);
- }
- catch (Exception ex)
- {
- var logStr = $@".\log\WMS\WMS瀹氭椂澶囨枡浠诲姟" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
- LogFile.SaveLogToFile($"WMS瀹氭椂澶囨枡浠诲姟寮傚父锛�( {ex.Message} ),", logStr);
- }
- }
-
- //鎵ц浠诲姟閫昏緫
- private void ExecuteDailyTask3(object state)
- {
- try
- {
- ExportNoticeServer _exNotice = new ExportNoticeServer();
- //浠诲姟閫昏緫
- _exNotice.ProCallIssueOutHouse(_agvUrl);
- }
- catch (Exception ex)
- {
- var logStr = $@".\log\WMS\WMS瀹氭椂澶囨枡浠诲姟" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
- LogFile.SaveLogToFile($"WMS瀹氭椂澶囨枡浠诲姟寮傚父锛�( {ex.Message} ),", logStr);
- }
- }
-
- //瀹氭椂鎵ц鍛ㄦ湡鎶ヨ〃
- private void PeriodicReport(object state)
- {
- try
- {
- StockInfoServer _stock = new StockInfoServer();
- var arr = _stock.ByDayInsertStock();
-
- var logStr = $@".\log\WMS\WMS瀹氭椂浠诲姟" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
- LogFile.SaveLogToFile($"WMS瀹氭椂浠诲姟鎵ц寮傚父锛歿arr},", logStr);
- //閲婃斁璧勬簮
- _periodicReport?.Dispose();
- }
- catch (Exception ex)
- {
- var logStr = $@".\log\WMS\WMS瀹氭椂浠诲姟" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
- LogFile.SaveLogToFile($"WMS瀹氭椂浠诲姟鎵ц寮傚父锛歿DateTime.Now}锛�( {ex.Message} ),", logStr);
- }
- }
/// <summary>
/// 鍦ㄦ湇鍔＄粨鏉熻繍琛屾椂锛屽畾鏃跺櫒寰楀埌姝ｇ‘鍦版竻鐞嗗拰閲婃斁
--
Gitblit v1.8.0