222

schangxiang@126.com

2024-12-09 b9e08c054b2d9a8f6d23535774dacd5406dc43ba

 CC/iWareCC_ASRS/FormCC.cs

@@ -163,7 +163,7 @@
            this.rBNormal.Checked = SystemValue.rBNormal_Checked = true;
            this.rbHand.Checked = SystemValue.rbHand_Checked = false;
            this.rBDebug.Checked = SystemValue.rBDebug_Checked = false;
           



            SetModelCheckBoxToSystemValue();
@@ -339,9 +339,9 @@
                    this.lbl_Alert_DataProcess_BZ39_IssueInboundTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ39_IssueInboundTask;
                    this.lbl_Alert_DataProcess_RobotBuffer_ForceOutbound.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ForceOutbound;
                    this.lbl_Alert_DataProcess_BZ12.Text = showNowTime + SystemWarningMsg._lbl_alert_DataProcess_BZ12;
                    

                    //设置堆垛机任务下发和任务完成确认线程消息
                   

                    this.lbl_Alert_DataProcess_BZ12_FinishTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask;
                    this.lbl_Alert_DataProcess_BZ21_FinishTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ21_FinishTask;

@@ -351,6 +351,8 @@
                    this.lbl_Alert_PushPackageCodeToMes.Text = showNowTime + SystemWarningMsg._lbl_Alert_PushPackageCodeToMes;

                    this.lbl_Alert_DataProcess_BZ12_IssueTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ12_IssueTask;

                    this.lbl_DataProcess_ValidateQiTao.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao;

                    this.lbl_Alert_DataProcess_RobotBuffer_FinishTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask;

@@ -523,9 +525,9 @@
            }
        }

     

     




        #endregion
@@ -597,6 +599,23 @@
                        continue;
                    }
                    stationView = stationServiceClient.GetStationInfo((int)EDevice.Station);


                    this.lbl_Mode_FJ.Text = "设备模式:" + PlcHelper.GetModeName(stationView.R_Mode_FJ);
                    this.lbl_XinTiao_FJ.Text = "心跳:" + stationView.R_HandShake_FJ;
                    this.lbl_Warning_FJ.Text = "报警类型:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_FJ);

                    this.lbl_Mode_MB.Text = "设备模式:" + PlcHelper.GetModeName(stationView.R_Mode_MB);
                    this.lbl_XinTiao_MB.Text = "心跳:" + stationView.R_HandShake_MB;
                    this.lbl_Warning_MB.Text = "报警类型:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_MB);

                    this.lbl_Mode_HB.Text = "设备模式:" + PlcHelper.GetModeName(stationView.R_Mode_HB);
                    this.lbl_XinTiao_HB.Text = "心跳:" + stationView.R_HandShake_HB;
                    this.lbl_Warning_HB.Text = "报警类型:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_HB);

                    this.lbl_Mode_FX.Text = "设备模式:" + PlcHelper.GetModeName(stationView.R_Mode_FX);
                    this.lbl_XinTiao_FX.Text = "心跳:" + stationView.R_HandShake_FX;
                    this.lbl_Warning_FX.Text = "报警类型:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_FX);

                    ////显示RGV任务完成和完成确认信号
                    //this.lbl_R_RGV_Finish.Text = "RGV任务完成:" + rgvView.R_RGV_Finish;
@@ -745,11 +764,11 @@
            });
        }

     


        #endregion

      


        #region 公共

@@ -781,7 +800,7 @@
        }


       


        /// <summary>
        /// 堆垛机任务确认
@@ -933,7 +952,7 @@
        {
            //堆垛机1任务下发
            DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_1, ckB_DataProcess_BZ39_IssueInboundTask);
            


            //堆垛机2任务下发
            DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_2, ckBDataProcess_RobotBuffer_ForceOutbound);
@@ -943,11 +962,11 @@
            DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_3, ckBDataProcess_BZ12);
            DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_3_Finish, ckBDataProcess_BZ21_FinishTask);

          



            //RGV任务下发
          

            DoCommonCheckedChanged(ref SystemValue.isAllowRuning_RgvThreadService_Finish, ckB_PushPaperCutToMes);
            DoCommonCheckedChanged(ref SystemValue.isAllowRuning_RgvThreadService_Finish_BuChang, ck_PushPackageCodeToMes);

@@ -986,8 +1005,8 @@

        private void FormCC_SizeChanged(object sender, EventArgs e)
        {
           
          


        }

        /// <summary>
@@ -1273,7 +1292,7 @@
        }


       


        private void btn_TongJi_Click(object sender, EventArgs e)
        {
@@ -1428,7 +1447,7 @@
            }
        }

      

        private void button22_Click(object sender, EventArgs e)
        {
            var cargNo = this.tb_wlm.Text.Trim();