From f63d5e9591f8ade8fa7ccb4523d27ff26be81feb Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 07 5月 2025 14:10:14 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx | 656 +++++++++++++------------
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateOrUpdateDtoBase.cs | 4
HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx | 68 +-
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs | 1
Weben_CMS专用代码生成器/Code/Utility/ListHelper.cs | 29 +
Weben_CMS专用代码生成器/Code/Templete/Web/Controllers/EntityMode模板.txt | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/DodevicetypeEnum.cs | 34 +
HIAWms/web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/CMS.Plugin.HIAWms.Domain.Shared.csproj | 5
Weben_CMS专用代码生成器/Code/Templete/Web/Controllers/EntityModeQueryDrawer模板.txt | 23
HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx | 19
HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts | 179 +++---
Weben_CMS专用代码生成器/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsTask/WmsTask.cs | 5
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs | 340 ++++++------
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskExportModel.cs | 4
HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.ts | 4
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 32
HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/TaskDodeviceStatus.cs | 71 ++
20 files changed, 843 insertions(+), 643 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs
index 53210fd..c4e2357 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs
@@ -1,5 +1,4 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using CmsQueryExtensions;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs
index e6d32d1..9e0ba7b 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs
@@ -248,7 +248,7 @@
/// </summary>
//琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
[HighSearchRangeAttribute]
- public string CreationTime { get; set; }
+ public List<string> CreationTime { get; set; }
/// <summary>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateOrUpdateDtoBase.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateOrUpdateDtoBase.cs
index 134b62b..1a70a22 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateOrUpdateDtoBase.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateOrUpdateDtoBase.cs
@@ -57,12 +57,12 @@
/// <summary>
/// 璁惧绫诲瀷
/// </summary>
- public int Dodevicetype { get; set; }
+ public DodevicetypeEnum Dodevicetype { get; set; }
/// <summary>
/// 璁惧浠诲姟鐘舵��
/// </summary>
- public int TaskDodeviceStatus { get; set; }
+ public TaskDodeviceStatus TaskDodeviceStatus { get; set; }
/// <summary>
/// WCS鏄惁鍙互璇诲彇
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs
index 8d2fe5b..e532081 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskDto.cs
@@ -1,206 +1,206 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using CmsQueryExtensions;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Data;
-using Volo.Abp.Domain.Entities;
-
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
-
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
+using CmsQueryExtensions;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Data;
+using Volo.Abp.Domain.Entities;
+
+
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
+
/// <summary>
/// Wms浠诲姟绠＄悊鏁版嵁鍙傛暟瀵硅薄
/// </summary>
-public class WmsTaskDto : ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
-{
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- public string TaskNo { get; set; }
+public class WmsTaskDto: ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
+{
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ public string TaskNo { get; set; }
- /// <summary>
- /// 浠诲姟绫诲瀷
- /// </summary>
- public TaskTypeEnum TaskType { get; set; }
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ public TaskTypeEnum TaskType { get; set; }
- /// <summary>
- /// 浠诲姟绫诲瀷
- /// </summary>
- public string TaskTypeDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(TaskType);
- }
- }
- /// <summary>
- /// 浠诲姟绛夌骇
- /// </summary>
- public int TaskLevel { get; set; }
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ public string TaskTypeDesc
+ {
+ get
+ {
+ return GetEnumDescriptionUtil.GetEnumDescription(TaskType);
+ }
+ }
+ /// <summary>
+ /// 浠诲姟绛夌骇
+ /// </summary>
+ public int TaskLevel { get; set; }
- /// <summary>
- /// 浠诲姟鐘舵��
- /// </summary>
- public WmsTaskStatus TaskStatus { get; set; }
+ /// <summary>
+ /// 浠诲姟鐘舵��
+ /// </summary>
+ public WmsTaskStatus TaskStatus { get; set; }
- /// <summary>
- /// 浠诲姟鐘舵��
- /// </summary>
- public string TaskStatusDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(TaskStatus);
- }
- }
- /// <summary>
- /// 鎵樼洏缂栧彿
- /// </summary>
- public string? ContainerNo { get; set; }
+ /// <summary>
+ /// 浠诲姟鐘舵��
+ /// </summary>
+ public string TaskStatusDesc
+ {
+ get
+ {
+ return GetEnumDescriptionUtil.GetEnumDescription(TaskStatus);
+ }
+ }
+ /// <summary>
+ /// 鎵樼洏缂栧彿
+ /// </summary>
+ public string? ContainerNo { get; set; }
- /// <summary>
- /// 璧峰搴撲綅
- /// </summary>
- public string? SourcePlace { get; set; }
+ /// <summary>
+ /// 璧峰搴撲綅
+ /// </summary>
+ public string? SourcePlace { get; set; }
- /// <summary>
- /// 鐩爣搴撲綅
- /// </summary>
- public string? ToPlace { get; set; }
+ /// <summary>
+ /// 鐩爣搴撲綅
+ /// </summary>
+ public string? ToPlace { get; set; }
- /// <summary>
- /// 宸烽亾
- /// </summary>
- public int? Aisle { get; set; }
+ /// <summary>
+ /// 宸烽亾
+ /// </summary>
+ public int? Aisle { get; set; }
- /// <summary>
- /// 鍫嗗灈鏈篒D
- /// </summary>
- public int? DodeviceId { get; set; }
+ /// <summary>
+ /// 鍫嗗灈鏈篒D
+ /// </summary>
+ public int? DodeviceId { get; set; }
- /// <summary>
- /// 璁惧绫诲瀷
- /// </summary>
- public int Dodevicetype { get; set; }
+ /// <summary>
+ /// 璁惧绫诲瀷
+ /// </summary>
+ public int Dodevicetype { get; set; }
- /// <summary>
- /// 璁惧浠诲姟鐘舵��
- /// </summary>
- public int TaskDodeviceStatus { get; set; }
+ /// <summary>
+ /// 璁惧浠诲姟鐘舵��
+ /// </summary>
+ public int TaskDodeviceStatus { get; set; }
- /// <summary>
- /// WCS鏄惁鍙互璇诲彇
- /// </summary>
- public bool IsRead { get; set; }
+ /// <summary>
+ /// WCS鏄惁鍙互璇诲彇
+ /// </summary>
+ public bool IsRead { get; set; }
- /// <summary>
- /// 瀛愪换鍔＄被鍨�
- /// </summary>
- public SonTaskTypeEnum? SonTaskType { get; set; }
+ /// <summary>
+ /// 瀛愪换鍔＄被鍨�
+ /// </summary>
+ public SonTaskTypeEnum? SonTaskType { get; set; }
- /// <summary>
- /// 瀛愪换鍔＄被鍨�
- /// </summary>
- public string? SonTaskTypeDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(SonTaskType);
- }
- }
- /// <summary>
- /// 鏉ユ簮鍗曟嵁鍙�
- /// </summary>
- public string? SourceOrderNo { get; set; }
+ /// <summary>
+ /// 瀛愪换鍔＄被鍨�
+ /// </summary>
+ public string? SonTaskTypeDesc
+ {
+ get
+ {
+ return GetEnumDescriptionUtil.GetEnumDescription(SonTaskType);
+ }
+ }
+ /// <summary>
+ /// 鏉ユ簮鍗曟嵁鍙�
+ /// </summary>
+ public string? SourceOrderNo { get; set; }
- /// <summary>
- /// 涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛
- /// </summary>
- public int? IsNextTask { get; set; }
+ /// <summary>
+ /// 涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛
+ /// </summary>
+ public int? IsNextTask { get; set; }
- /// <summary>
- /// 鍙彉鍙橀噺1
- /// </summary>
- public string? MutableParam1 { get; set; }
+ /// <summary>
+ /// 鍙彉鍙橀噺1
+ /// </summary>
+ public string? MutableParam1 { get; set; }
- /// <summary>
- /// 鍙彉鍙橀噺2
- /// </summary>
- public string? MutableParam2 { get; set; }
+ /// <summary>
+ /// 鍙彉鍙橀噺2
+ /// </summary>
+ public string? MutableParam2 { get; set; }
- /// <summary>
- /// 鍙彉鍙橀噺3
- /// </summary>
- public string? MutableParam3 { get; set; }
+ /// <summary>
+ /// 鍙彉鍙橀噺3
+ /// </summary>
+ public string? MutableParam3 { get; set; }
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public int Sort { get; set; }
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public int Sort { get; set; }
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; }
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public bool? IsDisabled { get; set; }
- /// <summary>
- ///
- /// </summary>
- public ExtraPropertyDictionary? ExtraProperties { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public ExtraPropertyDictionary? ExtraProperties { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string? ConcurrencyStamp { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string? ConcurrencyStamp { get; set; }
- /// <summary>
- ///
- /// </summary>
- public DateTime CreationTime { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public DateTime CreationTime { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string? CreatorId { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string? CreatorId { get; set; }
- /// <summary>
- ///
- /// </summary>
- public DateTime? LastModificationTime { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public DateTime? LastModificationTime { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string? LastModifierId { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string? LastModifierId { get; set; }
- /// <summary>
- ///
- /// </summary>
- public bool IsDeleted { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public bool IsDeleted { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string? DeleterId { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string? DeleterId { get; set; }
- /// <summary>
- ///
- /// </summary>
- public DateTime? DeletionTime { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public DateTime? DeletionTime { get; set; }
-
-
+
+
/// <summary>
/// Gets the export data.
/// </summary>
/// <returns></returns>
- public Dictionary<string, object> GetExportData()
- {
- var exportData = new Dictionary<string, object>();
- foreach (var property in this.GetType().GetProperties())
- {
- exportData.Add(property.Name, property.GetValue(this));
- }
-
- return exportData;
- }
-}
+ public Dictionary<string, object> GetExportData()
+ {
+ var exportData = new Dictionary<string, object>();
+ foreach (var property in this.GetType().GetProperties())
+ {
+ exportData.Add(property.Name, property.GetValue(this));
+ }
+
+ return exportData;
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskExportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskExportModel.cs
index 4f0f127..c083ba3 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskExportModel.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskExportModel.cs
@@ -68,13 +68,13 @@
/// 璁惧绫诲瀷
/// </summary>
[ExcelColumn(Name = "璁惧绫诲瀷", Width = 25)]
- public int Dodevicetype { get; set; }
+ public DodevicetypeEnum Dodevicetype { get; set; }
/// <summary>
/// 璁惧浠诲姟鐘舵��
/// </summary>
[ExcelColumn(Name = "璁惧浠诲姟鐘舵��", Width = 25)]
- public int TaskDodeviceStatus { get; set; }
+ public TaskDodeviceStatus TaskDodeviceStatus { get; set; }
/// <summary>
/// WCS鏄惁鍙互璇诲彇
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/CMS.Plugin.HIAWms.Domain.Shared.csproj b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/CMS.Plugin.HIAWms.Domain.Shared.csproj
index ebf1596..584c1c8 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/CMS.Plugin.HIAWms.Domain.Shared.csproj
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/CMS.Plugin.HIAWms.Domain.Shared.csproj
@@ -23,16 +23,11 @@
<ItemGroup>
<Compile Remove="Util\EnumHelper.cs" />
<Compile Remove="Util\ExportHelper.cs" />
- <Compile Remove="Util\GetEnumDescriptionUtil.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.20" />
- </ItemGroup>
-
- <ItemGroup>
- <Folder Include="Util\" />
</ItemGroup>
</Project>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/DodevicetypeEnum.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/DodevicetypeEnum.cs
new file mode 100644
index 0000000..7c4274d
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/DodevicetypeEnum.cs
@@ -0,0 +1,34 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
+{
+ /// <summary>
+ ///璁惧绫诲瀷.
+ /// </summary>
+ [Description("璁惧绫诲瀷")]
+ public enum DodevicetypeEnum
+ {
+ /// <summary>
+ /// 鍫嗗灈鏈�.
+ /// </summary>
+ [Description("鍫嗗灈鏈�")]
+ Srm = 1,
+
+ /// <summary>
+ /// 杈撻�佺嚎.
+ /// </summary>
+ [Description("杈撻�佺嚎")]
+ Line,
+
+ /// <summary>
+ /// AGV.
+ /// </summary>
+ [Description("AGV")]
+ Agv,
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/TaskDodeviceStatus.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/TaskDodeviceStatus.cs
new file mode 100644
index 0000000..9d890fd
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/TaskDodeviceStatus.cs
@@ -0,0 +1,71 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
+{
+ /// <summary>
+ /// 璁惧鎵ц鐘舵��.
+ /// </summary>
+ [Description("璁惧鎵ц鐘舵��")]
+ public enum TaskDodeviceStatus
+ {
+ /// <summary>
+ ///鍫嗗灈鏈烘湭寮�濮�
+ /// </summary>
+ [Description("鍫嗗灈鏈烘湭寮�濮�")]
+ SrmNoStart = 1,
+
+ /// <summary>
+ /// 鍫嗗灈鏈烘墽琛屼腑
+ /// </summary>
+ [Description("鍫嗗灈鏈烘墽琛屼腑")]
+ SrmProgress = 2,
+
+ /// <summary>
+ /// 鍫嗗灈鏈哄畬鎴�
+ /// </summary>
+ [Description("鍫嗗灈鏈哄畬鎴�")]
+ SrmFinish = 3,
+
+ /// <summary>
+ ///杈撻�佺嚎鏈紑濮�
+ /// </summary>
+ [Description("杈撻�佺嚎鏈紑濮�")]
+ LineNoStart = 4,
+
+ /// <summary>
+ /// 杈撻�佺嚎鎵ц涓�
+ /// </summary>
+ [Description("鍫嗗灈鏈烘墽琛屼腑")]
+ LineProgress = 5,
+
+ /// <summary>
+ /// 杈撻�佺嚎瀹屾垚
+ /// </summary>
+ [Description("鍫嗗灈鏈哄畬鎴�")]
+ LineFinish = 6,
+
+
+ /// <summary>
+ ///Agv鏈紑濮�
+ /// </summary>
+ [Description("Agv鏈紑濮�")]
+ AgvNoStart = 7,
+
+ /// <summary>
+ /// Agv鎵ц涓�
+ /// </summary>
+ [Description("鍫嗗灈鏈烘墽琛屼腑")]
+ AgvProgress = 8,
+
+ /// <summary>
+ /// Agv瀹屾垚
+ /// </summary>
+ [Description("鍫嗗灈鏈哄畬鎴�")]
+ AgvFinish = 9,
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsTask/WmsTask.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsTask/WmsTask.cs
index 4330c5d..fad2a32 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsTask/WmsTask.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsTask/WmsTask.cs
@@ -61,13 +61,13 @@
/// <summary>
/// 璁惧绫诲瀷
/// </summary>
- public int Dodevicetype { get; set; }
+ public DodevicetypeEnum Dodevicetype { get; set; }
/// <summary>
/// 璁惧浠诲姟鐘舵��
/// </summary>
- public int TaskDodeviceStatus { get; set; }
+ public TaskDodeviceStatus TaskDodeviceStatus { get; set; }
/// <summary>
/// WCS鏄惁鍙互璇诲彇
@@ -103,6 +103,7 @@
/// 鍙彉鍙橀噺3
/// </summary>
public string? MutableParam3 { get; set; }
+
/// <summary>
/// 鎺掑簭
/// </summary>
diff --git a/HIAWms/web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx b/HIAWms/web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx
index 5755a1d..9371f4c 100644
--- a/HIAWms/web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx
+++ b/HIAWms/web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx
@@ -322,8 +322,8 @@
updateCheckData()
} else {
formData.value = {
- isLock: 2,
- emptyContainer: 2,
+ isLock: 0,
+ emptyContainer: 0,
inStockTime: new Date(),
}
updateCheckData()
diff --git a/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.ts b/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.ts
index c9a3b5e..e8acdca 100644
--- a/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.ts
+++ b/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.ts
@@ -252,8 +252,8 @@
areaCode: areaList[0], // 鎵�鍦ㄥ簱鍖�
aisle: 1, // 宸烽亾
layerNo: 1, // 灞�
- islock: 2, // 鏄惁閿佸畾
- emptyContainer: 2, // 鏄惁绌烘墭
+ islock: 0, // 鏄惁閿佸畾
+ emptyContainer: 0, // 鏄惁绌烘墭
}
updateCheckData()
}
diff --git a/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx b/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
index 46cecbe..3a39278 100644
--- a/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
+++ b/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
@@ -41,6 +41,25 @@
></el-input-number>
)
}
+ const datePicker = (attrs) => {
+ return (
+ <el-date-picker
+ type="datetime"
+ format="YYYY-MM-DD"
+ {...attrs}
+ ></el-date-picker>
+ )
+ }
+
+ const dateTimePicker = (attrs) => {
+ return (
+ <el-date-picker
+ type="datetime"
+ format="YYYY-MM-DD HH:mm:ss"
+ {...attrs}
+ ></el-date-picker>
+ )
+ }
const visible = computed({
get() {
diff --git a/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx b/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
index cc3233c..d9ee420 100644
--- a/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
+++ b/HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
@@ -102,6 +102,7 @@
...attrs,
})
},
+ width: '100%',
step: 1,
precision: 0,
//disabled: disabled,
@@ -145,6 +146,7 @@
...attrs,
})
},
+ width: '100%',
step: 1,
precision: 0,
//disabled: disabled,
@@ -160,6 +162,7 @@
...attrs,
})
},
+ width: '100%',
step: 1,
precision: 0,
//disabled: disabled,
@@ -175,6 +178,7 @@
...attrs,
})
},
+ width: '100%',
step: 1,
precision: 0,
//disabled: disabled,
@@ -190,6 +194,7 @@
...attrs,
})
},
+ width: '100%',
step: 1,
precision: 0,
//disabled: disabled,
@@ -230,6 +235,7 @@
...attrs,
})
},
+ width: '100%',
step: 1,
precision: 0,
//disabled: disabled,
@@ -256,21 +262,30 @@
//disabled: disabled,
placeholder: '璇疯緭鍏ュ彲鍙樺彉閲�3',
},
-
+ {
+ label: '鏄惁绂佺敤',
+ prop: 'isDisabled',
+ el: 'select',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ槸鍚︾鐢�',
+ options: [
+ { label: '鏄�', value: 'true' },
+ { label: '鍚�', value: 'false' },
+ ],
+ },
{
label: '鍒涘缓鏃堕棿',
- prop: 'operateTime',
+ prop: 'creationTime',
el: (props: any, { attrs }: SetupContext) => {
- return h(datePickerRange, {
+ return h(dateTimePickerRange, {
...props,
clearable: true,
...attrs,
})
},
- step: 1,
- precision: 0,
+ width: '100%',
//disabled: disabled,
- placeholder: '璇疯緭鍏ヤ笅涓换鍔℃槸鍚︾敓鎴愭垚鍔�',
+ placeholder: '璇疯緭鍏�',
},
])
/**
@@ -284,27 +299,27 @@
return check
}
const commonGetFormData = () => {
- console.log(formData.value.operateTime)
const data = {
- TaskNo: formData.value.TaskNo,
- TaskType: formData.value.TaskType,
- TaskLevel: formData.value.TaskLevel,
- TaskStatus: formData.value.TaskStatus,
- ContainerNo: formData.value.ContainerNo,
- SourcePlace: formData.value.SourcePlace,
- ToPlace: formData.value.ToPlace,
- Aisle: formData.value.Aisle,
- DodeviceId: formData.value.DodeviceId,
- Dodevicetype: formData.value.Dodevicetype,
- TaskDodeviceStatus: formData.value.TaskDodeviceStatus,
- IsRead: formData.value.IsRead,
- SonTaskType: formData.value.SonTaskType,
- SourceOrderNo: formData.value.SourceOrderNo,
- IsNextTask: formData.value.IsNextTask,
- MutableParam1: formData.value.MutableParam1,
- MutableParam2: formData.value.MutableParam2,
- MutableParam3: formData.value.MutableParam3,
- creationTime: formData.value.operateTime,
+ taskNo: formData.value.taskNo || '',
+ taskType: formData.value.taskType || '',
+ taskLevel: formData.value.taskLevel || '',
+ taskStatus: formData.value.taskStatus || '',
+ containerNo: formData.value.containerNo || '',
+ sourcePlace: formData.value.sourcePlace || '',
+ toPlace: formData.value.toPlace || '',
+ aisle: formData.value.aisle || '',
+ dodeviceId: formData.value.dodeviceId || '',
+ dodevicetype: formData.value.dodevicetype || '',
+ taskDodeviceStatus: formData.value.taskDodeviceStatus || '',
+ isRead: formData.value.isRead || '',
+ sonTaskType: formData.value.sonTaskType || '',
+ sourceOrderNo: formData.value.sourceOrderNo || '',
+ isNextTask: formData.value.isNextTask || '',
+ mutableParam1: formData.value.mutableParam1 || '',
+ mutableParam2: formData.value.mutableParam2 || '',
+ mutableParam3: formData.value.mutableParam3 || '',
+ isDisabled: formData.value.isDisabled || '',
+ creationTime: formData.value.creationTime || '',
}
return data
}
@@ -345,7 +360,6 @@
formData.value.MutableParam1 = ''
formData.value.MutableParam2 = ''
formData.value.MutableParam3 = ''
- formData.value.operateTime = []
//鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
ctx.emit('restQuery')
}
diff --git a/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts b/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts
index 48b1082..4c70305 100644
--- a/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts
+++ b/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts
@@ -1,91 +1,88 @@
-export const columns = [
- {
- type: 'seq',
- width: 60,
- title: '搴忓彿',
- },
- {
- field: 'taskNo',
- title: '浠诲姟鍙�',
-},
-{
- field: 'taskTypeDesc',
- title: '浠诲姟绫诲瀷',
-},
-{
- field: 'taskLevel',
- title: '浠诲姟绛夌骇',
-},
-{
- field: 'taskStatusDesc',
- title: '浠诲姟鐘舵��',
-},
-{
- field: 'containerNo',
- title: '鎵樼洏缂栧彿',
-},
-{
- field: 'sourcePlace',
- title: '璧峰搴撲綅',
-},
-{
- field: 'toPlace',
- title: '鐩爣搴撲綅',
-},
-{
- field: 'aisle',
- title: '宸烽亾',
-},
-{
- field: 'dodeviceId',
- title: '鍫嗗灈鏈篒D',
-},
-{
- field: 'dodevicetype',
- title: '璁惧绫诲瀷',
-},
-{
- field: 'taskDodeviceStatus',
- title: '璁惧浠诲姟鐘舵��',
-},
-{
- field: 'isRead',
- title: 'WCS鏄惁鍙互璇诲彇',
-},
-{
- field: 'sonTaskTypeDesc',
- title: '瀛愪换鍔＄被鍨�',
-},
-{
- field: 'sourceOrderNo',
- title: '鏉ユ簮鍗曟嵁鍙�',
-},
-{
- field: 'isNextTask',
- title: '涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛',
-},
-{
- field: 'mutableParam1',
- title: '鍙彉鍙橀噺1',
-},
-{
- field: 'mutableParam2',
- title: '鍙彉鍙橀噺2',
-},
-{
- field: 'mutableParam3',
- title: '鍙彉鍙橀噺3',
-},
-{
- field: 'sort',
- title: '鎺掑簭',
-},
-{
- field: 'creationTime',
- title: '',
-},
-{
- field: 'deletionTime',
- title: '',
-},
-]
+export const columns = [
+ {
+ type: 'seq',
+ width: 60,
+ title: '搴忓彿',
+ },
+ {
+ field: 'taskNo',
+ title: '浠诲姟鍙�',
+ },
+ {
+ field: 'taskTypeDesc',
+ title: '浠诲姟绫诲瀷',
+ },
+ {
+ field: 'taskStatusDesc',
+ title: '浠诲姟鐘舵��',
+ },
+ {
+ field: 'containerNo',
+ title: '鎵樼洏缂栧彿',
+ },
+ {
+ field: 'sourcePlace',
+ title: '璧峰搴撲綅',
+ },
+ {
+ field: 'toPlace',
+ title: '鐩爣搴撲綅',
+ },
+ {
+ field: 'aisle',
+ title: '宸烽亾',
+ },
+ // {
+ // field: 'dodeviceId',
+ // title: '鍫嗗灈鏈篒D',
+ // },
+ {
+ field: 'dodevicetype',
+ title: '璁惧绫诲瀷',
+ },
+ {
+ field: 'taskDodeviceStatus',
+ title: '璁惧鐘舵��',
+ },
+ {
+ field: 'isRead',
+ title: 'WCS鍙鍙�',
+ formatter: ({ cellValue }) => 12222,
+ },
+ {
+ field: 'sonTaskTypeDesc',
+ title: '瀛愪换鍔＄被鍨�',
+ },
+ {
+ field: 'sourceOrderNo',
+ title: '鏉ユ簮鍗曞彿',
+ },
+ // {
+ // field: 'isNextTask',
+ // title: '涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛',
+ // },
+ {
+ field: 'taskLevel',
+ title: '浠诲姟绛夌骇',
+ },
+ // {
+ // field: 'mutableParam1',
+ // title: '鍙彉鍙橀噺1',
+ // },
+ // {
+ // field: 'mutableParam2',
+ // title: '鍙彉鍙橀噺2',
+ // },
+ // {
+ // field: 'mutableParam3',
+ // title: '鍙彉鍙橀噺3',
+ // },
+ // {
+ // field: 'sort',
+ // title: '鎺掑簭',
+ // },
+ {
+ field: 'creationTime',
+ title: '鍒涘缓鏃堕棿',
+ },
+]
diff --git a/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx b/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx
index a299cd0..dd97f69 100644
--- a/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx
+++ b/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx
@@ -1,324 +1,336 @@
-import { computed, defineComponent, onMounted, reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import BaseTable from '@/components/Table/Table'
-import styles from './WmsTask.module.scss'
-import { useWmsTask } from '../../../Controllers/WmsTask'
-import IconButton from '@/components/IconButton/IconButton'
-import WmsTaskDrawer from '../Dialog/WmsTaskDrawer/WmsTaskDrawer'
-import WmsTaskQueryDrawer from '../Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer'
-import Search from '@/components/Search/Search'
-import { columns } from './Config'
-import TdButton from '@/components/TdButton/TdButton'
-import { vPermission } from '@/libs/Permission/Permission'
-import {
- getWmsEnumData
-} from '@/widgets/WmsTask/Models/Service/WmsTaskDrawer'
-import {
- ElInput,
- ElSelect,
- ElOption,
- ElDatePicker,
- ElForm,
- ElFormItem,
-} from 'element-plus'
-import { injectModel } from '@/libs/Provider/Provider'
-
-interface RenderTableType {
- url?: string
- dataSource: Ref<any[]>
- isDrag?: boolean
- isChecked?: boolean
- isHidePagination?: boolean
- params?: Record<string, any>
- autoHeight?: boolean
-}
-
-export default defineComponent({
- name: 'WmsTask',
- directives: {
- permission: vPermission,
- },
- setup(props, ctx) {
- const {
- dataSource,
- contextMenu,
- dialogConfig,
- dialogConfigForQuery,
- tableRef,
- current,
- search,
- sort,
- headers,
- onError,
- onSearch,
- onRowClick,
- onConfirmWmsTask,
- onCheck,
- onAddWmsTask,
- onAdvancedQuery,
- onExport,
- openDetail,
- onSuccess,
- onBeforeUpload,
- } = useWmsTask(props, ctx)
-
- //瀹氫箟楂樼骇鏌ヨ寮曠敤
- const wmsTaskQueryDrawerRef=ref(null);
- // 鏂板鐨勬煡璇㈡潯浠�
- const queryForm = ref({
- searchVal: '',
- str_searchFormInputAttrs:[]
- })
- //瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
- const _searchFormInputAttrs = ref([
- 'TaskNo', 'ContainerNo'
- ]);
- const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ヤ换鍔＄紪鐮�/鎵樼洏缂栫爜');
-
-
- // 鍔ㄦ�佹灇涓鹃�夐」
- const enumOptions = reactive({
- taskType: [] as Array<{label: string; value: any }>,
-taskStatus: [] as Array<{label: string; value: any }>,
-sonTaskType: [] as Array<{label: string; value: any }>,
- })
-
- // 鑾峰彇鏋氫妇鏁版嵁
- const fetchEnumData = async () => {
- try {
- const taskTypeEnumData = await getWmsEnumData({
- EnumName: 'TaskTypeEnum',
-})
-enumOptions.taskType = taskTypeEnumData.map((item) => ({
- label: item.description,
- value: item.value,
-}))
-const wmsTaskStatusData = await getWmsEnumData({
- EnumName: 'WmsTaskStatus',
-})
-enumOptions.taskStatus = wmsTaskStatusData.map((item) => ({
- label: item.description,
- value: item.value,
-}))
-const sonTaskTypeEnumData = await getWmsEnumData({
- EnumName: 'SonTaskTypeEnum',
-})
-enumOptions.sonTaskType = sonTaskTypeEnumData.map((item) => ({
- label: item.description,
- value: item.value,
-}))
-
- } catch (error) {
- console.error('鑾峰彇鏋氫妇鏁版嵁澶辫触:', error)
- }
- }
-
- // 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�
- onMounted(() => {
- fetchEnumData()
- })
-
- // 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹�
- const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[] });
- // 鏂扮増鐨勬煡璇㈡柟娉曪紙涓婚〉闈腑鐨勬寜閽�愭煡璇€�戯級
- const handleQueryForMain = async () => {
- _curHighQueryData.value.searchVal = queryForm.value.searchVal;
- _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;
- tableRef.value.getList(_curHighQueryData.value)
- }
- // 鏂扮増鐨勬煡璇㈡柟娉曪紙楂樼骇鏌ヨ涓殑鎸夐挳銆愭煡璇€�戯級
- const handleQuery = async (extraParams = {}) => {
- let filteredData = commonGetHighQueryForm(extraParams);
- commonSaveCurHighQueryData(filteredData);
- tableRef.value.getList(filteredData)
- }
- // 鏂扮増鐨勬煡璇㈤噸缃�
- const resetQuery = () => {
- queryForm.value.searchVal = ''
- queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value;
- }
- //鏂扮増鐨勫鍑烘柟娉�
- const handleExport=()=>{
- onExport(_curHighQueryData.value);
- }
- // 鏂扮増鐨勬煡璇㈠脊鍑烘鍏抽棴鏂规硶
- const closeQuery = (extraParams={}) => {
- let filteredData = commonGetHighQueryForm(extraParams);
- console.log("closeQuery鏂规硶");
- console.log(filteredData);
- commonSaveCurHighQueryData(filteredData);
- }
- //淇濆瓨鏌ヨ鍊�
- const commonSaveCurHighQueryData=(filteredData={})=>{
- _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData };
- _curHighQueryData.value.searchVal = queryForm.value.searchVal
- _curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value;
- }
- //鑾峰彇楂樼骇鏌ヨ寮瑰嚭妗嗙殑鏌ヨ鍊�
- const commonGetHighQueryForm=(extraParams={})=>{
- // 杩囨护鎺� undefined 鐨勫��
- let filteredData = Object.assign(
- {},
- ...Object.entries(extraParams).map(([key, value]) =>
- value !== undefined ? { [key]: value } : {}
- )
- )
- //缁勫悎妯＄硦鏌ヨ
- filteredData.searchVal = queryForm.value.searchVal
- filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value;
- return filteredData;
- }
-
-
- /**
- * @returns 琛ㄦ牸
- */
- const RenderBaseTable = (props: RenderTableType) => {
- const {
- url,
- dataSource,
- isDrag,
- isChecked,
- isHidePagination,
- params,
- autoHeight,
- } = props
-
- return (
- <div
- class={{
- [styles.wmsTaskList]: true,
- }}
- >
- <BaseTable
- ref={tableRef}
- url={url}
- sortUrlTpl="/api/v1/HIAWms/wmsTask/{id}/adjustsort/{sort}"
- v-model:dataSource={dataSource.value}
- columns={columns}
- contextMenu={contextMenu}
- params={params}
- isDrag={isDrag}
- isChecked={isChecked}
- autoHeight={autoHeight}
- onCheck={onCheck}
- onRowClick={onRowClick}
- isHidePagination={isHidePagination}
- pageSize={20}
- v-slots={{
- name: ({ row }: any) => {
- return row?.name ? (
- <TdButton
- onClick={() => openDetail(row)}
- text={<span style="color:#5a84ff">璇︽儏</span>}
- icon="scale"
- tip={row?.name}
- hover
- >
- {row?.name}
- </TdButton>
- ) : (
- '-'
- )
- },
- }}
- ></BaseTable>
- </div>
- )
- }
-
- return () => {
- return (
- <div class={styles.wmsTaskContent}>
- {/* 娣诲姞/缂栬緫 */}
- <WmsTaskDrawer
- v-model={dialogConfig.visible}
- title={dialogConfig.title}
- row={current.value}
- sort={sort.value}
- onConfirm={onConfirmWmsTask}
- />
- {/* 楂樼骇鏌ヨ */}
- <WmsTaskQueryDrawer
- ref="wmsTaskQueryDrawerRef"
- v-model={dialogConfigForQuery.visible}
- title={dialogConfigForQuery.title}
- row={current.value}
- sort={sort.value}
- onConfirmQuery={handleQuery}
- onRestQuery={resetQuery}
- onClose={closeQuery}
- />
-
- <div class={styles.headerContent}>
- <div class={styles.header}>
- <IconButton
- v-permission="wmsTask-add"
- icon="add-p"
- onClick={onAddWmsTask}
- type="primary"
- >
- 娣诲姞
- </IconButton>
- <el-divider direction="vertical" />
-
- <el-divider direction="vertical" />
- <el-upload
- v-permission="wmsTask-import"
- name="file"
- accept=".xlsx,.xls,.csv"
- show-file-list={false}
- onError={onError}
- onSuccess={onSuccess}
- before-upload={onBeforeUpload}
- headers={headers.value}
- action="/api/v1/HIAWms/wmsTask/import"
- >
- <IconButton icon="in">瀵煎叆</IconButton>
- </el-upload>
-
- <IconButton
- v-permission="wmsTask-output"
- icon="out"
- onClick={handleExport}
- >
- 瀵煎嚭
- </IconButton>
- </div>
- <ElFormItem style={{ marginTop: '15px' }}>
- <ElFormItem label="鍏抽敭瀛�">
- <ElInput
- v-model={queryForm.value.searchVal}
- placeholder={searchFormInputAttrs_Placeholder.value}
- clearable
- class={styles.formItem}
- />
- </ElFormItem>
- <IconButton type="primary" icon="search" onClick={handleQueryForMain}>
- 鏌ヨ
- </IconButton>
+import { computed, defineComponent, onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import BaseTable from '@/components/Table/Table'
+import styles from './WmsTask.module.scss'
+import { useWmsTask } from '../../../Controllers/WmsTask'
+import IconButton from '@/components/IconButton/IconButton'
+import WmsTaskDrawer from '../Dialog/WmsTaskDrawer/WmsTaskDrawer'
+import WmsTaskQueryDrawer from '../Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer'
+import Search from '@/components/Search/Search'
+import { columns } from './Config'
+import TdButton from '@/components/TdButton/TdButton'
+import { vPermission } from '@/libs/Permission/Permission'
+import { getWmsEnumData } from '@/widgets/WmsTask/Models/Service/WmsTaskDrawer'
+import dayjs from 'dayjs'
+import {
+ ElInput,
+ ElSelect,
+ ElOption,
+ ElDatePicker,
+ ElForm,
+ ElFormItem,
+} from 'element-plus'
+import { injectModel } from '@/libs/Provider/Provider'
+
+interface RenderTableType {
+ url?: string
+ dataSource: Ref<any[]>
+ isDrag?: boolean
+ isChecked?: boolean
+ isHidePagination?: boolean
+ params?: Record<string, any>
+ autoHeight?: boolean
+}
+
+export default defineComponent({
+ name: 'WmsTask',
+ directives: {
+ permission: vPermission,
+ },
+ setup(props, ctx) {
+ const {
+ dataSource,
+ contextMenu,
+ dialogConfig,
+ dialogConfigForQuery,
+ tableRef,
+ current,
+ search,
+ sort,
+ headers,
+ onError,
+ onSearch,
+ onRowClick,
+ onConfirmWmsTask,
+ onCheck,
+ onAddWmsTask,
+ onAdvancedQuery,
+ onExport,
+ openDetail,
+ onSuccess,
+ onBeforeUpload,
+ } = useWmsTask(props, ctx)
+
+ //瀹氫箟楂樼骇鏌ヨ寮曠敤
+ const wmsTaskQueryDrawerRef = ref(null)
+ // 鏂板鐨勬煡璇㈡潯浠�
+ const queryForm = ref({
+ searchVal: '',
+ str_searchFormInputAttrs: [],
+ })
+ //瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
+ const _searchFormInputAttrs = ref(['TaskNo', 'ContainerNo'])
+ const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ヤ换鍔＄紪鐮�/鎵樼洏缂栫爜')
+
+ // 鍔ㄦ�佹灇涓鹃�夐」
+ const enumOptions = reactive({
+ taskType: [] as Array<{ label: string; value: any }>,
+ taskStatus: [] as Array<{ label: string; value: any }>,
+ sonTaskType: [] as Array<{ label: string; value: any }>,
+ })
+
+ // 鑾峰彇鏋氫妇鏁版嵁
+ const fetchEnumData = async () => {
+ try {
+ const taskTypeEnumData = await getWmsEnumData({
+ EnumName: 'TaskTypeEnum',
+ })
+ enumOptions.taskType = taskTypeEnumData.map((item) => ({
+ label: item.description,
+ value: item.value,
+ }))
+ const wmsTaskStatusData = await getWmsEnumData({
+ EnumName: 'WmsTaskStatus',
+ })
+ enumOptions.taskStatus = wmsTaskStatusData.map((item) => ({
+ label: item.description,
+ value: item.value,
+ }))
+ const sonTaskTypeEnumData = await getWmsEnumData({
+ EnumName: 'SonTaskTypeEnum',
+ })
+ enumOptions.sonTaskType = sonTaskTypeEnumData.map((item) => ({
+ label: item.description,
+ value: item.value,
+ }))
+ } catch (error) {
+ console.error('鑾峰彇鏋氫妇鏁版嵁澶辫触:', error)
+ }
+ }
+
+ // 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�
+ onMounted(() => {
+ fetchEnumData()
+ })
+
+ // 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹�
+ const _curHighQueryData = ref({
+ searchVal: '',
+ str_searchFormInputAttrs: [],
+ })
+ // 鏂扮増鐨勬煡璇㈡柟娉曪紙涓婚〉闈腑鐨勬寜閽�愭煡璇€�戯級
+ const handleQueryForMain = async () => {
+ _curHighQueryData.value.searchVal = queryForm.value.searchVal
+ _curHighQueryData.value.str_searchFormInputAttrs =
+ _searchFormInputAttrs.value
+ tableRef.value.getList(_curHighQueryData.value)
+ }
+ // 鏂扮増鐨勬煡璇㈡柟娉曪紙楂樼骇鏌ヨ涓殑鎸夐挳銆愭煡璇€�戯級
+ const handleQuery = async (extraParams = {}) => {
+ let filteredData = commonGetHighQueryForm(extraParams)
+ commonSaveCurHighQueryData(filteredData)
+ tableRef.value.getList(filteredData)
+ }
+ // 鏂扮増鐨勬煡璇㈤噸缃�
+ const resetQuery = () => {
+ queryForm.value.searchVal = ''
+ queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
+ }
+ //鏂扮増鐨勫鍑烘柟娉�
+ const handleExport = () => {
+ onExport(_curHighQueryData.value)
+ }
+ // 鏂扮増鐨勬煡璇㈠脊鍑烘鍏抽棴鏂规硶
+ const closeQuery = (extraParams = {}) => {
+ let filteredData = commonGetHighQueryForm(extraParams)
+ console.log('closeQuery鏂规硶')
+ console.log(filteredData)
+ commonSaveCurHighQueryData(filteredData)
+ }
+ //淇濆瓨鏌ヨ鍊�
+ const commonSaveCurHighQueryData = (filteredData = {}) => {
+ _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }
+ _curHighQueryData.value.searchVal = queryForm.value.searchVal
+ _curHighQueryData.value.str_searchFormInputAttrs =
+ _searchFormInputAttrs.value
+ }
+ //鑾峰彇楂樼骇鏌ヨ寮瑰嚭妗嗙殑鏌ヨ鍊�
+ const commonGetHighQueryForm = (extraParams = {}) => {
+ // 杩囨护鎺� undefined 鐨勫��
+ let filteredData = Object.assign(
+ {},
+ ...Object.entries(extraParams).map(([key, value]) =>
+ value !== undefined ? { [key]: value } : {}
+ )
+ )
+ //缁勫悎妯＄硦鏌ヨ
+ filteredData.searchVal = queryForm.value.searchVal
+ filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
+ return filteredData
+ }
+
+ /**
+ * @returns 琛ㄦ牸
+ */
+ const RenderBaseTable = (props: RenderTableType) => {
+ const {
+ url,
+ dataSource,
+ isDrag,
+ isChecked,
+ isHidePagination,
+ params,
+ autoHeight,
+ } = props
+
+ return (
+ <div
+ class={{
+ [styles.wmsTaskList]: true,
+ }}
+ >
+ <BaseTable
+ ref={tableRef}
+ url={url}
+ sortUrlTpl="/api/v1/HIAWms/wmsTask/{id}/adjustsort/{sort}"
+ v-model:dataSource={dataSource.value}
+ columns={columns}
+ contextMenu={contextMenu}
+ params={params}
+ isDrag={isDrag}
+ isChecked={isChecked}
+ autoHeight={autoHeight}
+ onCheck={onCheck}
+ onRowClick={onRowClick}
+ isHidePagination={isHidePagination}
+ pageSize={20}
+ v-slots={{
+ creationTime: ({ row }: any) => {
+ return (
+ <div>
+ {row.creationTime != null
+ ? dayjs(row.creationTime).format('YYYY-MM-DD HH:mm:ss')
+ : '-'}
+ </div>
+ )
+ },
+ name: ({ row }: any) => {
+ return row?.name ? (
+ <TdButton
+ onClick={() => openDetail(row)}
+ text={<span style="color:#5a84ff">璇︽儏</span>}
+ icon="scale"
+ tip={row?.name}
+ hover
+ >
+ {row?.name}
+ </TdButton>
+ ) : (
+ '-'
+ )
+ },
+ }}
+ ></BaseTable>
+ </div>
+ )
+ }
+
+ return () => {
+ return (
+ <div class={styles.wmsTaskContent}>
+ {/* 娣诲姞/缂栬緫 */}
+ <WmsTaskDrawer
+ v-model={dialogConfig.visible}
+ title={dialogConfig.title}
+ row={current.value}
+ sort={sort.value}
+ onConfirm={onConfirmWmsTask}
+ />
+ {/* 楂樼骇鏌ヨ */}
+ <WmsTaskQueryDrawer
+ ref="wmsTaskQueryDrawerRef"
+ v-model={dialogConfigForQuery.visible}
+ title={dialogConfigForQuery.title}
+ row={current.value}
+ sort={sort.value}
+ onConfirmQuery={handleQuery}
+ onRestQuery={resetQuery}
+ onClose={closeQuery}
+ />
+
+ <div class={styles.headerContent}>
+ <div class={styles.header}>
+ <IconButton
+ v-permission="wmsTask-add"
+ icon="add-p"
+ onClick={onAddWmsTask}
+ type="primary"
+ >
+ 娣诲姞
+ </IconButton>
+ <el-divider direction="vertical" />
+
+ <el-divider direction="vertical" />
+ <el-upload
+ v-permission="wmsTask-import"
+ name="file"
+ accept=".xlsx,.xls,.csv"
+ show-file-list={false}
+ onError={onError}
+ onSuccess={onSuccess}
+ before-upload={onBeforeUpload}
+ headers={headers.value}
+ action="/api/v1/HIAWms/wmsTask/import"
+ >
+ <IconButton icon="in">瀵煎叆</IconButton>
+ </el-upload>
+
+ <IconButton
+ v-permission="wmsTask-output"
+ icon="out"
+ onClick={handleExport}
+ >
+ 瀵煎嚭
+ </IconButton>
+ </div>
+ <ElFormItem style={{ marginTop: '15px' }}>
+ <ElFormItem label="鍏抽敭瀛�">
+ <ElInput
+ v-model={queryForm.value.searchVal}
+ placeholder={searchFormInputAttrs_Placeholder.value}
+ clearable
+ class={styles.formItem}
+ />
+ </ElFormItem>
+ <IconButton
+ type="primary"
+ icon="search"
+ onClick={handleQueryForMain}
+ >
+ 鏌ヨ
+ </IconButton>
{/* <IconButton style="" icon="refresh" onClick={resetQuery}>
閲嶇疆
- </IconButton> */}
- <IconButton
- v-permission="wmsTask-add"
- icon="search"
- onClick={onAdvancedQuery}
- type="primary"
- >
- 楂樼骇鏌ヨ
- </IconButton>
- </ElFormItem>
- </div>
-
- <RenderBaseTable
- url="/api/v1/HIAWms/wmsTask/page"
- dataSource={dataSource}
- isChecked={true}
- isDrag={true}
- />
- </div>
- )
- }
- },
-})
+ </IconButton> */}
+ <IconButton
+ v-permission="wmsTask-add"
+ icon="search"
+ onClick={onAdvancedQuery}
+ type="primary"
+ >
+ 楂樼骇鏌ヨ
+ </IconButton>
+ </ElFormItem>
+ </div>
+
+ <RenderBaseTable
+ url="/api/v1/HIAWms/wmsTask/page"
+ dataSource={dataSource}
+ isChecked={true}
+ isDrag={true}
+ />
+ </div>
+ )
+ }
+ },
+})
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs"
index bfc6ccb..74000db 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs"
@@ -22,8 +22,8 @@
//鏇挎崲鏂板form鍒楄〃灞炴��
string attrString = "";
- List<ColumnModel> newColumnNameList = ListHelper.RemoveAttrForUpdateMode(param.ColumnNameList);
- attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query(param.ColumnNameList, param);
+ List<ColumnModel> newColumnNameList = ListHelper.RemoveAttrForQueryMode(param.ColumnNameList);
+ attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query(newColumnNameList, param);
str = str.Replace("$PageAddFormAttributes_Query$", attrString);
attrString = "";
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeQueryDrawer\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeQueryDrawer\346\250\241\346\235\277.txt"
index 2631a02..edb796f 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeQueryDrawer\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeQueryDrawer\346\250\241\346\235\277.txt"
@@ -42,6 +42,29 @@
)
}
+ const datePickerRange = (attrs) => {
+ return (
+ <el-date-picker
+ type="daterange"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ {...attrs}
+ ></el-date-picker>
+ )
+ }
+
+ const dateTimePickerRange = (attrs) => {
+ return (
+ <el-date-picker
+ type="datetimerange"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ {...attrs}
+ ></el-date-picker>
+ )
+ }
const visible = computed({
get() {
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityMode\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityMode\346\250\241\346\235\277.txt"
index 0acb24f..5120599 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityMode\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityMode\346\250\241\346\235\277.txt"
@@ -187,7 +187,7 @@
*/
const onExport = (data={}) => {
//const params = tableRef.value?.getParams()
- exportFile('/api/v1/$NameSpacePath$/$PageMenuInstanceName$/export', data, '$NameSpacePath$')
+ exportFile('/api/v1/$NameSpacePath$/$PageMenuInstanceName$/export', data, '$PageMenuInstanceName$')
}
/**
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs"
index 7244107..21efb36 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs"
@@ -391,6 +391,35 @@
return newList;
}
+ public static List<ColumnModel> RemoveAttrForQueryMode(List<ColumnModel> columnNameList)
+ {
+ List<ColumnModel> newList = new List<ColumnModel>();
+ ColumnModel columnModel = null;
+ for (int i = 0; i < columnNameList.Count; i++)
+ {
+ columnModel = columnNameList[i];
+ if (columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyTime.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
+
+ )
+ {
+ continue;
+ }
+ newList.Add(columnModel);
+ }
+ return newList;
+ }
+
/// <summary>
/// 鑾峰彇鏈�鏂扮殑鍒桳ist闆嗗悎(鍘绘帀 ID)
/// </summary>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
index 16426e3..38bacb6 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
@@ -1975,8 +1975,8 @@
placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮�',
},
*/
- List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
- foreach (var columnModel in newList)
+ //List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
+ foreach (var columnModel in columnModelList)
{
//棣栧瓧姣嶅皬鍐�
var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
@@ -1984,9 +1984,9 @@
var elment = "input";
switch (enumDT)
{
- case DataTypeEnum.dt_datetime:
- elment = "date-picker";
- break;
+ //case DataTypeEnum.dt_datetime:
+ // elment = "date-picker";
+ // break;
case DataTypeEnum.dt_bit:
case DataTypeEnum.dt_tinyint:
elment = "select";
@@ -2002,7 +2002,15 @@
switch (enumDT)
{
case DataTypeEnum.dt_datetime:
- sb.Append(" type: 'datetimerange', \n");
+ sb.Append(" el: (props: any, { attrs }: SetupContext) => { \n");
+ sb.Append(" return h(dateTimePickerRange, { \n");
+ sb.Append(" ...props,\n");
+ sb.Append(" clearable: true, \n");
+ sb.Append(" ...attrs, \n");
+ sb.Append(" }) \n");
+ sb.Append(" },\n");
+
+ sb.Append(" width: '100%',\n");
break;
default:
break;
@@ -2207,17 +2215,15 @@
/*
materialCode: formData.value.materialCode,
*/
- List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
+ List<ColumnModel> newList = ListHelper.RemoveAttrForQueryMode(columnModelList);
foreach (var columnModel in newList)
{
-<<<<<<< HEAD
+
//棣栧瓧姣嶅皬鍐�
var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
- sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName}, \n");
-=======
- var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
- sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName}, || ''\n");
->>>>>>> a1cdc5e71aa827651a6c3e313fd7acc95b09c097
+ sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName} || '', \n");
+
+
}
//鍘绘帀鏈�鍚庝竴涓�,
var res = sb.ToString();
--
Gitblit v1.9.3