From 0b43055b878416dfc3ac37138d39ae09a1d23364 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期五, 11 四月 2025 16:28:23 +0800
Subject: [PATCH] 1
---
代码管理/NEWCode/WIDESEAWCS_PDA/pages/叫料/负极叫料.vue | 2 +-
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs | 20 +++++++++++---------
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 2 +-
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue"
index 9f8413e..c3f79fc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue"
@@ -170,7 +170,7 @@
this.$t.message.toast('鍙枡鏁伴噺涓嶈兘瓒呰繃鍙彨鏁伴噺');
return;
}
-
+ let guid =this.generateUUID()
let formDataParam = {
dTaskId: guid,
productCode: productCode,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
index f7ed751..6ea10f4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
@@ -18,7 +18,7 @@
"DBType": "SqlServer",
//杩炴帴瀛楃涓�
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_GanFengLiYeNew;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_GanFengLiYeNew;User ID=sa;Password=sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs"
index b657268..fcb9e57 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs"
@@ -15,7 +15,8 @@
public Task Execute(IJobExecutionContext context)
{
// 浠庝笂涓嬫枃涓幏鍙� JobParams 骞惰浆鎹负 Roast 绫诲瀷
- CommonElevator elevator = (CommonElevator)context.JobDetail.JobDataMap.Get("JobParams");
+ //CommonElevator elevator = (CommonElevator)context.JobDetail.JobDataMap.Get("JobParams");
+ CommonRoast elevator = (CommonRoast)context.JobDetail.JobDataMap.Get("JobParams");
// 鍒濆鍖� AGV 鍙橀噺
AGV agv = null;
@@ -26,7 +27,7 @@
// 杩炴帴 AGV
// 鏍规嵁璁惧鍚嶇О鍐冲畾鏄鏋佽繕鏄礋鏋� AGV
- List<string> agvNames = new List<string>() { "姝ｆ瀬AGV", "璐熸瀬AGV" };
+ List<string> agvNames = new List<string>() { "璐熸瀬AGV" }; //"姝ｆ瀬AGV",
foreach (var agvName in agvNames)
{
// 浠庡瓨鍌ㄤ腑鏌ユ壘鎸囧畾鍚嶇О鐨勮澶�
@@ -48,7 +49,7 @@
}
- public static void DeviceInteraction(CommonElevator elevator, AGV agv, List<string> elevatorNames, List<string> agvNames)
+ public static void DeviceInteraction(CommonRoast elevator, AGV agv, List<string> elevatorNames, List<string> agvNames)
{
if (agv.DeviceName == "姝ｆ瀬AGV")
{
@@ -60,11 +61,12 @@
}
}
- private static void HandlePositiveAGV(CommonElevator elevator, AGV agv, List<string> elevatorNames, List<string> agvNames)
+ private static void HandlePositiveAGV(CommonRoast elevator, AGV agv, List<string> elevatorNames, List<string> agvNames)
{
// 姝ｆ瀬AGV鍙渶瑕佸鐞嗗墠涓や釜淇″彿
- var elevatorSignal = elevator.Communicator.Read<byte>(elevatorNames[0], 100);
- var agvSignal = agv.Communicator.Read<byte>(agvNames[1], 100);
+ // 淇敼璇诲彇鏂瑰紡锛岀‘淇濊幏鍙栫涓�涓瓧鑺�
+ var elevatorSignal = elevator.Communicator.Read<byte[]>(elevatorNames[0], 100)[0];
+ var agvSignal = agv.Communicator.Read<byte[]>(agvNames[1], 100)[0];
agv.Communicator.Write(agvNames[0], elevatorSignal);
elevator.Communicator.Write(agvNames[1], agvSignal);
@@ -73,7 +75,7 @@
$"鍐欏叆AGV淇″彿[{agvSignal}]鍒皗agvNames[1]}");
}
- private static void HandleNegativeAGV(CommonElevator elevator, AGV agv, List<string> elevatorNames, List<string> agvNames)
+ private static void HandleNegativeAGV(CommonRoast elevator, AGV agv, List<string> elevatorNames, List<string> agvNames)
{
// 瀹氫箟淇″彿缁勫鐞嗭紙璧峰绱㈠紩锛屾搷浣滅被鍨嬶紝鏃ュ織鎻忚堪锛�
var operations = new List<(int startIdx, string type, string desc)>
@@ -104,7 +106,7 @@
}
}
- private static void ProcessSignalGroup(CommonElevator elevator, AGV agv, List<string> elevatorNames, List<string> agvNames, int startIdx, string operationType, string description)
+ private static void ProcessSignalGroup(CommonRoast elevator, AGV agv, List<string> elevatorNames, List<string> agvNames, int startIdx, string operationType, string description)
{
const int GROUP_SIZE = 2; // 姣忕粍澶勭悊2涓俊鍙�
@@ -154,7 +156,7 @@
ConsoleHelper.WriteInfoLine($"璐熸瀬AGV浜や簰({description}): 浼犺緭淇″彿缁刐{logValues}]鍒扮洰鏍囧湴鍧�[{logTargets}]");
}
- private static void HandleSpecialSignals(CommonElevator elevator, AGV agv,
+ private static void HandleSpecialSignals(CommonRoast elevator, AGV agv,
List<string> elevatorNames, List<string> agvNames,
int startIdx)
{
--
Gitblit v1.9.3