From 4456f43c6c73185a9f7ce46cdcdf94ab2053f02e Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 14:19:43 +0800
Subject: [PATCH] 修改生成器及出入库记录页面
---
HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.tsx | 4
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsInOutStockRecordRepository.cs | 24
HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordDrawer.tsx | 31
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordExportModel.cs | 15
HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecordDrawer.ts | 88 +-
HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecord.ts | 82 +-
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateDto.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsInOutStockRecordAppService.cs | 12
HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/Config.ts | 126 +-
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordDto.cs | 16
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs | 372 +++++----
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 6
HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx | 7
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordsImportModel.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecord/IWmsInOutStockRecordRepository.cs | 20
HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.module.scss | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordUpdateDto.cs | 2
HIAWms/web/src/widgets/WmsInOutStockRecord/Models/Service/WmsInOutStockRecordDrawer.ts | 68
HIAWms/web/src/widgets/WmsInOutStockRecord/Models/Service/WmsInOutStockRecord.ts | 60
HIAWms/web/src/widgets/WmsInOutStockRecord/Views/WmsInOutStockRecord.tsx | 160 ++--
HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx | 589 +++++++-------
HIAWms/web/src/widgets/WmsInOutStockRecord/Views/config/WmsInOutStockRecord.json | 6
HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecord.ts | 6
HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecordQueryDrawer.ts | 2
HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts | 1
HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsInOutStockRecordAutoMapperProfile.cs | 26
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateOrUpdateDtoBase.cs | 16
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsInOutStockRecordController.cs | 22
Weben_CMS专用代码生成器/Code/Templete/Web/Controllers/EntityModeDrawer模板.txt | 19
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs | 537 ++++++++-----
30 files changed, 1,296 insertions(+), 1,029 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs
index 53d4679..fc34c79 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs
@@ -1,229 +1,249 @@
-using CmsQueryExtensions.Extension;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
-
+using CmsQueryExtensions.Extension;
+using Volo.Abp.Application.Dtos;
+
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
+
/// <summary>
-/// 鍑哄叆搴撹褰曡〃鏌ヨ鍙傛暟
+/// 鍑哄叆搴撹褰曟煡璇㈠弬鏁�
/// </summary>
-public class GetWmsInOutStockRecordInput : ExtensiblePagedAndSortedResultRequestDto
-{
-
+public class GetWmsInOutStockRecordInput : ExtensiblePagedAndSortedResultRequestDto
+{
+
#region 鍏抽敭瀛楁煡璇�
-
+
/// <summary>
/// 鍏抽敭瀛楁ā绯婃煡璇紙娉ㄦ剰鏄皬鍐欙紒锛�
/// </summary>
- public string searchVal { get; set; }
-
+ public string searchVal { get; set; }
+
/// <summary>
/// 閫氱敤鏌ヨ閰嶇疆 (1:妯＄硦鏌ヨ , 2:绮惧噯鏌ヨ)锛堟敞鎰忔槸灏忓啓锛侊級
/// </summary>
- public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
-
+ public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
/// <summary>
/// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級
/// </summary>
- [NoAutoQuery]
- public string str_searchFormInputAttrs { get; set; }
+ [NoAutoQuery]
+ public string str_searchFormInputAttrs { get; set; }
/// <summary>
/// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級
/// </summary>
- public List<string> searchFormInputAttrs
- {
- get
- {
- if (!string.IsNullOrEmpty(str_searchFormInputAttrs))
- {
- return str_searchFormInputAttrs.Split(',').ToList();
- }
- return new List<string>();
- }
- }
+ public List<string> searchFormInputAttrs
+ {
+ get
+ {
+ if (!string.IsNullOrEmpty(str_searchFormInputAttrs))
+ {
+ return str_searchFormInputAttrs.Split(',').ToList();
+ }
+ return new List<string>();
+ }
+ }
+
+ #endregion
+
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ /// </summary>
+ public string OrderNo { get; set; }
- #endregion
+ /// <summary>
+ /// 鍗曟嵁缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum OrderNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- public string OrderNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string MaterialName { get; set; }
- /// <summary>
- /// 鍗曟嵁缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum OrderNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterialName { get; set; }
+ /// <summary>
+ /// 鐗╂枡浠跺彿
+ /// </summary>
+ public string MaterialNo { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MaterialName_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 鐗╂枡浠跺彿-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum MaterialNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- /// 鐗╂枡浠跺彿
- /// </summary>
- public string MaterialNo { get; set; }
+ /// <summary>
+ /// 鎿嶄綔绫诲瀷
+ /// </summary>
+ public int? StockType { get; set; }
- /// <summary>
- /// 鐗╂枡浠跺彿-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MaterialNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 鎿嶄綔绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum StockType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public int? StockType { get; set; }
+ /// <summary>
+ /// 瀹瑰櫒缂栧彿
+ /// </summary>
+ public string ContainerNo { get; set; }
- /// <summary>
- /// 鎿嶄綔绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum StockType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// 瀹瑰櫒缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum ContainerNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- /// 瀹瑰櫒缂栧彿
- /// </summary>
- public string ContainerNo { get; set; }
+ /// <summary>
+ /// 鏈哄瀷
+ /// </summary>
+ public string MaterialModel { get; set; }
- /// <summary>
- /// 瀹瑰櫒缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum ContainerNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 鏈哄瀷-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum MaterialModel_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- /// 鏈哄瀷
- /// </summary>
- public string MaterialModel { get; set; }
-
- /// <summary>
- /// 鏈哄瀷-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MaterialModel_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鎿嶄綔鏃堕棿
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public string OperateTime { get; set; }
+ /// <summary>
+ /// 鎿嶄綔鏃堕棿
+ /// </summary>
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public List<string> OperateTime { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string Remark { get; set; }
- /// <summary>
- /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Remark_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- public string MaterialId { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ public string MaterialId { get; set; }
- /// <summary>
- /// 鐗╂枡ID-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MaterialId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 鐗╂枡ID-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum MaterialId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- public string TaskNo { get; set; }
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ public string TaskNo { get; set; }
- /// <summary>
- /// 浠诲姟鍙�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum TaskNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 浠诲姟鍙�-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum TaskNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- /// 璧峰搴撲綅
- /// </summary>
- public string SourcePlace { get; set; }
+ /// <summary>
+ /// 璧峰搴撲綅
+ /// </summary>
+ public string SourcePlace { get; set; }
- /// <summary>
- /// 璧峰搴撲綅-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum SourcePlace_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 璧峰搴撲綅-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum SourcePlace_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- /// 鐩爣搴撲綅
- /// </summary>
- public string ToPlace { get; set; }
+ /// <summary>
+ /// 鐩爣搴撲綅
+ /// </summary>
+ public string ToPlace { get; set; }
- /// <summary>
- /// 鐩爣搴撲綅-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum ToPlace_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 鐩爣搴撲綅-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum ToPlace_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- ///
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> CreationTime { get; set; }
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public int? Sort { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public bool? IsDisabled { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ ///
+ /// </summary>
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public List<string> CreationTime { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string CreatorId { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string CreatorId { get; set; }
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum CreatorId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- ///
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> LastModificationTime { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public List<string> LastModificationTime { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string LastModifierId { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string LastModifierId { get; set; }
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum LastModifierId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- ///
- /// </summary>
- public bool? IsDeleted { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public bool? IsDeleted { get; set; }
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum IsDeleted_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- ///
- /// </summary>
- public string DeleterId { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string DeleterId { get; set; }
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum DeleterId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- ///
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> DeletionTime { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public List<string> DeletionTime { get; set; }
-
-}
+
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateDto.cs
index 3df2845..9078004 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateDto.cs
@@ -1,7 +1,7 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
/// <summary>
-/// 鍑哄叆搴撹褰曡〃鍒涘缓鍙傛暟瀵硅薄
+/// 鍑哄叆搴撹褰曞垱寤哄弬鏁板璞�
/// </summary>
public class WmsInOutStockRecordCreateDto : WmsInOutStockRecordCreateOrUpdateDtoBase
{
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateOrUpdateDtoBase.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateOrUpdateDtoBase.cs
index 9fcd141..2f89948 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateOrUpdateDtoBase.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateOrUpdateDtoBase.cs
@@ -1,11 +1,11 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using System;
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
+using System;
using Volo.Abp.Application.Dtos;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
/// <summary>
-/// 鍑哄叆搴撹褰曡〃鍒涘缓鎴栨洿鏂板熀绫�
+/// 鍑哄叆搴撹褰曞垱寤烘垨鏇存柊鍩虹被
/// </summary>
public abstract class WmsInOutStockRecordCreateOrUpdateDtoBase : ExtensibleEntityDto
{
@@ -70,6 +70,16 @@
public string? ToPlace { get; set; }
/// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public int Sort { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public bool? IsDisabled { get; set; }
+
+ /// <summary>
///
/// </summary>
public string? CreatorId { get; set; }
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordDto.cs
index d25160e..e0cb33a 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordDto.cs
@@ -1,5 +1,5 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using CmsQueryExtensions;
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
+using CmsQueryExtensions;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities;
@@ -8,7 +8,7 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
/// <summary>
-/// 鍑哄叆搴撹褰曡〃鏁版嵁鍙傛暟瀵硅薄
+/// 鍑哄叆搴撹褰曟暟鎹弬鏁板璞�
/// </summary>
public class WmsInOutStockRecordDto: ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
{
@@ -83,6 +83,16 @@
public string? ToPlace { get; set; }
/// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public int Sort { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public bool? IsDisabled { get; set; }
+
+ /// <summary>
///
/// </summary>
public ExtraPropertyDictionary? ExtraProperties { get; set; }
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordExportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordExportModel.cs
index a9db0d2..668f917 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordExportModel.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordExportModel.cs
@@ -1,11 +1,12 @@
using MiniExcelLibs.Attributes;
using System.ComponentModel.DataAnnotations;
+using System;
using System.ComponentModel;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
/// <summary>
-/// 鍑哄叆搴撹褰曡〃瀵煎嚭妯″瀷
+/// 鍑哄叆搴撹褰曞鍑烘ā鍨�
/// </summary>
public class WmsInOutStockRecordExportModel
{
@@ -81,6 +82,18 @@
[ExcelColumn(Name = "鐩爣搴撲綅", Width = 25)]
public string ToPlace { get; set; }
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ [ExcelColumn(Name = "鎺掑簭", Width = 25)]
+ public int Sort { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ [ExcelColumn(Name = "鏄惁绂佺敤", Width = 25)]
+ public bool? IsDisabled { get; set; }
+
public Dictionary<string, object> GetExportData()
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordUpdateDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordUpdateDto.cs
index 7a04030..9a02fb2 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordUpdateDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordUpdateDto.cs
@@ -2,7 +2,7 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
/// <summary>
-/// 鍑哄叆搴撹褰曡〃鏇存柊鍙傛暟瀵硅薄
+/// 鍑哄叆搴撹褰曟洿鏂板弬鏁板璞�
/// </summary>
public class WmsInOutStockRecordUpdateDto : WmsInOutStockRecordCreateOrUpdateDtoBase, IHasConcurrencyStamp
{
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordsImportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordsImportModel.cs
index 7e3e4ce..74e9744 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordsImportModel.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordsImportModel.cs
@@ -2,7 +2,7 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord
{
/// <summary>
- /// 鍑哄叆搴撹褰曡〃瀵煎叆妯″瀷
+ /// 鍑哄叆搴撹褰曞鍏ユā鍨�
/// </summary>
public class WmsInOutStockRecordsImportModel
{
@@ -20,7 +20,7 @@
}
/// <summary>
- /// 鍑哄叆搴撹褰曡〃瀵煎叆妯″瀷
+ /// 鍑哄叆搴撹褰曞鍏ユā鍨�
/// </summary>
public class WmsInOutStockRecordImportModel : WmsInOutStockRecordExportModel
{
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsInOutStockRecordAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsInOutStockRecordAppService.cs
index 6bc1c06..c0bbed6 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsInOutStockRecordAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsInOutStockRecordAppService.cs
@@ -4,26 +4,26 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
/// <summary>
-/// 鍑哄叆搴撹褰曡〃搴旂敤鏈嶅姟鎺ュ彛
+/// 鍑哄叆搴撹褰曞簲鐢ㄦ湇鍔℃帴鍙�
/// </summary>
public interface IWmsInOutStockRecordAppService : ICrudAppService<WmsInOutStockRecordDto, Guid, GetWmsInOutStockRecordInput, WmsInOutStockRecordCreateDto, WmsInOutStockRecordUpdateDto>
{
/// <summary>
- /// 鍏嬮殕鍑哄叆搴撹褰曡〃
+ /// 鍏嬮殕鍑哄叆搴撹褰�
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
Task<List<WmsInOutStockRecordDto>> CloneAsync(IEnumerable<Guid> ids);
/// <summary>
- /// 鍒犻櫎鍑哄叆搴撹褰曡〃
+ /// 鍒犻櫎鍑哄叆搴撹褰�
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
Task DeleteManyAsync(IEnumerable<Guid> ids);
/// <summary>
- /// 璋冩暣鎺掑簭鍑哄叆搴撹褰曡〃
+ /// 璋冩暣鎺掑簭鍑哄叆搴撹褰�
/// </summary>
/// <param name="id"></param>
/// <param name="sort"></param>
@@ -31,14 +31,14 @@
Task AdjustSortAsync(Guid id, int sort);
/// <summary>
- /// 瀵煎叆鍑哄叆搴撹褰曡〃
+ /// 瀵煎叆鍑哄叆搴撹褰�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
Task ImportAsync(WmsInOutStockRecordsImportModel input);
/// <summary>
- /// 瀵煎嚭鍑哄叆搴撹褰曡〃
+ /// 瀵煎嚭鍑哄叆搴撹褰�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs
index de2d3f8..cb54fa7 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs
@@ -1,141 +1,149 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.Shared;
-using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord;
-using CmsQueryExtensions;
-using CmsQueryExtensions.Extension;
-using System.Linq.Expressions;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Data;
-using Volo.Abp.ObjectExtending;
-using Volo.Abp.ObjectMapping;
-
-namespace CMS.Plugin.HIAWms.Application.Implements;
-
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
+using CMS.Plugin.HIAWms.Application.Contracts.Services;
+using CMS.Plugin.HIAWms.Domain.Shared;
+using CmsQueryExtensions;
+using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord;
+using CmsQueryExtensions.Extension;
+using System.Linq.Expressions;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
+using Volo.Abp.ObjectMapping;
+
+namespace CMS.Plugin.HIAWms.Application.Implements;
+
/// <summary>
-/// 鍑哄叆搴撹褰曡〃搴旂敤鏈嶅姟
+/// 鍑哄叆搴撹褰曞簲鐢ㄦ湇鍔�
/// </summary>
-public class WmsInOutStockRecordAppService : CMSPluginAppService, IWmsInOutStockRecordAppService
-{
- private readonly IWmsInOutStockRecordRepository _wmsInOutStockRecordRepository;
-
+public class WmsInOutStockRecordAppService : CMSPluginAppService, IWmsInOutStockRecordAppService
+{
+ private readonly IWmsInOutStockRecordRepository wmsInOutStockRecordRepository;
+
/// <summary>
/// Initializes a new instance of the <see cref="WmsInOutStockRecordAppService"/> class.
/// </summary>
/// <param name="WmsInOutStockRecordRepository">The task job repository.</param>
- public WmsInOutStockRecordAppService(IWmsInOutStockRecordRepository wmsInOutStockRecordRepository)
- {
- _wmsInOutStockRecordRepository = wmsInOutStockRecordRepository;
- }
-
+ public WmsInOutStockRecordAppService(IWmsInOutStockRecordRepository _WmsInOutStockRecordRepository)
+ {
+ wmsInOutStockRecordRepository = _WmsInOutStockRecordRepository;
+ }
+
/// <summary>
- /// 鑾峰彇鎸囧畾鍑哄叆搴撹褰曡〃
+ /// 鑾峰彇鎸囧畾鍑哄叆搴撹褰�
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public virtual async Task<WmsInOutStockRecordDto> GetAsync(Guid id)
- {
- return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(await _wmsInOutStockRecordRepository.GetAsync(id));
- }
-
+ public virtual async Task<WmsInOutStockRecordDto> GetAsync(Guid id)
+ {
+ return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(await wmsInOutStockRecordRepository.GetAsync(id));
+ }
+
/// <summary>
- /// 鍒嗛〉鑾峰彇鍑哄叆搴撹褰曡〃
+ /// 鍒嗛〉鑾峰彇鍑哄叆搴撹褰�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public virtual async Task<PagedResultDto<WmsInOutStockRecordDto>> GetListAsync(GetWmsInOutStockRecordInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsInOutStockRecord.Sort);
- }
-
+ public virtual async Task<PagedResultDto<WmsInOutStockRecordDto>> GetListAsync(GetWmsInOutStockRecordInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(WmsInOutStockRecord.Sort);
+ }
+
#region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
+
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
- var count = await _wmsInOutStockRecordRepository.GetCountAsync(whereConditions);
- var list = await _wmsInOutStockRecordRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
-
- return new PagedResultDto<WmsInOutStockRecordDto>(count, ObjectMapper.Map<List<WmsInOutStockRecord>, List<WmsInOutStockRecordDto>>(list));
- }
-
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ var count = await wmsInOutStockRecordRepository.GetCountAsync(whereConditions);
+ var list = await wmsInOutStockRecordRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
+
+ return new PagedResultDto<WmsInOutStockRecordDto>(count, ObjectMapper.Map<List<WmsInOutStockRecord>, List<WmsInOutStockRecordDto>>(list));
+ }
+
/// <summary>
/// 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
/// </summary>
/// <param name="input">杈撳叆鍙傛暟</param>
/// <returns></returns>
- private FunReturnResultModel<Expression<Func<WmsInOutStockRecord, bool>>> DynamicGetQueryParams(GetWmsInOutStockRecordInput input)
- {
+ private FunReturnResultModel<Expression<Func<WmsInOutStockRecord, bool>>> DynamicGetQueryParams(GetWmsInOutStockRecordInput input)
+ {
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsInOutStockRecord, GetWmsInOutStockRecordInput>(input);
- if (!whereConditions.IsSuccess)
- {
- throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
- }
-
+ var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsInOutStockRecord, GetWmsInOutStockRecordInput>(input);
+ if (!whereConditions.IsSuccess)
+ {
+ throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
+ }
+
//涔熷彲鍐嶆鑷畾涔夋瀯寤烘煡璇㈡潯浠�
- Expression<Func<WmsInOutStockRecord, bool>> extendExpression = a => a.IsDeleted == false;
+ Expression<Func<WmsInOutStockRecord, bool>> extendExpression = a => a.IsDeleted == false;
// 浣跨敤 System.Linq.PredicateBuilder 鐨� And
- var pres = (System.Linq.Expressions.Expression<Func<WmsInOutStockRecord, bool>>)(whereConditions.data);
- whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
-
- return whereConditions;
- }
-
+ var pres = (System.Linq.Expressions.Expression<Func<WmsInOutStockRecord, bool>>)(whereConditions.data);
+ whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
+
+ return whereConditions;
+ }
+
/// <summary>
- /// 鏂板缓鍑哄叆搴撹褰曡〃
+ /// 鏂板缓鍑哄叆搴撹褰�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public virtual async Task<WmsInOutStockRecordDto> CreateAsync(WmsInOutStockRecordCreateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
-
-
- var maxSort = await _wmsInOutStockRecordRepository.GetMaxSortAsync();
- var sort = input.Sort ?? maxSort;
-
- var insertObj = ObjectMapper.Map<WmsInOutStockRecordCreateDto, WmsInOutStockRecord>(input);
- insertObj.Sort = sort;
- input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
-
- await _wmsInOutStockRecordRepository.InsertAsync(insertObj);
-
- if (input.Sort.HasValue && insertObj.Sort != maxSort)
- {
- await AdjustSortAsync(insertObj.Id, insertObj.Sort);
- }
-
- return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(insertObj);
- }
-
+ public virtual async Task<WmsInOutStockRecordDto> CreateAsync(WmsInOutStockRecordCreateDto input)
+ {
+ await CheckCreateOrUpdateDtoAsync(input);
+
+ var exist = await wmsInOutStockRecordRepository.NameExistAsync(input.Id);
+ if (exist)
+ {
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.Id]);
+ }
+
+ var maxSort = await wmsInOutStockRecordRepository.GetMaxSortAsync();
+ var sort = input.Sort ?? maxSort;
+
+ var insertObj = ObjectMapper.Map<WmsInOutStockRecordCreateDto, WmsInOutStockRecord>(input);
+ insertObj.Sort = sort;
+ input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
+
+ await wmsInOutStockRecordRepository.InsertAsync(insertObj);
+
+ if (input.Sort.HasValue && insertObj.Sort != maxSort)
+ {
+ await AdjustSortAsync(insertObj.Id, insertObj.Sort);
+ }
+
+ return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(insertObj);
+ }
+
/// <summary>
- /// 鏇存柊鍑哄叆搴撹褰曡〃
+ /// 鏇存柊鍑哄叆搴撹褰�
/// </summary>
/// <param name="id"></param>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public virtual async Task<WmsInOutStockRecordDto> UpdateAsync(Guid id, WmsInOutStockRecordUpdateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var updateObj = await _wmsInOutStockRecordRepository.GetAsync(id);
-
-
- updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
- input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
-
- updateObj.OrderNo = input.OrderNo;
+ public virtual async Task<WmsInOutStockRecordDto> UpdateAsync(Guid id, WmsInOutStockRecordUpdateDto input)
+ {
+ await CheckCreateOrUpdateDtoAsync(input);
+
+ var updateObj = await wmsInOutStockRecordRepository.GetAsync(id);
+ var exist = await wmsInOutStockRecordRepository.NameExistAsync(input.Id, updateObj.Id);
+ if (exist)
+ {
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.Id]);
+ }
+
+ updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
+ input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
+
+ updateObj.OrderNo = input.OrderNo;
updateObj.MaterialName = input.MaterialName;
updateObj.MaterialNo = input.MaterialNo;
updateObj.StockType = input.StockType;
@@ -147,20 +155,21 @@
updateObj.TaskNo = input.TaskNo;
updateObj.SourcePlace = input.SourcePlace;
updateObj.ToPlace = input.ToPlace;
-
-
- await _wmsInOutStockRecordRepository.UpdateAsync(updateObj);
-
- return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(updateObj);
- }
-
+ updateObj.IsDisabled = input.IsDisabled;
+
+
+ await wmsInOutStockRecordRepository.UpdateAsync(updateObj);
+
+ return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(updateObj);
+ }
+
/// <summary>
- /// 鍏嬮殕鍑哄叆搴撹褰曡〃
+ /// 鍏嬮殕鍑哄叆搴撹褰�
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- public async Task<List<WmsInOutStockRecordDto>> CloneAsync(IEnumerable<Guid> ids)
- {
+ public async Task<List<WmsInOutStockRecordDto>> CloneAsync(IEnumerable<Guid> ids)
+ {
//var wmsInOutStockRecords = new List<WmsInOutStockRecord>();
//if (ids != null)
//{
@@ -180,140 +189,248 @@
// name += WmsInOutStockRecordConsts.CloneTag;
// continue;
// }
-
+
// notExist = true;
// }
-
+
// //WmsInOutStockRecord = await wmsInOutStockRecordRepository.InsertAsync(WmsInOutStockRecord.Clone(GuidGenerator.Create(), name, sort++));
// wmsInOutStockRecords.Add(WmsInOutStockRecord);
// }
// }
//}
-
+
//return ObjectMapper.Map<List<WmsInOutStockRecord>, List<WmsInOutStockRecordDto>>(wmsInOutStockRecords);
- return new List<WmsInOutStockRecordDto>();
- }
-
+ return new List<WmsInOutStockRecordDto>();
+ }
+
/// <summary>
- /// 鍒犻櫎鍗曚釜鍑哄叆搴撹褰曡〃
+ /// 鍒犻櫎鍗曚釜鍑哄叆搴撹褰�
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public virtual Task DeleteAsync(Guid id)
- {
- return _wmsInOutStockRecordRepository.DeleteAsync(id);
- }
-
+ public virtual Task DeleteAsync(Guid id)
+ {
+ return wmsInOutStockRecordRepository.DeleteAsync(id);
+ }
+
/// <summary>
- /// 鍒犻櫎澶氫釜鍑哄叆搴撹褰曡〃
+ /// 鍒犻櫎澶氫釜鍑哄叆搴撹褰�
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- public async Task DeleteManyAsync(IEnumerable<Guid> ids)
- {
- foreach (var id in ids)
- {
- await DeleteAsync(id);
- }
- }
-
+ public async Task DeleteManyAsync(IEnumerable<Guid> ids)
+ {
+ foreach (var id in ids)
+ {
+ await DeleteAsync(id);
+ }
+ }
+
/// <summary>
- /// 璋冩暣鎺掑簭鍑哄叆搴撹褰曡〃
+ /// 璋冩暣鎺掑簭鍑哄叆搴撹褰�
/// </summary>
/// <param name="id"></param>
/// <param name="sort"></param>
/// <returns></returns>
- public virtual async Task AdjustSortAsync(Guid id, int sort)
- {
- var list = await _wmsInOutStockRecordRepository.GetListAsync(null, nameof(WmsInOutStockRecord.Sort));
- if (list != null && list.Any())
- {
- var initSort = 1;
- list.ForEach(x => x.AdjustSort(initSort++));
- var entity = list.FirstOrDefault(x => x.Id == id);
- if (entity != null)
- {
- if (sort == 1)
- {
- list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- }
- else if (entity.Sort > sort)
- {
- list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
- else if (entity.Sort < sort)
- {
- list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
-
- entity.AdjustSort(sort);
- }
- }
-
- await _wmsInOutStockRecordRepository.UpdateManyAsync(list);
- }
-
+ public virtual async Task AdjustSortAsync(Guid id, int sort)
+ {
+ var list = await wmsInOutStockRecordRepository.GetListAsync(null, nameof(WmsInOutStockRecord.Sort));
+ if (list != null && list.Any())
+ {
+ var initSort = 1;
+ list.ForEach(x => x.AdjustSort(initSort++));
+ var entity = list.FirstOrDefault(x => x.Id == id);
+ if (entity != null)
+ {
+ if (sort == 1)
+ {
+ list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
+ }
+ else if (entity.Sort > sort)
+ {
+ list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
+ list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
+ }
+ else if (entity.Sort < sort)
+ {
+ list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
+ list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
+ }
+
+ entity.AdjustSort(sort);
+ }
+ }
+
+ await wmsInOutStockRecordRepository.UpdateManyAsync(list);
+ }
+
/// <summary>
- /// 瀵煎叆鍑哄叆搴撹褰曡〃
+ /// 瀵煎叆鍑哄叆搴撹褰�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public async Task ImportAsync(WmsInOutStockRecordsImportModel input)
- {
-
- }
-
+ public async Task ImportAsync(WmsInOutStockRecordsImportModel input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ var wmsInOutStockRecordCreateDtos = new List<(int RowIndex, WmsInOutStockRecordCreateDto Item)>();
+ var wmsInOutStockRecordUpdateDtos = new List<(int RowIndex, Guid Id, WmsInOutStockRecordUpdateDto Item)>();
+ var importItems = input.WmsInOutStockRecords;
+
+ if (importItems != null && importItems.Any())
+ {
+ #region 瀵煎叆鏍￠獙
+
+ // 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
+ var duplicateWmsInOutStockRecords = importItems.GroupBy(x => x.Id).Where(x => x.Count() > 1).ToList();
+ if (duplicateWmsInOutStockRecords?.Any() == true)
+ {
+ var duplicateWmsInOutStockRecordMsgs = duplicateWmsInOutStockRecords.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWmsInOutStockRecordMsgs)}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+
+ #endregion
+
+ foreach (var impItem in importItems)
+ {
+ if (impItem.Id.IsNullOrWhiteSpace())
+ {
+ continue;
+ }
+
+ if (impItem.Id.IsNullOrWhiteSpace())
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細WmsInOutStockRecord鍚嶇О涓嶈兘涓虹┖";
+ throw new UserFriendlyException(errorMsg);
+ }
+
+ var oldWmsInOutStockRecord = await wmsInOutStockRecordRepository.FindByNameAsync(impItem.Id);
+ if (oldWmsInOutStockRecord != null)
+ {
+ var wmsInOutStockRecordUpdateDto = new WmsInOutStockRecordUpdateDto
+ {
+ OrderNo = impItem.OrderNo,
+MaterialName = impItem.MaterialName,
+MaterialNo = impItem.MaterialNo,
+StockType = impItem.StockType,
+ContainerNo = impItem.ContainerNo,
+MaterialModel = impItem.MaterialModel,
+OperateTime = impItem.OperateTime,
+Remark = impItem.Remark,
+MaterialId = impItem.MaterialId,
+TaskNo = impItem.TaskNo,
+SourcePlace = impItem.SourcePlace,
+ToPlace = impItem.ToPlace,
+IsDisabled = impItem.IsDisabled,
+
+ };
+
+ wmsInOutStockRecordUpdateDtos.Add((impItem.RowIndex, oldWmsInOutStockRecord.Id, wmsInOutStockRecordUpdateDto));
+ }
+ else
+ {
+ var wmsInOutStockRecordCreateDto = new WmsInOutStockRecordCreateDto
+ {
+ OrderNo = impItem.OrderNo,
+MaterialName = impItem.MaterialName,
+MaterialNo = impItem.MaterialNo,
+StockType = impItem.StockType,
+ContainerNo = impItem.ContainerNo,
+MaterialModel = impItem.MaterialModel,
+OperateTime = impItem.OperateTime,
+Remark = impItem.Remark,
+MaterialId = impItem.MaterialId,
+TaskNo = impItem.TaskNo,
+SourcePlace = impItem.SourcePlace,
+ToPlace = impItem.ToPlace,
+IsDisabled = impItem.IsDisabled,
+
+ };
+
+ wmsInOutStockRecordCreateDtos.Add((impItem.RowIndex, wmsInOutStockRecordCreateDto));
+ }
+ }
+ }
+
+ // 鏂板
+ foreach (var wmsInOutStockRecordDto in wmsInOutStockRecordCreateDtos)
+ {
+ try
+ {
+ await CreateAsync(wmsInOutStockRecordDto.Item);
+ }
+ catch (Exception e)
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsInOutStockRecordDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+ }
+
+ // 鏇存柊
+ foreach (var wmsInOutStockRecordDto in wmsInOutStockRecordUpdateDtos)
+ {
+ try
+ {
+ await UpdateAsync(wmsInOutStockRecordDto.Id, wmsInOutStockRecordDto.Item);
+ }
+ catch (Exception e)
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsInOutStockRecordDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+ }
+ }
+
/// <summary>
- /// 瀵煎嚭鍑哄叆搴撹褰曡〃
+ /// 瀵煎嚭鍑哄叆搴撹褰�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsInOutStockRecordInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsInOutStockRecord.Sort);
- }
-
+ public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsInOutStockRecordInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(WmsInOutStockRecord.Sort);
+ }
+
#region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
+
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
-
- var list = await _wmsInOutStockRecordRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
- var result = ObjectMapper.Map<List<WmsInOutStockRecord>, List<WmsInOutStockRecordDto>>(list);
-
- var sheets = new Dictionary<string, object>
- {
- ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
- };
-
- var fileName = result.Count > 1 ? "WmsInOutStockRecord鍒楄〃" : result.Count == 1 ? result[0]?.MaterialName : "WmsInOutStockRecord妯＄増";
- return (sheets, fileName);
- }
-
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+
+ var list = await wmsInOutStockRecordRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
+ var result = ObjectMapper.Map<List<WmsInOutStockRecord>, List<WmsInOutStockRecordDto>>(list);
+
+ var sheets = new Dictionary<string, object>
+ {
+ ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
+ };
+
+ var fileName = result.Count > 1 ? "鍑哄叆搴撹褰曞垪琛�" : result.Count == 1 ? result[0]?.Id : "WmsInOutStockRecord妯＄増";
+ return (sheets, fileName);
+ }
+
/// <summary>
- /// 鏍￠獙鍑哄叆搴撹褰曡〃锛屽綋鏂板缓鎴栨洿鏂版椂
+ /// 鏍￠獙鍑哄叆搴撹褰曪紝褰撴柊寤烘垨鏇存柊鏃�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- protected Task CheckCreateOrUpdateDtoAsync(WmsInOutStockRecordCreateOrUpdateDtoBase input)
- {
- Check.NotNull(input, nameof(input));
- Check.NotNullOrWhiteSpace(input.OrderNo, "鍗曟嵁缂栧彿", 50);
+ protected Task CheckCreateOrUpdateDtoAsync(WmsInOutStockRecordCreateOrUpdateDtoBase input)
+ {
+ Check.NotNull(input, nameof(input));
+ Check.NotNullOrWhiteSpace(input.OrderNo, "鍗曟嵁缂栧彿", 50);
Check.NotNullOrWhiteSpace(input.MaterialNo, "鐗╂枡浠跺彿", 50);
Check.NotNull(input.StockType, "鎿嶄綔绫诲瀷");
Check.NotNullOrWhiteSpace(input.MaterialId, "鐗╂枡ID", 50);
Check.NotNullOrWhiteSpace(input.TaskNo, "浠诲姟鍙�", 50);
-
- return Task.CompletedTask;
- }
-}
+
+ return Task.CompletedTask;
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsInOutStockRecordAutoMapperProfile.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsInOutStockRecordAutoMapperProfile.cs
new file mode 100644
index 0000000..cbc8b3b
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsInOutStockRecordAutoMapperProfile.cs
@@ -0,0 +1,26 @@
+using AutoMapper;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
+using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord;
+using Volo.Abp.ObjectExtending;
+
+namespace CMS.Plugin.HIAWms.Application.MapperProfiles;
+
+/// <summary>
+/// 鍑哄叆搴撹褰旳utoMapper閰嶇疆
+/// </summary>
+/// <seealso cref="AutoMapper.Profile" />
+public class WmsInOutStockRecordAutoMapperProfile : Profile
+{
+ /// <summary>
+ /// Initializes a new instance of the <see cref="WmsInOutStockRecordAutoMapperProfile"/> class.
+ /// </summary>
+ public WmsInOutStockRecordAutoMapperProfile()
+ {
+ /* You can configure your AutoMapper mapping configuration here.
+ * Alternatively, you can split your mapping configurations
+ * into multiple profile classes for a better organization. */
+ CreateMap<WmsInOutStockRecord, WmsInOutStockRecordDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
+ CreateMap<WmsInOutStockRecordCreateDto, WmsInOutStockRecord>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
+ CreateMap<GetWmsInOutStockRecordInput, WmsInOutStockRecord>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecord/IWmsInOutStockRecordRepository.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecord/IWmsInOutStockRecordRepository.cs
index e4fd45b..a6bac5b 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecord/IWmsInOutStockRecordRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecord/IWmsInOutStockRecordRepository.cs
@@ -5,34 +5,34 @@
namespace CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord;
/// <summary>
-/// 鍑哄叆搴撹褰曡〃浠撳偍
+/// 鍑哄叆搴撹褰曚粨鍌�
/// </summary>
public interface IWmsInOutStockRecordRepository : IBasicRepository<WmsInOutStockRecord, Guid>
{
/// <summary>
- /// 鎸夌収鍚嶇О鏌ユ壘鍑哄叆搴撹褰曡〃
+ /// 鎸夌収鍚嶇О鏌ユ壘鍑哄叆搴撹褰�
/// </summary>
- /// <param name="materialNo"></param>
+ /// <param name="name"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- Task<WmsInOutStockRecord> FindByNameAsync(string materialNo, CancellationToken cancellationToken = default);
+ Task<WmsInOutStockRecord> FindByNameAsync(string name, CancellationToken cancellationToken = default);
/// <summary>
- /// 楠岃瘉鍚嶇О鏄惁瀛樺湪鍑哄叆搴撹褰曡〃
+ /// 楠岃瘉鍚嶇О鏄惁瀛樺湪鍑哄叆搴撹褰�
/// </summary>
- /// <param name="materialNo"></param>
+ /// <param name="name"></param>
/// <param name="id"></param>
/// <returns></returns>
- Task<bool> NameExistAsync(string materialNo, Guid? id = null);
+ Task<bool> NameExistAsync(string name, Guid? id = null);
/// <summary>
- /// 鑾峰彇鏈�澶ф帓搴忓嚭鍏ュ簱璁板綍琛�
+ /// 鑾峰彇鏈�澶ф帓搴忓嚭鍏ュ簱璁板綍
/// </summary>
/// <returns></returns>
Task<int> GetMaxSortAsync();
/// <summary>
- /// 鑾峰彇鍒嗛〉鍒楄〃鍑哄叆搴撹褰曡〃
+ /// 鑾峰彇鍒嗛〉鍒楄〃鍑哄叆搴撹褰�
/// </summary>
/// <param name="whereConditions"></param>
/// <param name="sorting"></param>
@@ -44,7 +44,7 @@
Task<List<WmsInOutStockRecord>> GetListAsync(FunReturnResultModel<Expression<Func<WmsInOutStockRecord, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default);
/// <summary>
- /// 鑾峰彇鎬绘暟鍑哄叆搴撹褰曡〃
+ /// 鑾峰彇鎬绘暟鍑哄叆搴撹褰�
/// </summary>
/// <param name="whereConditions"></param>
/// <param name="cancellationToken"></param>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsInOutStockRecordRepository.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsInOutStockRecordRepository.cs
index 78a34d1..1b8c984 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsInOutStockRecordRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsInOutStockRecordRepository.cs
@@ -11,7 +11,7 @@
namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories;
/// <summary>
-/// 鍑哄叆搴撹褰曡〃浠撳偍瀹炵幇
+/// 鍑哄叆搴撹褰曚粨鍌ㄥ疄鐜�
/// </summary>
public class EfCoreWmsInOutStockRecordRepository : EfCoreRepository<ICMSPluginDbContext, WmsInOutStockRecord, Guid>, IWmsInOutStockRecordRepository
{
@@ -25,33 +25,33 @@
}
/// <summary>
- /// 鎸夌収鍚嶇О鏌ユ壘鍑哄叆搴撹褰曡〃
+ /// 鎸夌収鍚嶇О鏌ユ壘鍑哄叆搴撹褰�
/// </summary>
- /// <param name="materialNo"></param>
+ /// <param name="name"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public virtual async Task<WmsInOutStockRecord> FindByNameAsync(string materialNo, CancellationToken cancellationToken = default)
+ public virtual async Task<WmsInOutStockRecord> FindByNameAsync(string name, CancellationToken cancellationToken = default)
{
return await (await GetDbSetAsync())
.IncludeDetails()
.Where(x => !x.IsDeleted)
.OrderBy(t => t.Sort)
- .FirstOrDefaultAsync(t => t.MaterialNo == materialNo, GetCancellationToken(cancellationToken));
+ .FirstOrDefaultAsync(t => t.Id == name, GetCancellationToken(cancellationToken));
}
/// <summary>
- /// 楠岃瘉鍚嶇О鏄惁瀛樺湪鍑哄叆搴撹褰曡〃
+ /// 楠岃瘉鍚嶇О鏄惁瀛樺湪鍑哄叆搴撹褰�
/// </summary>
- /// <param name="materialCode"></param>
+ /// <param name="name">鏍￠獙鍊�</param>
/// <param name="id"></param>
/// <returns></returns>
- public async Task<bool> NameExistAsync(string materialCode, Guid? id = null)
+ public async Task<bool> NameExistAsync(string name, Guid? id = null)
{
- return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.MaterialName == materialCode);
+ return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.Id == name);
}
/// <summary>
- /// 鑾峰彇鏈�澶ф帓搴忓嚭鍏ュ簱璁板綍琛�
+ /// 鑾峰彇鏈�澶ф帓搴忓嚭鍏ュ簱璁板綍
/// </summary>
/// <returns></returns>
public async Task<int> GetMaxSortAsync()
@@ -69,7 +69,7 @@
}
/// <summary>
- /// 鑾峰彇鍒嗛〉鍒楄〃鍑哄叆搴撹褰曡〃
+ /// 鑾峰彇鍒嗛〉鍒楄〃鍑哄叆搴撹褰�
/// </summary>
/// <param name="whereConditions"></param>
/// <param name="sorting"></param>
@@ -90,7 +90,7 @@
}
/// <summary>
- /// 鑾峰彇鎬绘暟鍑哄叆搴撹褰曡〃
+ /// 鑾峰彇鎬绘暟鍑哄叆搴撹褰�
/// </summary>
/// <param name="whereConditions"></param>
/// <param name="cancellationToken"></param>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsInOutStockRecordController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsInOutStockRecordController.cs
index 425b7ae..049552c 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsInOutStockRecordController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsInOutStockRecordController.cs
@@ -13,7 +13,7 @@
namespace CMS.Plugin.HIAWms.Controller
{
/// <summary>
- /// 鍑哄叆搴撹褰曡〃鏈嶅姟
+ /// 鍑哄叆搴撹褰曟湇鍔�
/// </summary>
[ApiController]
[TypeFilter(typeof(CMSLanguageFilter))]
@@ -35,7 +35,7 @@
}
/// <summary>
- /// 鑾峰彇鍑哄叆搴撹褰曡〃
+ /// 鑾峰彇鍑哄叆搴撹褰�
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <returns></returns>
@@ -47,7 +47,7 @@
}
/// <summary>
- /// 鍒嗛〉鑾峰彇鍑哄叆搴撹褰曡〃鐨勫垪琛�.
+ /// 鍒嗛〉鑾峰彇鍑哄叆搴撹褰曠殑鍒楄〃.
/// </summary>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
@@ -59,7 +59,7 @@
}
/// <summary>
- /// 鍒涘缓鍑哄叆搴撹褰曡〃
+ /// 鍒涘缓鍑哄叆搴撹褰�
/// </summary>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
@@ -71,7 +71,7 @@
}
/// <summary>
- /// 鏇存柊鍑哄叆搴撹褰曡〃
+ /// 鏇存柊鍑哄叆搴撹褰�
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <param name="input">杈撳叆.</param>
@@ -85,7 +85,7 @@
}
/// <summary>
- /// 鍏嬮殕鍑哄叆搴撹褰曡〃
+ /// 鍏嬮殕鍑哄叆搴撹褰�
/// </summary>
/// <param name="ids">Id闆嗗悎.</param>
/// <returns></returns>
@@ -98,7 +98,7 @@
}
/// <summary>
- /// 鍒犻櫎鍑哄叆搴撹褰曡〃
+ /// 鍒犻櫎鍑哄叆搴撹褰�
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <returns></returns>
@@ -111,7 +111,7 @@
}
/// <summary>
- /// 鎵归噺鍒犻櫎鍑哄叆搴撹褰曡〃
+ /// 鎵归噺鍒犻櫎鍑哄叆搴撹褰�
/// </summary>
/// <param name="ids">The ids.</param>
/// <returns></returns>
@@ -123,7 +123,7 @@
}
/// <summary>
- /// 璋冩暣鎺掑簭鍑哄叆搴撹褰曡〃
+ /// 璋冩暣鎺掑簭鍑哄叆搴撹褰�
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <returns></returns>
@@ -135,7 +135,7 @@
}
/// <summary>
- /// 瀵煎叆鍑哄叆搴撹褰曡〃
+ /// 瀵煎叆鍑哄叆搴撹褰�
/// </summary>
/// <returns></returns>
[Authorize]
@@ -164,7 +164,7 @@
}
/// <summary>
- /// 瀵煎嚭鍑哄叆搴撹褰曡〃
+ /// 瀵煎嚭鍑哄叆搴撹褰�
/// </summary>
/// <returns></returns>
[HttpGet]
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecord.ts b/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecord.ts
index b87f2e7..039bb46 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecord.ts
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecord.ts
@@ -128,9 +128,9 @@
{
label: '鍒犻櫎',
fn: async (c: CurrentType) => {
- const names = selection.value.map((item: { name: string }) => item.name)
+ const names = selection.value.map((item: { id: string }) => item.id)
ConfirmBox(
- `鏄惁鍒犻櫎${names.length ? names.join(',') : c.row.name}`
+ `鏄惁鍒犻櫎${names.length ? names.join(',') : c.row.id}`
).then(async () => {
const ids = selection.value.map((item: { id: string }) => item.id)
await wmsInOutStockRecord.deleteWmsInOutStockRecords(ids.length ? ids : [c.row.id])
@@ -187,7 +187,7 @@
*/
const onExport = (data={}) => {
//const params = tableRef.value?.getParams()
- exportFile('/api/v1/hIAWms/wmsInOutStockRecord/export', data, 'hIAWms')
+ exportFile('/api/v1/HIAWms/wmsInOutStockRecord/export', data, 'wmsInOutStockRecord')
}
/**
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordDrawer.tsx b/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordDrawer.tsx
index 275c9ad..4e3daca 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordDrawer.tsx
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordDrawer.tsx
@@ -43,6 +43,27 @@
></el-input-number>
)
}
+ const datePicker = (attrs) => {
+ return (
+ <el-date-picker
+ type="date"
+ format="YYYY-MM-DD HH:mm:ss"
+ formatValue="YYYY-MM-DD HH:mm:ss"
+ {...attrs}
+ ></el-date-picker>
+ )
+ }
+
+ const dateTimePicker = (attrs) => {
+ return (
+ <el-date-picker
+ type="datetime"
+ format="YYYY-MM-DD HH:mm:ss"
+ formatValue="YYYY-MM-DD HH:mm:ss"
+ {...attrs}
+ ></el-date-picker>
+ )
+ }
const visible = computed({
get() {
@@ -104,8 +125,14 @@
{
label: '鎿嶄綔鏃堕棿',
prop: 'operateTime',
- type: 'datetimerange',
- el: 'date-picker',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(datePicker, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ搷浣滄椂闂�',
},
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx b/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx
index f8e1bb1..5c2295b 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx
@@ -1,281 +1,308 @@
-import {
- ref,
- onMounted,
- reactive,
- computed,
- Ref,
- watch,
- SetupContext,
- h,
-} from 'vue'
-import { injectModel } from '@/libs/Provider/Provider'
-import { WmsInOutStockRecordDrawer } from '../Models/WmsInOutStockRecordDrawer'
-import { ElMessage } from 'element-plus'
-import isEqual from 'lodash/isEqual'
-import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
-import { cloneDeep } from 'lodash'
-
-export const useWmsInOutStockRecordQueryDrawer = (props: any, ctx?: any) => {
- const wmsInOutStockRecordDrawer = injectModel<WmsInOutStockRecordDrawer>(
- 'WmsInOutStockRecordDrawer'
- )
- /**
- * 鐢ㄦ潵瀵规瘮鐨勫垵濮嬪寲鏁版嵁
- */
- const initiateData: Ref<Record<string, any>> = ref({})
- const formData = ref<Record<string, any>>({})
- // ref
- const formRef = ref()
-
- const disabled = ref(false)
-
- const current = computed(() => {
- return props.row || null
- })
-
- const inputNumber = (attrs) => {
- return (
- <el-input-number
- min="1"
- step="1"
- precision="0"
- {...attrs}
- ></el-input-number>
- )
- }
-
- const visible = computed({
- get() {
- return props.modelValue
- },
- set(val) {
- ctx.emit('update:modelValue', val)
- },
- })
- /**
- * 娣诲姞鐨刦orm瀛楁
- */
- const formItems = reactive([
- {
- label: '鍗曟嵁缂栧彿',
- prop: 'orderNo',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ崟鎹紪鍙�',
- },
- {
- label: '鐗╂枡鍚嶇О',
- prop: 'materialName',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
- },
- {
- label: '鐗╂枡浠跺彿',
- prop: 'materialNo',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ョ墿鏂欎欢鍙�',
- },
- {
- label: '鎿嶄綔绫诲瀷',
- prop: 'stockType',
- el: 'select',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ搷浣滅被鍨�',
- },
- {
- label: '瀹瑰櫒缂栧彿',
- prop: 'containerNo',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ鍣ㄧ紪鍙�',
- },
- {
- label: '鏈哄瀷',
- prop: 'materialModel',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ満鍨�',
- },
- {
- label: '鎿嶄綔鏃堕棿',
- prop: 'operateTime',
- type: 'datetimerange',
- el: 'date-picker',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ搷浣滄椂闂�',
- },
- {
- label: '澶囨敞',
- prop: 'remark',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ娉�',
- },
- {
- label: '鐗╂枡ID',
- prop: 'materialId',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ョ墿鏂橧D',
- },
- {
- label: '浠诲姟鍙�',
- prop: 'taskNo',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ヤ换鍔″彿',
- },
- {
- label: '璧峰搴撲綅',
- prop: 'sourcePlace',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ヨ捣濮嬪簱浣�',
- },
- {
- label: '鐩爣搴撲綅',
- prop: 'toPlace',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ョ洰鏍囧簱浣�',
- },
- ])
- /**
- * 鏍￠獙鏄惁鏈夋暟鎹彉鍖�
- */
- const checkIsEqualObject = () => {
- const data = {
- formData: formData.value,
- }
- const check = isEqual(initiateData.value, data)
- return check
- }
- const commonGetFormData = () => {
- const data = {
- OrderNo: formData.value.OrderNo,
- MaterialName: formData.value.MaterialName,
- MaterialNo: formData.value.MaterialNo,
- StockType: formData.value.StockType,
- ContainerNo: formData.value.ContainerNo,
- MaterialModel: formData.value.MaterialModel,
- OperateTime: formData.value.OperateTime,
- Remark: formData.value.Remark,
- MaterialId: formData.value.MaterialId,
- TaskNo: formData.value.TaskNo,
- SourcePlace: formData.value.SourcePlace,
- ToPlace: formData.value.ToPlace,
- materialCode: formData.value.materialCode,
- materialName: formData.value.materialName,
- purchaseType: formData.value.purchaseType,
- materialType: formData.value.materialType,
- primaryUnit: formData.value.primaryUnit,
- standard: formData.value.standard,
- outerDiameter: formData.value.outerDiameter,
- wallThickness: formData.value.wallThickness,
- materialQuality: formData.value.materialQuality,
- length: formData.value.length,
- isMainBranch: formData.value.isMainBranch,
- factory: formData.value.factory,
- certification: formData.value.certification,
- remark: formData.value.remark,
- }
- return data
- }
- const onClose = (done: () => void) => {
- if (visible.value) {
- visible.value = false
- const data = commonGetFormData()
- ctx.emit('close', data)
- }
- }
- /**
- * 纭鏌ヨ
- */
- const onConfirmQuery = async () => {
- const data = commonGetFormData()
- ctx.emit('confirmQuery', data)
- }
- /**
- * 閲嶇疆鏌ヨ
- */
- const onReset = async () => {
- formData.value = {}
- formData.value.OrderNo = ''
- formData.value.MaterialName = ''
- formData.value.MaterialNo = ''
- formData.value.StockType = ''
- formData.value.ContainerNo = ''
- formData.value.MaterialModel = ''
- formData.value.OperateTime = ''
- formData.value.Remark = ''
- formData.value.MaterialId = ''
- formData.value.TaskNo = ''
- formData.value.SourcePlace = ''
- formData.value.ToPlace = ''
- formData.value.materialCode = ''
- formData.value.materialName = ''
- formData.value.purchaseType = ''
- formData.value.materialType = ''
- formData.value.primaryUnit = ''
- formData.value.standard = ''
- formData.value.outerDiameter = ''
- formData.value.wallThickness = ''
- formData.value.materialQuality = ''
- formData.value.length = ''
- formData.value.isMainBranch = ''
- formData.value.factory = ''
- formData.value.certification = ''
- formData.value.remark = ''
- //鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
- ctx.emit('restQuery')
- }
-
- const updateCheckData = () => {
- initiateData.value = {
- formData: {
- ...formData.value,
- },
- }
- }
- const updateFormItemOptions = (propName: string, enumData: any[]) => {
- const item = formItems.find((item) => item.prop === propName)
- if (item && enumData) {
- item.options = enumData.map((item) => ({
- label: item.description,
- value: item.value,
- }))
- }
- }
- /**
- * 閫氱敤鏌ヨ鏋氫妇
- */
- const commonQueryEnumForFrom = async () => {
- const stockTypeEnumEnum = await wmsInOutStockRecordDrawer.getWmsEnumData({
- EnumName: 'StockTypeEnum',
- })
- updateFormItemOptions('stockType', stockTypeEnumEnum)
- }
- commonQueryEnumForFrom()
- /**
- * 寮圭獥鎵撳紑鑾峰彇璇︽儏
- */
- const onOpen = async () => {
- disabled.value = false
- updateCheckData()
- }
-
- watch(() => current.value, onOpen)
-
- return {
- formItems,
- formData,
- visible,
- formRef,
- onOpen,
- onClose,
- onConfirmQuery,
- onReset,
- }
-}
+import {
+ ref,
+ onMounted,
+ reactive,
+ computed,
+ Ref,
+ watch,
+ SetupContext,
+ h,
+} from 'vue'
+import { injectModel } from '@/libs/Provider/Provider'
+import { WmsInOutStockRecordDrawer } from '../Models/WmsInOutStockRecordDrawer'
+import { ElMessage } from 'element-plus'
+import isEqual from 'lodash/isEqual'
+import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
+import { cloneDeep } from 'lodash'
+
+export const useWmsInOutStockRecordQueryDrawer = (props: any, ctx?: any) => {
+ const wmsInOutStockRecordDrawer = injectModel<WmsInOutStockRecordDrawer>('WmsInOutStockRecordDrawer')
+ /**
+ * 鐢ㄦ潵瀵规瘮鐨勫垵濮嬪寲鏁版嵁
+ */
+ const initiateData: Ref<Record<string, any>> = ref({})
+ const formData = ref<Record<string, any>>({})
+ // ref
+ const formRef = ref()
+
+ const disabled = ref(false)
+
+ const current = computed(() => {
+ return props.row || null
+ })
+
+ const inputNumber = (attrs) => {
+ return (
+ <el-input-number
+ min="1"
+ step="1"
+ precision="0"
+ {...attrs}
+ ></el-input-number>
+ )
+ }
+
+ 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() {
+ return props.modelValue
+ },
+ set(val) {
+ ctx.emit('update:modelValue', val)
+ },
+ })
+ /**
+ * 娣诲姞鐨刦orm瀛楁
+ */
+ const formItems = reactive([
+ {
+ label: '鍗曟嵁缂栧彿',
+ prop: 'orderNo',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ崟鎹紪鍙�',
+ },
+ {
+ label: '鐗╂枡鍚嶇О',
+ prop: 'materialName',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
+ },
+ {
+ label: '鐗╂枡浠跺彿',
+ prop: 'materialNo',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ョ墿鏂欎欢鍙�',
+ },
+ {
+ label: '鎿嶄綔绫诲瀷',
+ prop: 'stockType',
+ el: 'select',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ搷浣滅被鍨�',
+ },
+ {
+ label: '瀹瑰櫒缂栧彿',
+ prop: 'containerNo',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ鍣ㄧ紪鍙�',
+ },
+ {
+ label: '鏈哄瀷',
+ prop: 'materialModel',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ満鍨�',
+ },
+ {
+ label: '鎿嶄綔鏃堕棿',
+ prop: 'operateTime',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(dateTimePickerRange, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ搷浣滄椂闂�',
+ },
+ {
+ label: '澶囨敞',
+ prop: 'remark',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ娉�',
+ },
+ {
+ label: '鐗╂枡ID',
+ prop: 'materialId',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ョ墿鏂橧D',
+ },
+ {
+ label: '浠诲姟鍙�',
+ prop: 'taskNo',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ヤ换鍔″彿',
+ },
+ {
+ label: '璧峰搴撲綅',
+ prop: 'sourcePlace',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ヨ捣濮嬪簱浣�',
+ },
+ {
+ label: '鐩爣搴撲綅',
+ prop: 'toPlace',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ョ洰鏍囧簱浣�',
+ },
+ {
+ label: '鏄惁绂佺敤',
+ prop: 'isDisabled',
+ el: 'select',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ槸鍚︾鐢�',
+ options: [{label: '鏄�',value: 'true'}, {label: '鍚�',value: 'false'}]
+ },
+ {
+ label: '',
+ prop: 'creationTime',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(dateTimePickerRange, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏�',
+ },
+ ])
+ /**
+ * 鏍￠獙鏄惁鏈夋暟鎹彉鍖�
+ */
+ const checkIsEqualObject = () => {
+ const data = {
+ formData: formData.value,
+ }
+ const check = isEqual(initiateData.value, data)
+ return check
+ }
+ const commonGetFormData=()=>{
+ const data = {
+ orderNo: formData.value.orderNo || '',
+materialName: formData.value.materialName || '',
+materialNo: formData.value.materialNo || '',
+stockType: formData.value.stockType || '',
+containerNo: formData.value.containerNo || '',
+materialModel: formData.value.materialModel || '',
+operateTime: formData.value.operateTime || '',
+remark: formData.value.remark || '',
+materialId: formData.value.materialId || '',
+taskNo: formData.value.taskNo || '',
+sourcePlace: formData.value.sourcePlace || '',
+toPlace: formData.value.toPlace || '',
+isDisabled: formData.value.isDisabled || '',
+creationTime: formData.value.creationTime || '',
+ }
+ return data;
+ }
+ const onClose = (done: () => void) => {
+ if (visible.value) {
+ visible.value = false
+ const data =commonGetFormData();
+ ctx.emit('close', data)
+ }
+ }
+ /**
+ * 纭鏌ヨ
+ */
+ const onConfirmQuery = async () => {
+ const data =commonGetFormData();
+ ctx.emit('confirmQuery', data)
+ }
+ /**
+ * 閲嶇疆鏌ヨ
+ */
+ const onReset = async () => {
+ formData.value = {}
+ formData.value.OrderNo = ''
+formData.value.MaterialName = ''
+formData.value.MaterialNo = ''
+formData.value.StockType = ''
+formData.value.ContainerNo = ''
+formData.value.MaterialModel = ''
+formData.value.OperateTime = ''
+formData.value.Remark = ''
+formData.value.MaterialId = ''
+formData.value.TaskNo = ''
+formData.value.SourcePlace = ''
+formData.value.ToPlace = ''
+ //鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
+ ctx.emit('restQuery');
+ }
+
+ const updateCheckData = () => {
+ initiateData.value = {
+ formData: {
+ ...formData.value,
+ },
+ }
+ }
+ const updateFormItemOptions = (propName: string, enumData: any[]) => {
+ const item = formItems.find((item) => item.prop === propName)
+ if (item && enumData) {
+ item.options = enumData.map((item) => ({
+ label: item.description,
+ value: item.value,
+ }))
+ }
+ }
+ /**
+ * 閫氱敤鏌ヨ鏋氫妇
+ */
+ const commonQueryEnumForFrom = async () => {
+ const stockTypeEnumEnum = await wmsInOutStockRecordDrawer.getWmsEnumData({
+ EnumName: 'StockTypeEnum',
+})
+updateFormItemOptions('stockType', stockTypeEnumEnum)
+
+ }
+ commonQueryEnumForFrom()
+ /**
+ * 寮圭獥鎵撳紑鑾峰彇璇︽儏
+ */
+ const onOpen = async () => {
+ disabled.value = false
+ updateCheckData()
+ }
+
+ watch(() => current.value, onOpen)
+
+ return {
+ formItems,
+ formData,
+ visible,
+ formRef,
+ onOpen,
+ onClose,
+ onConfirmQuery,
+ onReset,
+ }
+}
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/Service/WmsInOutStockRecord.ts b/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/Service/WmsInOutStockRecord.ts
index 01d8ebe..be7ab90 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/Service/WmsInOutStockRecord.ts
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/Service/WmsInOutStockRecord.ts
@@ -1,30 +1,30 @@
-import { Base } from '@/libs/Base/Base'
-const request = Base.request
-
-/**
- * 娣诲姞
- * @returns
- */
-export const addWmsInOutStockRecord = (data: any) => {
- return request.post('/api/v1/HIAWms/wmsInOutStockRecord', data)
-}
-
-/**
- * 鎵归噺鍒犻櫎
- * @returns
- */
-export const deleteWmsInOutStockRecord = (ids: string[]) => {
- return request({
- data: ids,
- url: '/api/v1/HIAWms/wmsInOutStockRecord',
- method: 'delete',
- })
-}
-
-/**
- * 鍏嬮殕
- * @returns
- */
-export const cloneData = (data: any) => {
- return request.post('/api/v1/HIAWms/wmsInOutStockRecord/clone', data)
-}
+import { Base } from '@/libs/Base/Base'
+const request = Base.request
+
+/**
+ * 娣诲姞
+ * @returns
+ */
+export const addWmsInOutStockRecord = (data: any) => {
+ return request.post('/api/v1/HIAWms/wmsInOutStockRecord', data)
+}
+
+/**
+ * 鎵归噺鍒犻櫎
+ * @returns
+ */
+export const deleteWmsInOutStockRecords = (ids: string[]) => {
+ return request({
+ data: ids,
+ url: '/api/v1/HIAWms/wmsInOutStockRecord',
+ method: 'delete',
+ })
+}
+
+/**
+ * 鍏嬮殕
+ * @returns
+ */
+export const cloneData = (data: any) => {
+ return request.post('/api/v1/HIAWms/wmsInOutStockRecord/clone', data)
+}
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/Service/WmsInOutStockRecordDrawer.ts b/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/Service/WmsInOutStockRecordDrawer.ts
index 0d1e4f3..cbef900 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/Service/WmsInOutStockRecordDrawer.ts
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/Service/WmsInOutStockRecordDrawer.ts
@@ -1,34 +1,34 @@
-import { Base } from '@/libs/Base/Base'
-const request = Base.request
-
-/**
- * 娣诲姞
- * @returns
- */
-export const addWmsInOutStockRecord = (data: any) => {
- return request.post('/api/v1/HIAWms/wmsInOutStockRecord', data)
-}
-
-/**
- * 鑾峰彇璇︽儏
- * @returns
- */
-export const getWmsInOutStockRecord = (id: string) => {
- return request.get(`/api/v1/HIAWms/wmsInOutStockRecord/${id}`)
-}
-
-/**
- * 鏇存柊
- * @returns
- */
-export const updateWmsInOutStockRecord = (id: string, data: Record<string, any>) => {
- return request.put(`/api/v1/HIAWms/wmsInOutStockRecord/${id}`, data)
-}
-
-/**
- * 鑾峰彇鏋氫妇
- * @returns
- */
-export const getWmsEnumData = (data: any) => {
- return request.post('/api/v1/HIAWms/WmsEnum', data)
-}
+import { Base } from '@/libs/Base/Base'
+const request = Base.request
+
+/**
+ * 娣诲姞
+ * @returns
+ */
+export const addWmsInOutStockRecord = (data: any) => {
+ return request.post('/api/v1/HIAWms/wmsInOutStockRecord', data)
+}
+
+/**
+ * 鑾峰彇璇︽儏
+ * @returns
+ */
+export const getWmsInOutStockRecord = (id: string) => {
+ return request.get(`/api/v1/HIAWms/wmsInOutStockRecord/${id}`)
+}
+
+/**
+ * 鏇存柊
+ * @returns
+ */
+export const updateWmsInOutStockRecord = (id: string, data: Record<string, any>) => {
+ return request.put(`/api/v1/HIAWms/wmsInOutStockRecord/${id}`, data)
+}
+
+/**
+ * 鑾峰彇鏋氫妇
+ * @returns
+ */
+export const getWmsEnumData = (data: any) => {
+ return request.post('/api/v1/HIAWms/WmsEnum', data)
+}
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecord.ts b/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecord.ts
index 871af9e..85d73a8 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecord.ts
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecord.ts
@@ -1,41 +1,41 @@
-import { Base } from '@/libs/Base/Base'
-import {
- deleteWmsInOutStockRecord,
- addWmsInOutStockRecord,
- cloneData,
-} from './Service/WmsInOutStockRecord'
-
-export class WmsInOutStockRecord extends Base<{ [key: string]: any }> {
- constructor() {
- super({
- data: [],
- })
- }
- onMounted() {}
- /**
- * 鍒犻櫎
- * @param id
- * @returns
- */
- async deleteWmsInOutStockRecords(ids: string[]) {
- return deleteWmsInOutStockRecord(ids)
- }
-
- /**
- * 娣诲姞鏁版嵁
- * @param data
- * @returns
- */
- addWmsInOutStockRecord(data: Record<string, any>) {
- return addWmsInOutStockRecord(data)
- }
-
- /**
- * 鍏嬮殕
- * @param ids
- * @returns
- */
- cloneData(ids: string[]) {
- return cloneData(ids)
- }
-}
+import { Base } from '@/libs/Base/Base'
+import {
+ deleteWmsInOutStockRecords,
+ addWmsInOutStockRecord,
+ cloneData,
+} from './Service/WmsInOutStockRecord'
+
+export class WmsInOutStockRecord extends Base<{ [key: string]: any }> {
+ constructor() {
+ super({
+ data: [],
+ })
+ }
+ onMounted() {}
+ /**
+ * 鍒犻櫎
+ * @param id
+ * @returns
+ */
+ async deleteWmsInOutStockRecords(ids: string[]) {
+ return deleteWmsInOutStockRecords(ids)
+ }
+
+ /**
+ * 娣诲姞鏁版嵁
+ * @param data
+ * @returns
+ */
+ addWmsInOutStockRecord(data: Record<string, any>) {
+ return addWmsInOutStockRecord(data)
+ }
+
+ /**
+ * 鍏嬮殕
+ * @param ids
+ * @returns
+ */
+ cloneData(ids: string[]) {
+ return cloneData(ids)
+ }
+}
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecordDrawer.ts b/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecordDrawer.ts
index b772475..450c9ba 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecordDrawer.ts
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecordDrawer.ts
@@ -1,44 +1,44 @@
-import { Base } from '@/libs/Base/Base'
-import {
- addWmsInOutStockRecord,
- getWmsInOutStockRecord,
- updateWmsInOutStockRecord,
- getWmsEnumData,
-} from './Service/WmsInOutStockRecordDrawer'
-import { useGlobalState } from '@/libs/Store/Store'
-
-export class WmsInOutStockRecordDrawer extends Base<{ [key: string]: any }> {
- constructor() {
- super({
- data: [],
- wmsMaterial: {},
- })
- }
-
- /**
- * 娣诲姞
- * @param data
- */
- async addWmsInOutStockRecord(data: Record<string, any>) {
- return addWmsInOutStockRecord(data)
- }
- /**
- * 鏇存柊
- * @param data
- */
- async updateWmsInOutStockRecord(id: string, data: Record<string, any>) {
- return updateWmsInOutStockRecord(id, data)
- }
-
- /**
- * 鑾峰彇璇︽儏
- */
- async getWmsInOutStockRecordDetail(current: any, id?: string) {
- return getWmsInOutStockRecord(id || current?.id)
- }
-
- // 鑾峰彇鏋氫妇鍊�
- async getWmsEnumData(data: Record<string, any>) {
- return getWmsEnumData(data)
- }
-}
+import { Base } from '@/libs/Base/Base'
+import {
+ addWmsInOutStockRecord,
+ getWmsInOutStockRecord,
+ updateWmsInOutStockRecord,
+ getWmsEnumData,
+} from './Service/WmsInOutStockRecordDrawer'
+import { useGlobalState } from '@/libs/Store/Store'
+
+export class WmsInOutStockRecordDrawer extends Base<{ [key: string]: any }> {
+ constructor() {
+ super({
+ data: [],
+ wmsInOutStockRecord: {},
+ })
+ }
+
+ /**
+ * 娣诲姞
+ * @param data
+ */
+ async addWmsInOutStockRecord(data: Record<string, any>) {
+ return addWmsInOutStockRecord(data)
+ }
+ /**
+ * 鏇存柊
+ * @param data
+ */
+ async updateWmsInOutStockRecord(id: string, data: Record<string, any>) {
+ return updateWmsInOutStockRecord(id, data)
+ }
+
+ /**
+ * 鑾峰彇璇︽儏
+ */
+ async getWmsInOutStockRecordDetail(current: any, id?: string) {
+ return getWmsInOutStockRecord(id || current?.id)
+ }
+
+ // 鑾峰彇鏋氫妇鍊�
+ async getWmsEnumData(data: Record<string, any>) {
+ return getWmsEnumData(data)
+ }
+}
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecordQueryDrawer.ts b/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecordQueryDrawer.ts
index 4b82bde..e4c2ef2 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecordQueryDrawer.ts
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Models/WmsInOutStockRecordQueryDrawer.ts
@@ -11,7 +11,7 @@
constructor() {
super({
data: [],
- wmsMaterial: {},
+ wmsInOutStockRecord: {},
})
}
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/Config.ts b/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/Config.ts
index e38457e..5fa7863 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/Config.ts
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/Config.ts
@@ -1,59 +1,67 @@
-export const columns = [
- {
- type: 'seq',
- width: 60,
- title: '搴忓彿',
- },
- {
- field: 'orderNo',
- title: '鍗曟嵁缂栧彿',
- },
- {
- field: 'materialName',
- title: '鐗╂枡鍚嶇О',
- },
- {
- field: 'materialNo',
- title: '鐗╂枡浠跺彿',
- },
- {
- field: 'stockTypeDesc',
- title: '鎿嶄綔绫诲瀷',
- },
- {
- field: 'containerNo',
- title: '瀹瑰櫒缂栧彿',
- },
- {
- field: 'materialModel',
- title: '鏈哄瀷',
- },
- {
- field: 'operateTime',
- title: '鎿嶄綔鏃堕棿',
- },
- {
- field: 'remark',
- title: '澶囨敞',
- },
- {
- field: 'materialId',
- title: '鐗╂枡ID',
- },
- {
- field: 'taskNo',
- title: '浠诲姟鍙�',
- },
- {
- field: 'sourcePlace',
- title: '璧峰搴撲綅',
- },
- {
- field: 'toPlace',
- title: '鐩爣搴撲綅',
- },
- // {
- // field: 'deletionTime',
- // title: '',
- // },
-]
+export const columns = [
+ {
+ type: 'seq',
+ width: 60,
+ title: '搴忓彿',
+ },
+ {
+ field: 'orderNo',
+ title: '鍗曟嵁缂栧彿',
+},
+{
+ field: 'materialName',
+ title: '鐗╂枡鍚嶇О',
+},
+{
+ field: 'materialNo',
+ title: '鐗╂枡浠跺彿',
+},
+{
+ field: 'stockTypeDesc',
+ title: '鎿嶄綔绫诲瀷',
+},
+{
+ field: 'containerNo',
+ title: '瀹瑰櫒缂栧彿',
+},
+{
+ field: 'materialModel',
+ title: '鏈哄瀷',
+},
+{
+ field: 'operateTime',
+ title: '鎿嶄綔鏃堕棿',
+},
+{
+ field: 'remark',
+ title: '澶囨敞',
+},
+{
+ field: 'materialId',
+ title: '鐗╂枡ID',
+},
+{
+ field: 'taskNo',
+ title: '浠诲姟鍙�',
+},
+{
+ field: 'sourcePlace',
+ title: '璧峰搴撲綅',
+},
+{
+ field: 'toPlace',
+ title: '鐩爣搴撲綅',
+},
+{
+ field: 'sort',
+ title: '鎺掑簭',
+},
+{
+ field: 'creationTime',
+ title: '',
+},
+{
+ field: 'deletionTime',
+ title: '',
+},
+]
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.module.scss b/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.module.scss
index a1c8215..64b9980 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.module.scss
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.module.scss
@@ -15,7 +15,7 @@
.header {
margin-bottom: 12px;
display: flex;
- justify-content: flex-start;
+ justify-content: flex-end;
align-items: center;
}
}
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.tsx b/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.tsx
index a5a85b1..0fa6e7b 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.tsx
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.tsx
@@ -71,9 +71,9 @@
})
//瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
const _searchFormInputAttrs = ref([
- 'MaterialNo', 'MaterialName', 'Remark'
+ 'MaterialNo', 'ContainerNo'
]);
- const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ョ墿鏂欑紪鐮�/鐗╂枡鍚嶇О/澶囨敞');
+ const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ョ墿鏂欑紪鐮�/鎵樼洏');
// 鍔ㄦ�佹灇涓鹃�夐」
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/WmsInOutStockRecord.tsx b/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/WmsInOutStockRecord.tsx
index 0ad15f2..39abbb5 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/WmsInOutStockRecord.tsx
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/WmsInOutStockRecord.tsx
@@ -1,80 +1,80 @@
-import {
- Component,
- DefineComponent,
- defineComponent,
- markRaw,
- ref,
- SetupContext,
- onMounted,
-} from 'vue'
-import styles from './WmsInOutStockRecord.module.scss'
-import Tab from '@/components/Tab/Tab'
-import { useProvideModels } from '@/libs/Provider/app'
-import { usePermission } from '@/libs/Permission/Permission'
-import { permissionCodes } from '../enum'
-import { ModuleType, TabItem } from '../type/Type'
-import { getEntityNames } from '@/hooks/hook'
-import TabPane from '@/components/Tab/TabPane'
-
-const Models: ModuleType = import.meta.glob('./config/*.json', {
- eager: true,
-})
-
-const entityNames = getEntityNames(Models)
-
-const nameToLabelMap = [{ name: 'WmsInOutStockRecord', label: '鍑哄叆搴撹褰�' }]
-
-export default defineComponent({
- name: 'WmsInOutStockRecord',
-
- setup(props, ctx: SetupContext) {
- useProvideModels()
- usePermission(props, permissionCodes)
-
- const rf = ref<{
- [key: string]: any
- }>({})
-
- const tabData = ref<TabItem[]>([])
-
- const onTabChange = (v: string) => {
- rf.value?.[v]?.reloadList()
- }
-
- const initTableData = async () => {
- for (const i in entityNames) {
- const name = entityNames[i]
- const module = await import(`./Pages/${name}/${name}.tsx`)
- const WmsInOutStockRecord = markRaw(module.default)
- const foundLabel =
- nameToLabelMap.find((item) => item.name === name)?.label || name
- tabData.value.push({
- label: foundLabel,
- name,
- component: WmsInOutStockRecord,
- })
- }
- }
-
- initTableData()
-
- return () => {
- return (
- <div class={styles.WmsInOutStockRecord}>
- <Tab data={tabData.value} type="list" onTab={onTabChange}>
- {tabData.value.map((widgetInfo) => {
- const Widget: any = widgetInfo.component
- return (
- <TabPane label={widgetInfo.label} name={widgetInfo.name}>
- <Widget
- ref={(r: any) => (rf.value['WmsInOutStockRecord'] = r)}
- ></Widget>
- </TabPane>
- )
- })}
- </Tab>
- </div>
- )
- }
- },
-})
+import {
+ Component,
+ DefineComponent,
+ defineComponent,
+ markRaw,
+ ref,
+ SetupContext,
+ onMounted,
+} from 'vue'
+import styles from './WmsInOutStockRecord.module.scss'
+import Tab from '@/components/Tab/Tab'
+import { useProvideModels } from '@/libs/Provider/app'
+import { usePermission } from '@/libs/Permission/Permission'
+import { permissionCodes } from '../enum'
+import { ModuleType, TabItem } from '../type/Type'
+import { getEntityNames } from '@/hooks/hook'
+import TabPane from '@/components/Tab/TabPane'
+
+const Models: ModuleType = import.meta.glob('./config/*.json', {
+ eager: true,
+})
+
+const entityNames = getEntityNames(Models)
+
+const nameToLabelMap = [{ name: 'WmsInOutStockRecord', label: '鍑哄叆搴撹褰�' }]
+
+export default defineComponent({
+ name: 'WmsInOutStockRecord',
+
+ setup(props, ctx: SetupContext) {
+ useProvideModels()
+ usePermission(props, permissionCodes)
+
+ const rf = ref<{
+ [key: string]: any
+ }>({})
+
+ const tabData = ref<TabItem[]>([])
+
+ const onTabChange = (v: string) => {
+ rf.value?.[v]?.reloadList()
+ }
+
+ const initTableData = async () => {
+ for (const i in entityNames) {
+ const name = entityNames[i]
+ const module = await import(`./Pages/${name}/${name}.tsx`)
+ const WmsInOutStockRecord = markRaw(module.default)
+ const foundLabel =
+ nameToLabelMap.find((item) => item.name === name)?.label || name
+ tabData.value.push({
+ label: foundLabel,
+ name,
+ component: WmsInOutStockRecord,
+ })
+ }
+ }
+
+ initTableData()
+
+ return () => {
+ return (
+ <div class={styles.WmsInOutStockRecord}>
+ <Tab data={tabData.value} type="list" onTab={onTabChange}>
+ {tabData.value.map((widgetInfo) => {
+ const Widget: any = widgetInfo.component
+ return (
+ <TabPane label={widgetInfo.label} name={widgetInfo.name}>
+ <Widget
+ ref={(r: any) => (rf.value['WmsInOutStockRecord'] = r)}
+ ></Widget>
+ </TabPane>
+ )
+ })}
+ </Tab>
+ </div>
+ )
+ }
+ },
+})
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/config/WmsInOutStockRecord.json b/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/config/WmsInOutStockRecord.json
index c86ffbf..c4e9885 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/config/WmsInOutStockRecord.json
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Views/config/WmsInOutStockRecord.json
@@ -1,3 +1,3 @@
-{
- "name": "WmsInOutStockRecord"
-}
+{
+ "name": "WmsInOutStockRecord"
+}
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 4c70305..022db3d 100644
--- a/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts
+++ b/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts
@@ -47,7 +47,6 @@
{
field: 'isRead',
title: 'WCS鍙鍙�',
- formatter: ({ cellValue }) => 12222,
},
{
field: 'sonTaskTypeDesc',
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 dd97f69..25db6be 100644
--- a/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx
+++ b/HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx
@@ -214,6 +214,13 @@
</div>
)
},
+ isRead: ({ row }: any) => {
+ return (
+ <div>
+ {row.isRead != null ? (row.isRead ? '鏄�' : '鍚�') : '-'}
+ </div>
+ )
+ },
name: ({ row }: any) => {
return row?.name ? (
<TdButton
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/EntityModeDrawer\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/EntityModeDrawer\346\250\241\346\235\277.txt"
index 2c4be66..0b25103 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/EntityModeDrawer\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/EntityModeDrawer\346\250\241\346\235\277.txt"
@@ -31,21 +31,24 @@
return props.row || null
})
- const inputNumber = (attrs) => {
+
+ const datePicker = (attrs) => {
return (
- <el-input-number
- min="1"
- step="1"
- precision="0"
+ <el-date-picker
+ type="date"
+ format="YYYY-MM-DD HH:mm:ss"
+ formatValue="YYYY-MM-DD HH:mm:ss"
{...attrs}
- ></el-input-number>
+ ></el-date-picker>
)
}
- const datePicker = (attrs) => {
+
+ const dateTimePicker = (attrs) => {
return (
<el-date-picker
type="datetime"
- format="YYYY-MM-DD"
+ format="YYYY-MM-DD HH:mm:ss"
+ formatValue="YYYY-MM-DD HH:mm:ss"
{...attrs}
></el-date-picker>
)
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 38bacb6..c8726a8 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"
@@ -1845,9 +1845,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";
--
Gitblit v1.9.3