Merge branch 'master' of http://115.159.85.185:8098/r/ZhuHaiChuangZhi/GanFe...

wanshenmean

2025-04-12 983e07dcc14e03520d3f967544cdae631ed2084c

Merge branch 'master' of http://115.159.85.185:8098/r/ZhuHaiChuangZhi/GanFengLiYeNew

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_PDA/pages/½ÐÁÏ/¸º¼«½ÐÁÏ.vue

@@ -170,7 +170,7 @@
                    this.$t.message.toast('叫料数量不能超过可叫数量');
                    return;
                }
				
                let guid =this.generateUUID()
                let formDataParam = {
                    dTaskId: guid,
                    productCode: productCode,

 ´úÂë¹ÜÀí/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": {

 ´úÂë¹ÜÀí/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,7 +61,7 @@
            }
        }

        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(elevatorNames[0], 100);
@@ -73,7 +74,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 +105,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 +155,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)
        {