2

schangxiang@126.com

2024-08-28 0240b3c4b808b93b88cb4f97f45d2475f6001429

 iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs

@@ -26,10 +26,27 @@
    /// </summary>
    public class WorkPieceProcessOutput
    {

        /// <summary>
        /// 质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】
        /// </summary>
        public int? QualityNoOk { get; set; }

        /// <summary>
        /// 质量不合格原因 【Editby shaocx,2024-06-26】
        /// </summary>
        public string QualityNoOkReason { get; set; }


        /// <summary>
        /// 工件号
        /// </summary>
        public string WorkPieceID { get; set; }

        /// <summary>
        /// 成品码
        /// </summary>
        public virtual string OP80NewCode { get; set; }

        /// <summary>
        /// 当前工序
@@ -174,119 +191,123 @@
    /// </summary>
    [Description("工件加工追溯信息(工件+工序)")]
    public class WorkPieceProcessExcelOutput
    {
        /// <summary>
        /// 工件号
        /// </summary>
        [Description("工件号")]
        public string WorkPieceID { get; set; }

        /// <summary>
        /// 当前工序
        /// </summary>
        [Description("当前工序")]
        public string WorkingProcedureCurrent { get; set; }

        /// <summary>
        /// 设备名称
        /// </summary>
        [Description("设备名称")]
        public string EquipmentName { get; set; }

        /// <summary>
        /// 工序上线时间
        /// </summary>
        [Description("上线时间")]
        public string StartTime { get; set; }

        private string m_EndTime = "";
        /// <summary>
        /// 工序下线时间
        /// </summary>
        [Description("下线时间")]
        public string EndTime
        {
            /// <summary>
            /// 工件号
            /// </summary>
            [Description("工件号")]
            public string WorkPieceID { get; set; }

            /// <summary>
            /// 当前工序
            /// </summary>
            [Description("当前工序")]
            public string WorkingProcedureCurrent { get; set; }

            /// <summary>
            /// 设备名称
            /// </summary>
            [Description("设备名称")]
            public string EquipmentName { get; set; }

            /// <summary>
            /// 工序上线时间
            /// </summary>
            [Description("上线时间")]
            public string StartTime { get; set; }

            private string m_EndTime = "";
            /// <summary>
            /// 工序下线时间
            /// </summary>
            [Description("下线时间")]
            public string EndTime
            get
            {
                get
                if (string.IsNullOrEmpty(m_EndTime))
                {
                    if (string.IsNullOrEmpty(m_EndTime))
                    {
                        return "";
                    }

                    if (m_EndTime.Contains("0001-01-01"))
                    {
                        return "";
                    }
                    else
                    {
                        return m_EndTime;
                    }
                    return "";
                }
                set { m_EndTime = value; }
            }

            /// <summary>
            /// 加工时长
            /// </summary>
            [Description("加工时长")]
            public string TimeSceonds
            {
                get
                if (m_EndTime.Contains("0001-01-01"))
                {
                    if (string.IsNullOrEmpty(EndTime) || string.IsNullOrEmpty(StartTime))
                    {
                        return "";
                    }

                    TimeSpan ts = Convert.ToDateTime(EndTime) - Convert.ToDateTime(StartTime);

                    return Convert.ToInt32(ts.TotalMinutes).ToString() + "min";
                    return "";
                }
                else
                {
                    return m_EndTime;
                }
            }
            set { m_EndTime = value; }
        }

            /// <summary>
            /// 质量状态
            /// </summary>
            public int QualityState { get; set; }
            /// <summary>
            /// 质量状态名称
            /// </summary>
            [Description("质量状态")]
            public string QualityStateName
        /// <summary>
        /// 加工时长
        /// </summary>
        [Description("加工时长")]
        public string TimeSceonds
        {
            get
            {
                get
                if (string.IsNullOrEmpty(EndTime) || string.IsNullOrEmpty(StartTime))
                {
                    if (1 == QualityState)
                    {
                        return "合格";
                    return "";
                }

                    }
                    else if (2 == QualityState)
                    {
                TimeSpan ts = Convert.ToDateTime(EndTime) - Convert.ToDateTime(StartTime);

                        return "不合格";
                    }
                    else if (3 == QualityState)
                    {
                return Convert.ToInt32(ts.TotalMinutes).ToString() + "min";
            }
        }

                        return "疑似";
                    }
                    else
                    {
                        return "";
                    }
        /// <summary>
        /// 质量状态
        /// </summary>
        public int QualityState { get; set; }
        /// <summary>
        /// 质量状态名称
        /// </summary>
        [Description("质量状态")]
        public string QualityStateName
        {
            get
            {
                if (1 == QualityState)
                {
                    return "合格";

                }
                else if (2 == QualityState)
                {

                    return "不合格";
                }
                else if (3 == QualityState)
                {

                    return "疑似";
                }
                else
                {
                    return "";
                }
            }
        }
        /// <summary>
        /// 成品码
        /// </summary>
        [Description("成品码")]
        public string OP80NewCode { get; set; }


            /// <summary>
            /// Id主键
            /// </summary>
            public long Id { get; set; }
        /// <summary>
        /// Id主键
        /// </summary>
        public long Id { get; set; }
        /// <summary>
        /// 创建人
        /// </summary>
        [Description("信息来源")]
        [Description("数据来源")]
        public string CreateUserName { get; set; }

    }
@@ -296,6 +317,16 @@
    /// </summary>
    public class WorkPieceInfoMachiningPageOutput
    {
        /// <summary>
        /// 质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】
        /// </summary>
        public int? QualityNoOk { get; set; }

        /// <summary>
        /// 质量不合格原因 【Editby shaocx,2024-06-26】
        /// </summary>
        public string QualityNoOkReason { get; set; }

        /// <summary>
        /// 颜色类型
        /// 检测工件： 1   黄色
@@ -327,6 +358,12 @@
        /// 工件号
        /// </summary>
        public string WorkPieceID { get; set; }


        /// <summary>
        /// 成品码
        /// </summary>
        public virtual string OP80NewCode { get; set; }

        /// <summary>
        /// 当前工序
@@ -692,7 +729,7 @@
        /// <summary>
        /// 质量状态
        /// </summary>
        public int? QualityState { get; set; }
        private int? QualityState { get; set; }

        /// <summary>
        /// 质量状态名字
@@ -724,6 +761,13 @@
            }
        }


        /// <summary>
        /// 成品码
        /// </summary>
        [Description("成品码")]
        public string OP80NewCode { get; set; }

        /// <summary>
        /// Id主键
        /// </summary>