工序产量查询

schangxiang@126.com

2024-06-11 bc42866b302006865a605da028a447592b5dbda9

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

@@ -10,153 +10,147 @@
    /// <summary>
    /// 产量查询输出参数
    /// </summary>
    public class QueryYieldOutput
    public class QueryYieldOutput: ExportYieldOutput
    {
        /// <summary>
        /// 工件号
        /// </summary>
        public string WorkPieceID { get; set; }

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

        /// <summary>
        /// 当前工序
        /// </summary>
        public string WorkingProcedureCurrent { get; set; }

        /// <summary>
        /// 当前设备
        /// </summary>
        public string EquipmentID { get; set; }

        /// <summary>
        /// 设备名称
        /// </summary>
        public string EquipmentName { get; set; }
       

        /// <summary>
        /// 工序上线时间
        /// </summary>
        public DateTime? StartTime { get; set; }
        ///// <summary>
        ///// 工件号
        ///// </summary>
        //public string WorkPieceID { get; set; }

        private DateTime? m_EndTime = null;
        ///// <summary>
        ///// 成品码
        ///// </summary>
        //public virtual string OP80NewCode { get; set; }

        /// <summary>
        /// 工序下线时间
        /// </summary>
        public DateTime? EndTime
        {
            get
            {

                if (m_EndTime == null)
                {
                    return null;
                }

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

        /// <summary>
        /// 加工时长
        /// </summary>
        public string TimeSceonds
        {
            get
            {
                if (EndTime == null || StartTime == null || EndTime == Convert.ToDateTime("0001-01-01") || StartTime == Convert.ToDateTime("0001-01-01"))
                {
                    return "";
                }

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

                return Convert.ToInt32(ts.TotalMinutes).ToString() + "min";
            }
        }

        /// <summary>
        /// 质量状态
        /// </summary>
        public int QualityState { get; set; }

        /// <summary>
        /// 质量状态名字
        /// </summary>
        public string QualityStateName
        {
            get
            {
                if (1 == QualityState)
                {
                    return "合格";
        //private DateTime? m_EndTime = null;

                }
                else if (2 == QualityState)
                {
        ///// <summary>
        ///// 工序下线时间
        ///// </summary>
        //public DateTime? EndTime
        //{
        //    get
        //    {

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

                    return "疑似";
                }
                else
                {
                    return "";
                }
            }
        }
        //        if (m_EndTime == Convert.ToDateTime("0001-01-01"))
        //        {
        //            return null;
        //        }
        //        else
        //        {
        //            return m_EndTime;
        //        }
        //    }
        //    set { m_EndTime = value; }
        //}

        /// <summary>
        /// 操作类型（SPC/生产）
        /// </summary>
        public string OperationType { get; set; }
        /// <summary>
        /// 操作类型
        /// </summary>
        public string OperationTypeHand
        {
            get
            {
                string str = "";
                if (string.IsNullOrEmpty(OperationType))
                {
                    str = "其他";
                }
                else
                {
                    str = OperationType;
                }
                return str;
            }
        }
        /// <summary>
        /// 质量信息id
        /// </summary>
        public long QualityDataInfoID { get; set; }
        ///// <summary>
        ///// 加工时长
        ///// </summary>
        //public string TimeSceonds
        //{
        //    get
        //    {
        //        if (EndTime == null || StartTime == null || EndTime == Convert.ToDateTime("0001-01-01") || StartTime == Convert.ToDateTime("0001-01-01"))
        //        {
        //            return "";
        //        }

        /// <summary>
        /// Id主键
        /// </summary>
        public long Id { get; set; }
        /// <summary>
        /// 创建人
        /// </summary>
        public string CreateUserName { get; set; }
        //        TimeSpan ts = Convert.ToDateTime(EndTime) - Convert.ToDateTime(StartTime);

        //        return Convert.ToInt32(ts.TotalMinutes).ToString() + "min";
        //    }
        //}

        ///// <summary>
        ///// 质量状态
        ///// </summary>
        //public int QualityState { get; set; }

        ///// <summary>
        ///// 质量状态名字
        ///// </summary>
        //public string QualityStateName
        //{
        //    get
        //    {
        //        if (1 == QualityState)
        //        {
        //            return "合格";

        //        }
        //        else if (2 == QualityState)
        //        {

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

        //            return "疑似";
        //        }
        //        else
        //        {
        //            return "";
        //        }
        //    }
        //}

        ///// <summary>
        ///// 操作类型（SPC/生产）
        ///// </summary>
        //public string OperationType { get; set; }
        ///// <summary>
        ///// 操作类型
        ///// </summary>
        //public string OperationTypeHand
        //{
        //    get
        //    {
        //        string str = "";
        //        if (string.IsNullOrEmpty(OperationType))
        //        {
        //            str = "其他";
        //        }
        //        else
        //        {
        //            str = OperationType;
        //        }
        //        return str;
        //    }
        //}
        ///// <summary>
        ///// 质量信息id
        ///// </summary>
        //public long QualityDataInfoID { get; set; }

        ///// <summary>
        ///// Id主键
        ///// </summary>
        //public long Id { get; set; }
        ///// <summary>
        ///// 创建人
        ///// </summary>
        //public string CreateUserName { get; set; }

    }

@@ -166,11 +160,11 @@
    [Description("产量查询")]
    public class ExportYieldOutput
    {
        /// <summary>
        /// 工件号
        /// </summary>
        [Description("工件号")]
        public string WorkPieceID { get; set; }
        ///// <summary>
        ///// 设备名称
        ///// </summary>
        //[Description("当前设备")]
        //public string EquipmentName { get; set; }

        /// <summary>
        /// 当前工序
@@ -178,114 +172,16 @@
        [Description("当前工序")]
        public string WorkingProcedureCurrent { get; set; }

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


        /// <summary>
        /// 工序上线时间
        /// 产量汇总 【Editby shaocx,2024-06-11】
        /// </summary>
        [Description("上线时间")]
        public string StartTime { get; set; }

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

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

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

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

                return Convert.ToInt32(ts.TotalMinutes).ToString() + "min";
            }
        }

        /// <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>
        /// 创建人
        /// </summary>
        [Description("数据来源")]
        public string CreateUserName { get; set; }
        [Description("产量")]
        public int YieldCount { get; set; }

    }

    

}