From 06e0e3b7d61e95902a6129de2490461cd0693e1d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 15 十月 2025 15:06:40 +0800
Subject: [PATCH] 新增异步方法并优化服务调用逻辑在多个数据库文件中进行了二进制文件的修改、删除和新增操作，可能涉及数据库内容的更新或重建。在 HttpsClient.cs文件中新增了 PostNotLimitAsync方法，用于发送支持 JSON 格式的异步 HTTP POST 请求，并记录请求和响应参数。在 AgingInOrOutInputService.cs文件中，将 HttpsClient.PostAsync替换为PostNotLimitAsync，以利用新方法的功能特性。同时删除了不再需要的注释代码。
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_BZ/CommonConveyorLine_BZJob.cs | 63 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_BZ/CommonConveyorLine_BZJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_BZ/CommonConveyorLine_BZJob.cs
index 9aa4687..cfc91c5 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_BZ/CommonConveyorLine_BZJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_BZ/CommonConveyorLine_BZJob.cs
@@ -1,4 +1,5 @@
锘�#region MyRegion
+
#region << 鐗� 鏈� 娉� 閲� >>
/*----------------------------------------------------------------
@@ -20,37 +21,24 @@
using AutoMapper;
using HslCommunication;
-using Microsoft.AspNetCore.Server.HttpSys;
using Newtonsoft.Json;
using Quartz;
-using SqlSugar;
-using System.Diagnostics.CodeAnalysis;
-using System.Net;
using System.Reflection;
-using System.Threading.Tasks;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
-using WIDESEAWCS_Common.TaskEnum;
-using WIDESEAWCS_Core;
-using WIDESEAWCS_Core.Caches;
using WIDESEAWCS_Core.Helper;
-using WIDESEAWCS_Core.HttpContextUser;
using WIDESEAWCS_DTO.MOM;
-using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_IProcessRepository;
-using WIDESEAWCS_ISystemRepository;
using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
-using WIDESEAWCS_QuartzJob.DeviceBase;
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_SignalR;
using WIDESEAWCS_Tasks.ConveyorLineJob;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
using ICacheService = WIDESEAWCS_Core.Caches.ICacheService;
namespace WIDESEAWCS_Tasks
@@ -95,6 +83,7 @@
if (conveyorLine != null)
{
#region 绔欏彴鏂瑰紡
+
List<Dt_StationManager> stationManagers = _stationManagerService.GetAllStationByDeviceCode(conveyorLine.DeviceCode);
foreach (var station in stationManagers)
@@ -112,27 +101,30 @@
}
#region 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
- var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
- if (tokenInfos == null || !tokenInfos.Any())
- {
- //throw new Exception(conveyorLine.DeviceName + "缂撳瓨涓湭鎵惧埌Token缂撳瓨");
- continue;
- }
- var userTokenIds = tokenInfos?.Select(x => x.Token_ID).ToList();
- var userIds = tokenInfos?.Select(x => x.UserId).ToList();
- object obj = new
- {
- station.stationChildCode,
- commandAfter = command,
- };
- _noticeService.StackerData(userIds?.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, data = obj });
+ //var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
+ //if (tokenInfos == null || !tokenInfos.Any())
+ //{
+ // //throw new Exception(conveyorLine.DeviceName + "缂撳瓨涓湭鎵惧埌Token缂撳瓨");
+ // continue;
+ //}
+ //var userTokenIds = tokenInfos?.Select(x => x.Token_ID).ToList();
+ //var userIds = tokenInfos?.Select(x => x.UserId).ToList();
+
+ //object obj = new
+ //{
+ // station.stationChildCode,
+ // commandAfter = command,
+ //};
+ //_noticeService.StackerData(userIds?.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, data = obj });
#endregion 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
}
- #endregion
+
+ #endregion 绔欏彴鏂瑰紡
#region 璺敱鏂瑰紡
+
//List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode);
//foreach (string childDeviceCode in childDeviceCodes)
//{
@@ -168,7 +160,8 @@
// }
// }
//}
- #endregion
+
+ #endregion 璺敱鏂瑰紡
}
}
catch (Exception ex)
@@ -193,12 +186,19 @@
public void RequestOutbound(CommonConveyorLine_BZ conveyorLine, ConveyorLineTaskCommand_After command, Dt_StationManager station)
{
//鏌ヨ瀵瑰簲浜х嚎鐨勫湪閫旀暟鎹�
+ ConveyorLineTaskCommand_After readSignal = conveyorLine.ReadCustomer<ConveyorLineTaskCommand_After>(station.stationLocation);
+ if (readSignal.Reserved5 == 1)
+ {
+ ConsoleHelper.WriteErrorLine($"鍖呰{station.productLine}寮�濮嬫竻鏂�");
+ return;
+ }
+
dt_needBarcode needBarcode = _needBarcodeRepository.QueryFirst(x => x.productLine == station.productLine && x.toArea == station.stationChildCode);
needBarcode.inLineNum = _taskRepository.QueryData(x => x.TargetAddress == station.stationChildCode).Count();
//鑻ュ湪閫旀暟閲忓皬浜庣洰鏍囦綅缃殑缂撳瓨鏁伴噺 鍒欏鎵惧搴斿父娓╁簱瀛樹腑甯告俯3宸ュ簭鐨勫彲鍑哄簱鏁版嵁 骞跺缓绔嬪嚭搴撲换鍔�
- if (needBarcode.inLineNum <= needBarcode.cacheNum)
+ if (needBarcode.inLineNum < needBarcode.cacheNum)
{
if (_taskService.RequestOutTaskToBZAsync(station).Result.Status)
{
@@ -226,7 +226,7 @@
conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, task.NextAddress, station.stationChildCode);
_taskRepository.DeleteData(task);
- if (needBarcode.inLineNum-- <= 0) needBarcode.inLineNum = 0;
+ if (--needBarcode.inLineNum <= 0) needBarcode.inLineNum = 0;
_needBarcodeRepository.UpdateData(needBarcode);
}
else //濡傛棤浠诲姟 鍒欏垽瀹氫负浠嶯G鍙ｄ笂鏂� 璋冨彇MOM鎺ュ彛 鍒ゆ柇杩斿洖鍙傛暟 鏃犲紓甯稿垯閫佸叆鍖呰锛屾湁寮傚父鍒欓��鍥濶G鍙�
@@ -274,4 +274,5 @@
}
}
}
+
#endregion
\ No newline at end of file
--
Gitblit v1.9.3