iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs
@@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore; using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; namespace iWare.Wms.Application { @@ -16,129 +17,21 @@ 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; } }
@@ -1,5 +1,6 @@ using iWare.Wms.Core; using iWare.Wms.Core.Service; using Microsoft.EntityFrameworkCore; using System.ComponentModel.DataAnnotations; namespace iWare.Wms.Application @@ -9,6 +10,19 @@ public class WorkPieceLogYieldInput : PageInputBase { /// <summary> /// 日志类型 /// </summary> [Comment("日志类型")] public int? PieceLogType { get; set; } /// <summary> /// 日志类型 /// </summary> [Comment("日志类型")] [MaxLength(255)] public string PieceLogTypeName { get; set; } /// <summary> /// 工件号 /// </summary> @@ -36,6 +50,8 @@ public virtual string createdUserName { get; set; } public virtual string remarks { get; set; } /// <summary> /// 工序上线时间 /// </summary> iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
@@ -276,6 +276,9 @@ .Where(!string.IsNullOrEmpty(input.WorkPieceID), u => u.WorkPieceID.Contains(input.WorkPieceID)) .Where(!string.IsNullOrEmpty(input.workingProcedure), u => u.WorkingProcedure.Contains(input.workingProcedure)) .Where(!string.IsNullOrEmpty(input.createdUserName), u => u.CreatedUserName.Contains(input.createdUserName)) .Where(!string.IsNullOrEmpty(input.PieceLogTypeName), u => u.PieceLogTypeName.Contains(input.PieceLogTypeName)) .Where(input.PieceLogType != null, u => u.PieceLogType == input.PieceLogType) .Where(!string.IsNullOrEmpty(input.remarks), u => u.Remarks.Contains(input.remarks)) .Where(!string.IsNullOrEmpty(input.StartTimeBeginTime.ToString()), u => u.CreatedTime >= input.StartTimeBeginTime) .Where(!string.IsNullOrEmpty(input.StartTimeEndTime.ToString()), u => u.CreatedTime <= input.StartTimeEndTime)
@@ -15271,6 +15271,16 @@ 当前设备 </summary> </member> <member name="P:iWare.Wms.Application.QueryWorkPieceLogYieldOutput.PieceLogType"> <summary> 日志类型 </summary> </member> <member name="P:iWare.Wms.Application.QueryWorkPieceLogYieldOutput.PieceLogTypeName"> <summary> 日志类型 </summary> </member> <member name="P:iWare.Wms.Application.ExportYQueryWorkPieceLogYieldOutput.WorkingProcedure"> <summary> 当前工序 @@ -15316,6 +15326,16 @@ 产量汇总 【Editby shaocx,2024-06-11】 </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.PieceLogType"> <summary> 日志类型 </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.PieceLogTypeName"> <summary> 日志类型 </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.WorkPieceID"> <summary> 工件号 iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceLog.cs
@@ -246,6 +246,27 @@ [MaxLength(255)] public string Remarks { get; set; } /// <summary> /// 备注 /// </summary> [Comment("备注")] [MaxLength(255)] public string MyRemarks { get; set; } /// <summary> /// 日志类型 /// </summary> [Comment("日志类型")] public int? PieceLogType { get; set; } /// <summary> /// 日志类型 /// </summary> [Comment("日志类型")] [MaxLength(255)] public string PieceLogTypeName { get; set; } } }
