OP30工序质量信息添加各工位质量显示

schangxiang@126.com

2024-06-11 2954a2dd4529679ff30c1fd08870895c29d507f2

 iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoOutput.cs

@@ -43,7 +43,7 @@
        /// 工件号
        /// </summary>
        public string WorkPieceID { get; set; }
        

        /// <summary>
        /// 设备
        /// </summary>
@@ -53,12 +53,12 @@
        /// 设备名称
        /// </summary>
        public string EquipmentName { get; set; }
        

        /// <summary>
        /// 工序
        /// </summary>
        public string WorkingProcedure { get; set; }
        

        /// <summary>
        /// 质量状态
        /// </summary>
@@ -122,27 +122,27 @@
        {
            get
            {
                if(string.IsNullOrEmpty(EquipmentID))
                if (string.IsNullOrEmpty(EquipmentID))
                {
                    return string.Empty;
                }
                string  qs = "";
                if(EquipmentID.Equals("EOP10"))
                string qs = "";
                if (EquipmentID.Equals("EOP10"))
                {
                    if (string.IsNullOrEmpty(WorkingProcedure))
                    {
                        return (string.IsNullOrEmpty(OP10QualityState)|| string.IsNullOrEmpty(OP40QualityState))?(GetQualityStateName(OP10QualityState)+ GetQualityStateName(OP40QualityState)): ((GetQualityStateName(OP10QualityState) +"|"+ GetQualityStateName(OP40QualityState)));
                        return (string.IsNullOrEmpty(OP10QualityState) || string.IsNullOrEmpty(OP40QualityState)) ? (GetQualityStateName(OP10QualityState) + GetQualityStateName(OP40QualityState)) : ((GetQualityStateName(OP10QualityState) + "|" + GetQualityStateName(OP40QualityState)));
                    }
                    if (WorkingProcedure.Equals("OP10"))
                    {
                        qs=OP10QualityState;
                        qs = OP10QualityState;
                    }
                    else
                    {
                        qs = OP40QualityState;
                    }
                }
                else if(EquipmentID.Equals("EOP20"))
                else if (EquipmentID.Equals("EOP20"))
                {
                    qs = OP20QualityState;
                }
@@ -171,7 +171,7 @@
        /// 操作方式
        /// </summary>
        public string QualityStateUpdateMode { get; set; }
        

        /// <summary>
        /// 操作人
        /// </summary>
@@ -196,7 +196,7 @@
                {
                    if (string.IsNullOrEmpty(WorkingProcedure))
                    {
                        return OP10QualityReceiveTime.ToString()+ ((OP10QualityReceiveTime.HasValue&& OP40QualityReceiveTime.HasValue)?"|":"")+ OP40QualityReceiveTime.ToString();
                        return OP10QualityReceiveTime.ToString() + ((OP10QualityReceiveTime.HasValue && OP40QualityReceiveTime.HasValue) ? "|" : "") + OP40QualityReceiveTime.ToString();
                    }
                    if (WorkingProcedure.Equals("OP10"))
                    {
@@ -231,7 +231,7 @@
            }
        }

        private DateTime? m_EndTime=null;
        private DateTime? m_EndTime = null;
        /// <summary>
        /// 下线时间
        /// </summary>
@@ -239,7 +239,7 @@
        {
            get
            {
                if (m_EndTime.HasValue&& m_EndTime.Value.Date==DateTime.Parse("0001-01-01"))
                if (m_EndTime.HasValue && m_EndTime.Value.Date == DateTime.Parse("0001-01-01"))
                {
                    return null;
                }
@@ -250,7 +250,7 @@
            }
            set { m_EndTime = value; }
        }
        

        /// <summary>
        /// 连杆厚度;OP10/OP40
        /// </summary>
@@ -261,7 +261,7 @@
        /// 小头孔直径;OP20/OP60/OP80
        /// </summary>
        public string QualityOP20To1 { get; set; }
        

        /// <summary>
        /// 涨断力矩;OP30
        /// </summary>
@@ -309,87 +309,87 @@
        /// 衬套压装力矩;OP30
        /// </summary>
        public string QualityOP30To6 { get; set; }
        

        /// <summary>
        /// 衬套压装位移;OP30
        /// </summary>
        public string QualityOP30To7 { get; set; }
        

        /// <summary>
        /// 压装力矩;OP35
        /// </summary>
        public string QualityOP35To1 { get; set; }
        

        /// <summary>
        /// Y轴位移;OP35
        /// </summary>
        public string QualityOP35To2 { get; set; }
        

        /// <summary>
        /// 大头孔直径;OP60/OP80
        /// </summary>
        public string QualityOP60To1 { get; set; }
        

        /// <summary>
        /// 校验码结果;OP60
        /// </summary>
        public string QualityOP60To2 { get; set; }
        

        /// <summary>
        /// 清洗温度;OP70
        /// </summary>
        public string QualityOP70To1 { get; set; }
        

        /// <summary>
        /// 清洗压力;OP70
        /// </summary>
        public string QualityOP70To2 { get; set; }
        

        /// <summary>
        /// 出口处工件温度;OP70
        /// </summary>
        public string QualityOP70To3 { get; set; }
        

        /// <summary>
        /// 大头重量;OP80
        /// </summary>
        public string QualityOP80To1 { get; set; }
        

        /// <summary>
        /// 小头重量;OP80
        /// </summary>
        public string QualityOP80To2 { get; set; }
        

        /// <summary>
        /// 总重;OP80
        /// </summary>
        public string QualityOP80To3 { get; set; }
        

        /// <summary>
        /// 弯曲;OP80
        /// </summary>
        public string QualityOP80To4 { get; set; }
        

        /// <summary>
        /// 扭度;OP80
        /// </summary>
        public string QualityOP80To5 { get; set; }
        

        /// <summary>
        /// 大头垂直度;OP80
        /// </summary>
        public string QualityOP80To6 { get; set; }
        

        /// <summary>
        /// 大头孔分组级别;OP80
        /// </summary>
        public string QualityOP80To7 { get; set; }
        

        /// <summary>
        /// 小头孔分组级别;OP80
        /// </summary>
        public string QualityOP80To8 { get; set; }
        

        /// <summary>
        /// 重量组别;OP80
        /// </summary>
@@ -433,6 +433,40 @@

        public string OP30QualityStateCH6 { get; set; }

        public string OP30QualityStateCH3Name
        {
            get
            {
                if (string.IsNullOrEmpty(OP30QualityStateCH3)) return string.Empty;
                return GetQualityStateName(OP30QualityStateCH3.ToString());
            }
        }
        public string OP30QualityStateCH4Name
        {
            get
            {
                if (string.IsNullOrEmpty(OP30QualityStateCH4)) return string.Empty;
                return GetQualityStateName(OP30QualityStateCH4.ToString());
            }
        }
        public string OP30QualityStateCH5Name
        {
            get
            {
                if (string.IsNullOrEmpty(OP30QualityStateCH5)) return string.Empty;
                return GetQualityStateName(OP30QualityStateCH5.ToString());
            }
        }
        public string OP30QualityStateCH6Name
        {
            get
            {
                if (string.IsNullOrEmpty(OP30QualityStateCH6)) return string.Empty;
                return GetQualityStateName(OP30QualityStateCH6.ToString());
            }
        }


        public string OP30QualityState { get; set; }
        public string OP35QualityState { get; set; }

@@ -446,7 +480,7 @@
        /// 备注
        /// </summary>
        public string Remarks { get; set; }
        

        /// <summary>
        /// Id主键
        /// </summary>
@@ -455,7 +489,7 @@
        /// <summary>
        /// 创建时间
        /// </summary>
        public DateTimeOffset ?CreatedTime { get; set; }
        public DateTimeOffset? CreatedTime { get; set; }
        /// <summary>
        /// 创建时间
        /// </summary>
@@ -500,7 +534,7 @@
        /// 质量状态名称
        /// </summary>
        [Description("质量状态")]
        public string QualityStateName{ get; set; }
        public string QualityStateName { get; set; }

        /// <summary>
        /// 操作方式