From 8f90e48ca076b05efd226c88760be4ef6fca357a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 04 9月 2024 13:38:43 +0800
Subject: [PATCH] 111
---
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs | 135 +++------------------------------
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs | 9 +
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceLogYieldInput.cs | 16 ++++
iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceLog.cs | 23 +++++
iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml | 20 +++++
5 files changed, 78 insertions(+), 125 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..99ab38f 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,6 +4,7 @@
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
namespace iWare.Wms.Application
{
@@ -15,130 +16,22 @@
/// </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; }
}
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceLogYieldInput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceLogYieldInput.cs
index 11212de..f6d7162 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceLogYieldInput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceLogYieldInput.cs
@@ -1,5 +1,6 @@
锘縰sing 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>
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
index 851e6ff..1446283 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
@@ -81,10 +81,10 @@
&& process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
&& process.WorkingProcedureCurrent == (string.IsNullOrEmpty(input.WorkingProcedureCurrent) ? process.WorkingProcedureCurrent : input.WorkingProcedureCurrent)
&& workPiece2.OP80NewCode == (string.IsNullOrEmpty(input.OP80NewCode) ? workPiece2.OP80NewCode : input.OP80NewCode)
-
+
&& process.CreatedUserName.Contains(string.IsNullOrEmpty(input.createUserName) ? "" : input.createUserName)
&& process.UpdatedUserName.Contains(string.IsNullOrEmpty(input.updatedUserName) ? "" : input.updatedUserName)
-
+
&& process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
&& process.OperationType == (string.IsNullOrEmpty(input.OperationType) ? process.OperationType : input.OperationType)
&& !string.IsNullOrEmpty(process.WorkPieceID)
@@ -147,7 +147,7 @@
&& process.StartTime <= (input.StartTimeEndTime.HasValue ? input.StartTimeEndTime : DateTime.MaxValue)
select new WorkPieceProcessExcelOutput
{
-
+
OP80NewCode = workPiece2.OP80NewCode,
Id = process.Id,
@@ -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)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml b/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
index ac18493..387e657 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
+++ b/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
@@ -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 @@
浜ч噺姹囨�� 銆怑ditby 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>
宸ヤ欢鍙�
diff --git a/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceLog.cs b/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceLog.cs
index 4e51830..b002e8a 100644
--- a/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceLog.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceLog.cs
@@ -89,7 +89,7 @@
/// </summary>
[Comment("璐ㄩ噺鐘舵��")]
public int QualityState { get; set; }
-
+
/// <summary>
/// 璁惧缂栧彿
@@ -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; }
}
}
--
Gitblit v1.9.3