From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs | 159 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 100 insertions(+), 59 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs
index e97ec45..12db4f7 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs
@@ -1,3 +1,4 @@
+using CMS.Plugin.PipeLineLems.Domain.Shared.Enums;
using CmsQueryExtensions.Extension;
using Volo.Abp.Application.Dtos;
@@ -52,6 +53,96 @@
/// 浠诲姟缂栫爜-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
public SearchFilterModeEnum TaskCode_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 绠℃缂栫爜
+ /// </summary>
+ public string PipeSpecCode { get; set; }
+
+ /// <summary>
+ /// 绠℃缂栫爜-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum PipeSpecCode_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 绠℃鍚嶇О
+ /// </summary>
+ public string PipeSectionName { get; set; }
+
+ /// <summary>
+ /// 绠℃鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum PipeSectionName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 绠℃鍨嬪彿
+ /// </summary>
+ public string PipeSpecMode { get; set; }
+
+ /// <summary>
+ /// 绠℃鍨嬪彿-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum PipeSpecMode_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 宸ュ簭鍚嶇О
+ /// </summary>
+ public string ProcessName { get; set; }
+
+ /// <summary>
+ /// 宸ュ簭鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum ProcessName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 鑸瑰彿
+ /// </summary>
+ public string ShipNumber { get; set; }
+
+ /// <summary>
+ /// 鑸瑰彿-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum ShipNumber_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 椤圭洰鍙�
+ /// </summary>
+ public string ProjectNumber { get; set; }
+
+ /// <summary>
+ /// 椤圭洰鍙�-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum ProjectNumber_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 璁″垝鐘舵��
+ /// </summary>
+ public WorkPlanStatusEnum? WorkPlanStatus { get; set; }
+
+ /// <summary>
+ /// 璁″垝鐘舵��-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum WorkPlanStatus_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 鍙枡鐘舵��
+ /// </summary>
+ public CallMaterialStatusEnum? CallMaterialStatus { get; set; }
+
+ /// <summary>
+ /// 鍙枡鐘舵��-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum CallMaterialStatus_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 宸ヨ壓娴佸悜缂栧彿
+ /// </summary>
+ public string ProcessRouteNumber { get; set; }
+
+ /// <summary>
+ /// 宸ヨ壓娴佸悜缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum ProcessRouteNumber_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
/// 鍘熸枡鏍囪瘑
@@ -224,24 +315,14 @@
public SearchFilterModeEnum EquipmentCode_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- /// 宸ヤ欢鍚嶇О
+ /// 浜х嚎缂栫爜
/// </summary>
- public string WorkpieceName { get; set; }
+ public string ProdLineCode { get; set; }
/// <summary>
- /// 宸ヤ欢鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗�
+ /// 浜х嚎缂栫爜-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum WorkpieceName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 宸ュ簭鍚嶇О
- /// </summary>
- public string ProcessName { get; set; }
-
- /// <summary>
- /// 宸ュ簭鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum ProcessName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ public SearchFilterModeEnum ProdLineCode_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
/// 绠′欢缂栫爜
@@ -262,26 +343,6 @@
/// 椤哄簭鍙�-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
public SearchFilterModeEnum PreSerialNumber_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 绠℃缂栫爜
- /// </summary>
- public string PipeSpecCode { get; set; }
-
- /// <summary>
- /// 绠℃缂栫爜-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum PipeSpecCode_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 绠℃鍚嶇О
- /// </summary>
- public string PipeSectionName { get; set; }
-
- /// <summary>
- /// 绠℃鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum PipeSectionName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
/// 澶栧緞(mm)
@@ -314,31 +375,11 @@
public SearchFilterModeEnum Material_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- /// 鏄惁涓绘敮绠�
- /// </summary>
- public bool? HasMainSignature { get; set; }
-
- /// <summary>
- /// 鏄惁涓绘敮绠�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum HasMainSignature_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 宸ヨ壓娴佸悜缂栧彿
- /// </summary>
- public string ProcessRouteNumber { get; set; }
-
- /// <summary>
- /// 宸ヨ壓娴佸悜缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum ProcessRouteNumber_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
/// 璁″垝寮�濮嬫椂闂�
/// </summary>
//琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
[HighSearchRangeAttribute]
- public List<string> PlannedStartTime { get; set; }
+ public string PlannedStartTime { get; set; }
/// <summary>
@@ -346,7 +387,7 @@
/// </summary>
//琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
[HighSearchRangeAttribute]
- public List<string> PlannedEndTime { get; set; }
+ public string PlannedEndTime { get; set; }
/// <summary>
@@ -374,7 +415,7 @@
/// </summary>
//琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
[HighSearchRangeAttribute]
- public List<string> CreationTime { get; set; }
+ public string CreationTime { get; set; }
/// <summary>
@@ -392,7 +433,7 @@
/// </summary>
//琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
[HighSearchRangeAttribute]
- public List<string> LastModificationTime { get; set; }
+ public string LastModificationTime { get; set; }
/// <summary>
@@ -430,7 +471,7 @@
/// </summary>
//琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
[HighSearchRangeAttribute]
- public List<string> DeletionTime { get; set; }
+ public string DeletionTime { get; set; }
/// <summary>
--
Gitblit v1.9.3