222
schangxiang@126.com
2024-11-23 142e78034cdc629f74090caa62b9b2d216eb0a86
222
已修改7个文件
78 ■■■■ 文件已修改
CC/iWareCC_ASRS/FormCC.Designer.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/FormCC.cs 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/00_269工位/DataProcess_269.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/01_BZ01工位(清灰,洗板后工位)/DataProcess_BZ01.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/02_BZ39工位(补板后工位)/Inbound/1、DataProcess_BZ39.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/02_BZ39工位(补板后工位)/Outbound/2、DataProcess_RobotBuffer_IssueOutboundTask.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/02_BZ39工位(补板后工位)/Outbound/3、DataProcess_RobotBuffer_FinishTaskForOutbound.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/FormCC.Designer.cs
@@ -469,6 +469,7 @@
            this.dataGridViewTextBoxColumn62 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.dataGridViewTextBoxColumn63 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.btn_Find_OutTaskRetryToMes = new System.Windows.Forms.Button();
            this.lbl_RobotMode = new System.Windows.Forms.Label();
            this.tPTransAsrs.SuspendLayout();
            this.panel14.SuspendLayout();
            this.panel15.SuspendLayout();
@@ -2800,6 +2801,7 @@
            // 
            // panel_Model
            // 
            this.panel_Model.Controls.Add(this.lbl_RobotMode);
            this.panel_Model.Controls.Add(this.rBOnlyIn);
            this.panel_Model.Controls.Add(this.lbl_IsSimulationPLC);
            this.panel_Model.Controls.Add(this.lbl_WCFMsg);
@@ -5822,6 +5824,16 @@
            this.btn_Find_OutTaskRetryToMes.UseVisualStyleBackColor = true;
            this.btn_Find_OutTaskRetryToMes.Click += new System.EventHandler(this.btn_Find_OutTaskRetryToMes_Click);
            // 
            // lbl_RobotMode
            //
            this.lbl_RobotMode.AutoSize = true;
            this.lbl_RobotMode.Location = new System.Drawing.Point(275, 659);
            this.lbl_RobotMode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.lbl_RobotMode.Name = "lbl_RobotMode";
            this.lbl_RobotMode.Size = new System.Drawing.Size(127, 15);
            this.lbl_RobotMode.TabIndex = 12;
            this.lbl_RobotMode.Text = "缓存岛机器人模式";
            //
            // FormCC
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -6334,6 +6346,7 @@
        private System.Windows.Forms.TextBox tb_wlm;
        private System.Windows.Forms.Label label22;
        private System.Windows.Forms.Button button23;
        private System.Windows.Forms.Label lbl_RobotMode;
    }
}
CC/iWareCC_ASRS/FormCC.cs
@@ -223,15 +223,15 @@
            new Thread(DataProcess_RobotBuffer_FinishTaskForOutbound.Handler).Start();
            new Thread(DataProcess_RobotBuffer_FinishTask.Handler).Start();
            new Thread(DataProcess_BZ01.Handler).Start();
            new Thread(DataProcess_269.Handler).Start();
            new Thread(DataProcess_BZ39.Handler).Start();
@@ -966,53 +966,6 @@
        #endregion
        #region AGV
        /// <summary>
        /// èŽ·å–AGV车辆列表
        /// </summary>
        public void GetAgvVehicles()
        {
            while (true)
            {
                try
                {
                    if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_AutoQiTaoOutbound && SystemValue.isStartedModel)
                    {
                        AGVRetModel list = AgvRequestHelper.GetVehicles();
                        AgvHandler.SaveAgvData(list);
                        List<String> warningAddressList = new List<string>();
                        if (list.alarms != null && list.alarms.errors != null && list.alarms.errors.Count > 0)
                        {
                            var waringList = list.alarms.errors;
                            if (waringList != null && waringList.Count > 0)
                            {
                                for (int i = 0; i < waringList.Count; i++)
                                {
                                    DeviceWarningHandler.SaveWarning(EDevice.AGV, iWareCommon.Utils.LogType.DataProcess_RobotBuffer_AutoQiTaoOutbound,
                                        waringList[i].code, waringList[i].code, waringList[i].desc);//新增报警
                                    warningAddressList.Add(waringList[i].code);
                                }
                            }
                        }
                        DeviceWarningHandler.AutoCloseWarning(EDevice.AGV, iWareCommon.Utils.LogType.DataProcess_RobotBuffer_AutoQiTaoOutbound, warningAddressList);//自动关闭报警
                        this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.Text = "获取AGV车辆信息成功";
                    }
                }
                catch (Exception ex)
                {
                    Log4NetHelper.WriteErrorLog(iWareCommon.Utils.LogType.CCWCFService, "获取AGV车辆列表 å‡ºçް异叏:" + ex.Message, ex);
                    this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.Text = "获取AGV车辆信息异常:" + ex.Message;
                }
                finally
                {
                    Thread.Sleep(5000);//5秒一次
                }
            }
        }
        #endregion
        #region å…¶ä»–线程
@@ -1876,6 +1829,8 @@
                        this.btn_Start.BackColor = default_btn_Start_Color;//还原颜色
                    }
                }
                this.lbl_RobotMode.Text = "缓存岛机器人模式:" + (IsAllowRunOutMode ? "出库模式" : "入库模式");
            }
        }
CC/iWareCC_ASRS/ThreadService/00_269¹¤Î»/DataProcess_269.cs
@@ -30,7 +30,7 @@
            LogType logType = LogType.DataProcess_269;
            while (true)
            {
                Thread.Sleep(2000);//休眠2秒,将休眠写到前面,是为了下面的continue方法执行后不显示错误信息的提示!!!【EditBy shaocx,2022-05-24】
                Thread.Sleep(1000);//休眠2秒,将休眠写到前面,是为了下面的continue方法执行后不显示错误信息的提示!!!【EditBy shaocx,2022-05-24】
                SystemWarningMsg._lbl_alert_DataProcess_269 = string.Empty;
                try
                {
CC/iWareCC_ASRS/ThreadService/01_BZ01¹¤Î»£¨Çå»Ò£¬Ï´°åºó¹¤Î»£©/DataProcess_BZ01.cs
@@ -33,7 +33,7 @@
            LogType logType = LogType.DataProcess_BZ01;
            while (true)
            {
                Thread.Sleep(2000);//休眠2秒,将休眠写到前面,是为了下面的continue方法执行后不显示错误信息的提示!!!【EditBy shaocx,2022-05-24】
                Thread.Sleep(1000);//休眠2秒,将休眠写到前面,是为了下面的continue方法执行后不显示错误信息的提示!!!【EditBy shaocx,2022-05-24】
                SystemWarningMsg._lbl_alert_DataProcess_BZ01 = string.Empty;
                try
                {
CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Inbound/1¡¢DataProcess_BZ39.cs
@@ -30,7 +30,7 @@
            LogType logType = LogType.DataProcess_BZ39;
            while (true)
            {
                Thread.Sleep(2000);//休眠2秒,将休眠写到前面,是为了下面的continue方法执行后不显示错误信息的提示!!!【EditBy shaocx,2022-05-24】
                Thread.Sleep(1000);//休眠2秒,将休眠写到前面,是为了下面的continue方法执行后不显示错误信息的提示!!!【EditBy shaocx,2022-05-24】
                SystemWarningMsg._lbl_alert_DataProcess_BZ39 = string.Empty;
                try
                {
CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Outbound/2¡¢DataProcess_RobotBuffer_IssueOutboundTask.cs
@@ -30,7 +30,7 @@
            LogType logType = LogType.DataProcess_RobotBuffer_IssueOutboundTask;
            while (true)
            {
                Thread.Sleep(2000);//休眠2秒,将休眠写到前面,是为了下面的continue方法执行后不显示错误信息的提示!!!【EditBy shaocx,2022-05-24】
                Thread.Sleep(1000);//休眠2秒,将休眠写到前面,是为了下面的continue方法执行后不显示错误信息的提示!!!【EditBy shaocx,2022-05-24】
                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = string.Empty;
                try
                {
CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Outbound/3¡¢DataProcess_RobotBuffer_FinishTaskForOutbound.cs
@@ -22,7 +22,7 @@
            LogType logType = LogType.DataProcess_RobotBuffer_FinishTaskForOutbound;
            while (true)
            {
                Thread.Sleep(2000);//休眠2秒,将休眠写到前面,是为了下面的continue方法执行后不显示错误信息的提示!!!【EditBy shaocx,2022-05-24】
                Thread.Sleep(500);//休眠2秒,将休眠写到前面,是为了下面的continue方法执行后不显示错误信息的提示!!!【EditBy shaocx,2022-05-24】
                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = string.Empty;
                try
                {