From 16edbbe772e24eb71f6519558576d513e3cf2746 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 9月 2025 15:31:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/DF22001YiQi
---
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs | 150 ++++++++------------------------------------------
1 files changed, 24 insertions(+), 126 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs
index 1bef04d..c6a38a6 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs
+++ b/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>
- ///// 鎿嶄綔绫诲瀷锛圫PC/鐢熶骇锛�
- ///// </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; }
}
@@ -166,12 +62,16 @@
- [Description("澶囨敞")]
- public string Remarks { get; set; }
+ //[Description("澶囨敞")]
+ //public string Remarks { get; set; }
- [Description("鍒涘缓浜�")]
+ [Description("鏉ユ簮")]
+ public string DataCapturePointCname { get; set; }
+
+
+ [Description("鏉ユ簮浠ｇ爜")]
public virtual string CreatedUserName { get; set; }
/// <summary>
@@ -180,8 +80,6 @@
[Description("鍒涘缓鏃堕棿")]
public virtual DateTimeOffset? CreatedTime { get; set; }
-
-
--
Gitblit v1.9.3