1

schangxiang@126.com

2024-09-10 8a9d796e5d54b773ec01fd3da7d574c38a533ba9

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

@@ -4,141 +4,37 @@
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;

namespace iWare.Wms.Application
{

    public class QueryWorkPieceLogYieldOutput : ExportYQueryWorkPieceLogYieldOutput
    {

        public long Id { get; set; }

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

        

        [Description("备注")]
        public string MyRemarks { get; set; }

        /// <summary>
        /// 日志类型
        /// </summary>
        [Comment("日志类型")]
        public int? PieceLogType { get; set; }






        //private DateTime? m_EndTime = null;

        ///// <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 "合格";

        //        }
        //        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; }
        /// <summary>
        /// 日志类型
        /// </summary>
        [Comment("日志类型")]
        [MaxLength(255)]
        public string PieceLogTypeName { get; set; }

    }

@@ -181,7 +77,7 @@
        public virtual DateTimeOffset? CreatedTime { get; set; }