HIAWms/project/Wms.cmsprojBinary files differ
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsEnumDto/WmsEnumInput.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,21 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto { /// <summary> /// æä¸¾è¾å ¥åæ° /// </summary> public class WmsEnumInput { /// <summary> /// æä¸¾ç±»ååç§° /// </summary> /// <example>AccountTypeEnum</example> public string EnumName { get; set; } } } HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/ExportWmsMaterialModel.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,100 @@ using CMS.Plugin.HIAWms.Domain.Shared.Enums; using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials { /// <summary> /// 导åºå®ä½ç±» /// </summary> public class ExportWmsMaterialModel { /// <summary> /// ç©æç¼ç ï¼å¯ä¸æ è¯ï¼ /// </summary> [Description("ç©æç¼ç ï¼å¯ä¸æ è¯ï¼")] public string MaterialCode { get; set; } /// <summary> /// ç©æåç§° /// </summary> [Description("ç©æåç§°")] public string MaterialName { get; set; } /// <summary> /// éè´ç±»åï¼æä¸¾å¼ï¼ /// </summary> [Description("éè´ç±»åï¼æä¸¾å¼ï¼")] public string PurchaseType { get; set; } /// <summary> /// ç©æç±»åï¼æä¸¾å¼ï¼ /// </summary> [Description("ç©æç±»åï¼æä¸¾å¼ï¼")] public string MaterialType { get; set; } /// <summary> /// 主åä½ï¼å¦ï¼kgãmãä¸ªï¼ /// </summary> [Description("主åä½ï¼å¦ï¼kgãmã个ï¼")] public string PrimaryUnit { get; set; } /// <summary> /// è§æ ¼/æ åï¼å¦ï¼GB/T 8163-2018ï¼ /// </summary> [Description("è§æ ¼/æ åï¼å¦ï¼GB/T 8163-2018ï¼")] public string Standard { get; set; } /// <summary> /// å¤å¾ï¼åä½ï¼mmï¼ /// </summary> [Description("å¤å¾ï¼åä½ï¼mmï¼")] public decimal OuterDiameter { get; set; } /// <summary> /// å£åï¼åä½ï¼mmï¼ /// </summary> [Description("å£åï¼åä½ï¼mmï¼")] public decimal WallThickness { get; set; } /// <summary> /// æè´¨ï¼å¦ï¼304ä¸éé¢ï¼ /// </summary> [Description("æè´¨ï¼å¦ï¼304ä¸éé¢ï¼")] public string MaterialQuality { get; set; } /// <summary> /// é¿åº¦ï¼åä½ï¼mï¼ /// </summary> [Description("é¿åº¦ï¼åä½ï¼mï¼")] public decimal Length { get; set; } /// <summary> /// æ¯å¦ä¸ºä¸»æ¯ç®¡ï¼true: 主æ¯ç®¡, false: é主æ¯ç®¡ï¼ /// </summary> [Description("æ¯å¦ä¸ºä¸»æ¯ç®¡ï¼true: 主æ¯ç®¡, false: é主æ¯ç®¡ï¼")] public string IsMainBranch { get; set; } /// <summary> /// ç产工å /// </summary> [Description("ç产工å")] public string Factory { get; set; } /// <summary> /// è¯ä¹¦ç¼å·ï¼å¦ï¼åå容å¨è®¤è¯ï¼ /// </summary> [Description("è¯ä¹¦ç¼å·ï¼å¦ï¼åå容å¨è®¤è¯ï¼")] public string Certification { get; set; } /// <summary> /// 夿³¨ /// </summary> [Description("夿³¨")] public virtual string Remark { get; set; } } } HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialCreateOrUpdateDtoBase.cs
@@ -61,7 +61,7 @@ /// <summary> /// æ¯å¦ä¸ºä¸»æ¯ç®¡ï¼true: 主æ¯ç®¡, false: é主æ¯ç®¡ï¼ /// </summary> public bool IsMainBranch { get; set; } public YesNoEnum IsMainBranch { get; set; } /// <summary> /// ç产工å HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialDto.cs
@@ -25,9 +25,31 @@ public PurchaseTypeEnum PurchaseType { get; set; } /// <summary> /// éè´ç±»åï¼æä¸¾å¼ï¼ /// </summary> public string PurchaseTypeDesc { get { return GetEnumDescriptionUtil.GetEnumDescription(PurchaseType); } } /// <summary> /// ç©æç±»åï¼æä¸¾å¼ï¼ /// </summary> public MaterialTypeEnum MaterialType { get; set; } /// <summary> /// ç©æç±»åï¼æä¸¾å¼ï¼ /// </summary> public string MaterialTypeDesc { get { return GetEnumDescriptionUtil.GetEnumDescription(MaterialType); } } /// <summary> /// 主åä½ï¼å¦ï¼kgãmãä¸ªï¼ @@ -60,9 +82,20 @@ public decimal Length { get; set; } /// <summary> /// æ¯å¦ä¸ºä¸»æ¯ç®¡ï¼true: 主æ¯ç®¡, false: é主æ¯ç®¡ï¼ /// æ¯å¦ä¸ºä¸»æ¯ç®¡ï¼1: 主æ¯ç®¡, 2: é主æ¯ç®¡ï¼ /// </summary> public bool IsMainBranch { get; set; } public YesNoEnum IsMainBranch { get; set; } /// <summary> /// æ¯å¦ä¸ºä¸»æ¯ç®¡ /// </summary> public string IsMainBranchDesc { get { return GetEnumDescriptionUtil.GetEnumDescription(IsMainBranch); } } /// <summary> /// ç产工å HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialsExportModel.cs
@@ -93,7 +93,7 @@ /// <example>true</example> [ExcelColumn(Name = "æ¯å¦ä¸»æ¯ç®¡", Width = 25)] [Description("æ¯/å¦")] public bool IsMainBranch { get; set; } public YesNoEnum IsMainBranch { get; set; } /// <summary> /// ç产工ååç§° @@ -136,8 +136,22 @@ [ExcelColumn(Name = "æ©å±å段3", Width = 25)] public string RedundantField3 { get; set; } /// <summary> /// 夿³¨ /// </summary> [ExcelColumn(Name = "夿³¨",Width = 25)] public string Remark { get; set; } 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; } } } HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,22 @@ using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto; using CMS.Plugin.HIAWms.Domain.Shared.Util; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace CMS.Plugin.HIAWms.Application.Contracts.Services { /// <summary> /// æä¸¾æ¥å£ /// </summary> public interface IWmsEnumAppService { /// <summary> /// è·åæä¸¾. /// </summary> /// <returns></returns> List<EnumItem> GetEnumDataList(WmsEnumInput enumInput); } } HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,22 @@ using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto; using CMS.Plugin.HIAWms.Application.Contracts.Services; using CMS.Plugin.HIAWms.Domain.Shared.Util; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace CMS.Plugin.HIAWms.Application.Implements { /// <summary> /// æä¸¾ç±»åæ¥å£å®ç° /// </summary> public class WmsEnumAppService : CMSPluginAppService, IWmsEnumAppService { public List<EnumItem> GetEnumDataList(WmsEnumInput enumInput) { return EnumHelper.GetEnumItems(enumInput.EnumName); } } } HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
@@ -1,8 +1,9 @@ using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials; using CMS.Plugin.HIAWms.Application.Contracts.Services; using CMS.Plugin.HIAWms.Domain.WmsMaterials; using CMS.Plugin.HIAWms.Domain.Shared; using CMS.Plugin.HIAWms.Domain.Shared.Util; using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterials; using CMS.Plugin.HIAWms.Domain.WmsMaterials; using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Data; @@ -322,10 +323,10 @@ var sheets = new Dictionary<string, object> { ["é ç½®"] = result.Select(x => x.GetExportData()).ToList(), ["é ç½®"] = ExportHelper.ConvertListToExportData(result), }; var fileName = result.Count > 1 ? "WmsMaterialå表" : result.Count == 1 ? result.First()?.MaterialCode : "WmsMaterial模ç"; var fileName = result.Count > 1 ? "WmsMaterialå表" : result.Count == 1 ? result[0]?.MaterialCode : "WmsMaterial模ç"; return (sheets, fileName); } HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs
@@ -20,5 +20,6 @@ * Alternatively, you can split your mapping configurations * into multiple profile classes for a better organization. */ CreateMap<WmsArea, WmsAreaDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); CreateMap<WmsAreaCreateDto, WmsArea>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); } } HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsContainerAutoMapperProfile.cs
@@ -20,5 +20,6 @@ * Alternatively, you can split your mapping configurations * into multiple profile classes for a better organization. */ CreateMap<WmsContainer, WmsContainerDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); CreateMap<WmsContainerCreateDto, WmsContainer>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); } } HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialAutoMapperProfile.cs
@@ -20,5 +20,6 @@ * Alternatively, you can split your mapping configurations * into multiple profile classes for a better organization. */ CreateMap<WmsMaterial, WmsMaterialDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); CreateMap<WmsMaterialCreateDto, WmsMaterial>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); } } HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsPlaceAutoMapperProfile.cs
@@ -20,5 +20,6 @@ * Alternatively, you can split your mapping configurations * into multiple profile classes for a better organization. */ CreateMap<WmsPlace, WmsPlaceDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); CreateMap<WmsPlaceCreateDto, WmsPlace>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); } } HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs
@@ -20,5 +20,6 @@ * Alternatively, you can split your mapping configurations * into multiple profile classes for a better organization. */ CreateMap<WmsStore, WmsStoreDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); CreateMap<WmsStoreCreateDto, WmsStore>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); } } HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PurchaseTypeEnum.cs
@@ -16,19 +16,19 @@ /// <summary> /// /èªå¶ /// </summary> [Description("Self-made - èªå¶")] [Description("èªå¶")] SelfMade, /// <summary> /// éè´ /// </summary> [Description("Purchased - éè´")] [Description("éè´")] Purchased, /// <summary> /// åå¯ /// </summary> [Description("Both - åå¯")] [Description("åå¯")] Both } } HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Util/EnumHelper.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,84 @@ using KissUtil.Helpers; using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; using Volo.Abp; namespace CMS.Plugin.HIAWms.Domain.Shared.Util { /// <summary> /// æä¸¾å¸®å©ç±». /// </summary> public static class EnumHelper { /// <summary> /// è·åæä¸¾. /// </summary> /// <param name="enumName"> </param> /// <returns></returns> /// <exception cref="ArgumentException"></exception> public static List<EnumItem> GetEnumItems(string enumName) { // è·åå½åç¨åºéä¸çææç±»å var enumType = AppDomain.CurrentDomain.GetAssemblies() .SelectMany(a => a.GetTypes()) .FirstOrDefault(t => t.Name == enumName && t.IsEnum); if (enumType == null) { throw new UserFriendlyException($"æä¸¾ç±»å {enumName} ä¸åå¨"); } return GetEnumItems(enumType); } /// <summary> /// è·åæä¸¾ç±»å. /// </summary> /// <param name="enumType"></param> /// <returns></returns> /// <exception cref="ArgumentException"></exception> public static List<EnumItem> GetEnumItems(Type enumType) { if (!enumType.IsEnum) { throw new UserFriendlyException("æä¾çç±»å䏿¯æä¸¾ç±»å"); } var result = new List<EnumItem>(); var values = Enum.GetValues(enumType); foreach (var value in values) { var fieldInfo = enumType.GetField(value.ToString()); var description = fieldInfo? .GetCustomAttributes(typeof(DescriptionAttribute), false) .FirstOrDefault() as DescriptionAttribute; result.Add(new EnumItem { Value = (int)value, Name = value.ToString(), Description = description?.Description ?? value.ToString(), }); } return result; } } /// <summary> /// æä¸¾æè¿°. /// </summary> public class EnumItem { public int Value { get; set; } public string Name { get; set; } public string Description { get; set; } } } HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Util/ExportHelper.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,59 @@ using System; using System.Collections.Generic; using System.Collections.Generic; using System.ComponentModel; using System.Reflection; using System.Threading.Tasks; namespace CMS.Plugin.HIAWms.Domain.Shared.Util { /// <summary> /// 导åºå¸®å©ç±». /// </summary> public static class ExportHelper { // éç¨è½¬æ¢æ¹æ³ï¼å ¼å®¹ Func<T, Dictionary<string, object>>ï¼ public static Dictionary<string, object> ConvertToExportData<T>(T entity) { var dict = new Dictionary<string, object>(); if (entity == null) return dict; foreach (var prop in typeof(T).GetProperties()) { var value = prop.GetValue(entity); dict[prop.Name] = FormatValue(value); } return dict; } // æ¹éè½¬æ¢æ¹æ³ public static List<Dictionary<string, object>> ConvertListToExportData<T>(IEnumerable<T> list) { return list.Select(ConvertToExportData).ToList(); } private static object FormatValue(object value) { if (value == null) return string.Empty; // å¤çæä¸¾ if (value is Enum enumValue) return GetEnumDescriptionUtil.GetEnumDescription(enumValue); // å¤çå¸å° if (value is bool boolValue) return boolValue ? "æ¯" : "å¦"; return value; } private static string GetEnumDescription(Enum value) { var fieldInfo = value.GetType().GetField(value.ToString()); var description = fieldInfo? .GetCustomAttributes(typeof(DescriptionAttribute), false) .FirstOrDefault() as DescriptionAttribute; return description?.Description ?? value.ToString(); } } } HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Util/GetEnumDescriptionUtil.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,30 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; namespace CMS.Plugin.HIAWms { public class GetEnumDescriptionUtil { /// <summary> /// è·åæä¸¾çæè¿° /// </summary> /// <param name="enumValue"></param> /// <returns></returns> public static string GetEnumDescription(Enum enumValue) { string value = enumValue.ToString(); if (string.IsNullOrWhiteSpace(value) || value == "0") return ""; FieldInfo field = enumValue.GetType().GetField(value); object[] objs = field.GetCustomAttributes(typeof(DescriptionAttribute), false); //è·åæè¿°å±æ§ if (objs == null || objs.Length == 0) //å½æè¿°å±æ§æ²¡ææ¶ï¼ç´æ¥è¿ååç§° return value; DescriptionAttribute descriptionAttribute = (DescriptionAttribute)objs[0]; return descriptionAttribute.Description; } } } HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterial.cs
@@ -64,7 +64,7 @@ /// <summary> /// æ¯å¦ä¸ºä¸»æ¯ç®¡ï¼true: 主æ¯ç®¡, false: é主æ¯ç®¡ï¼ /// </summary> public bool IsMainBranch { get; set; } public YesNoEnum IsMainBranch { get; set; } /// <summary> /// ç产工å HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs
@@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore; using Volo.Abp; using Volo.Abp.EntityFrameworkCore.Modeling; using CMS.Plugin.HIAWms.Domain.Shared.Enums; namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions; @@ -90,7 +91,7 @@ .HasComment("é¿åº¦ï¼åä½ï¼mï¼"); b.Property(x => x.IsMainBranch) .HasDefaultValue(false) .HasDefaultValue(YesNoEnum.N) .HasComment("æ¯å¦ä¸ºä¸»æ¯ç®¡"); b.Property(x => x.Factory) HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250430035549_InitialCreate1.Designer.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,675 @@ // <auto-generated /> using System; using CMS.Plugin.HIAWms.MySQL; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Volo.Abp.EntityFrameworkCore; #nullable disable namespace CMS.Plugin.HIAWms.MySQL.Migrations { [DbContext(typeof(CMSPluginDbContext))] [Migration("20250430035549_InitialCreate1")] partial class InitialCreate1 { protected override void BuildTargetModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql) .HasAnnotation("ProductVersion", "6.0.16") .HasAnnotation("Relational:MaxIdentifierLength", 64); modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsAreas.WmsArea", b => { b.Property<Guid>("Id") .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property<string>("AreaDesc") .HasMaxLength(200) .HasColumnType("varchar(200)") .HasComment("æè¿°"); b.Property<string>("AreaName") .IsRequired() .HasMaxLength(100) .HasColumnType("varchar(100)") .HasComment("åºåºåç§°"); b.Property<string>("AreaNo") .IsRequired() .HasMaxLength(64) .HasColumnType("varchar(64)") .HasComment("åºåºç¼å·"); b.Property<int>("AreaStatus") .HasColumnType("int") .HasComment("åºåºç¶æ"); b.Property<int>("AreaType") .HasColumnType("int") .HasComment("åºåºç±»å"); b.Property<string>("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) .HasColumnType("varchar(40)") .HasColumnName("ConcurrencyStamp"); b.Property<DateTime>("CreationTime") .HasColumnType("datetime(6)") .HasColumnName("CreationTime"); b.Property<Guid?>("CreatorId") .HasColumnType("char(36)") .HasColumnName("CreatorId"); b.Property<Guid?>("DeleterId") .HasColumnType("char(36)") .HasColumnName("DeleterId"); b.Property<DateTime?>("DeletionTime") .HasColumnType("datetime(6)") .HasColumnName("DeletionTime"); b.Property<string>("ExtraProperties") .HasColumnType("longtext") .HasColumnName("ExtraProperties"); b.Property<bool>("IsDeleted") .ValueGeneratedOnAdd() .HasColumnType("tinyint(1)") .HasDefaultValue(false) .HasColumnName("IsDeleted"); b.Property<bool?>("IsDisabled") .HasColumnType("tinyint(1)") .HasComment("æ¯å¦ç¦ç¨"); b.Property<DateTime?>("LastModificationTime") .HasColumnType("datetime(6)") .HasColumnName("LastModificationTime"); b.Property<Guid?>("LastModifierId") .HasColumnType("char(36)") .HasColumnName("LastModifierId"); b.Property<string>("RedundantField1") .HasMaxLength(100) .HasColumnType("varchar(100)") .HasComment("åä½å段1 - é¢çæ©å±ç¨é"); b.Property<string>("RedundantField2") .HasMaxLength(100) .HasColumnType("varchar(100)") .HasComment("åä½å段2 - é¢çæ©å±ç¨é"); b.Property<string>("RedundantField3") .HasMaxLength(100) .HasColumnType("varchar(100)") .HasComment("åä½å段3 - é¢çæ©å±ç¨é"); b.Property<string>("Remark") .HasMaxLength(256) .HasColumnType("varchar(256)") .HasComment("夿³¨"); b.Property<int>("Sort") .HasColumnType("int") .HasComment("æåº"); b.Property<string>("StoreCode") .HasMaxLength(50) .HasColumnType("varchar(50)") .HasComment("ä»åºä»£ç "); b.Property<string>("StoreName") .HasMaxLength(100) .HasColumnType("varchar(100)") .HasComment("ä»åºåç§°"); b.HasKey("Id"); b.HasIndex("AreaName"); b.ToTable("scms_wmsareas", (string)null); b.HasComment("åºåºè¡¨"); }); modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsContainers.WmsContainer", b => { b.Property<Guid>("Id") .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property<string>("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) .HasColumnType("varchar(40)") .HasColumnName("ConcurrencyStamp"); b.Property<string>("ContainerNo") .IsRequired() .HasMaxLength(50) .HasColumnType("varchar(50)") .HasComment("æçç¼å·"); b.Property<int>("ContainerStatus") .HasColumnType("int") .HasComment("æçç¶æ"); b.Property<int>("ContainerType") .HasColumnType("int") .HasComment("æçç±»å"); b.Property<DateTime>("CreationTime") .HasColumnType("datetime(6)") .HasColumnName("CreationTime"); b.Property<Guid?>("CreatorId") .HasColumnType("char(36)") .HasColumnName("CreatorId"); b.Property<Guid?>("DeleterId") .HasColumnType("char(36)") .HasColumnName("DeleterId"); b.Property<DateTime?>("DeletionTime") .HasColumnType("datetime(6)") .HasColumnName("DeletionTime"); b.Property<int?>("ExceptionNumber") .HasColumnType("int") .HasComment("å¼å¸¸æ°é"); b.Property<string>("ExtraProperties") .HasColumnType("longtext") .HasColumnName("ExtraProperties"); b.Property<bool>("IsDeleted") .ValueGeneratedOnAdd() .HasColumnType("tinyint(1)") .HasDefaultValue(false) .HasColumnName("IsDeleted"); b.Property<bool?>("IsDisabled") .HasColumnType("tinyint(1)") .HasComment("æ¯å¦ç¦ç¨"); b.Property<DateTime?>("LastModificationTime") .HasColumnType("datetime(6)") .HasColumnName("LastModificationTime"); b.Property<Guid?>("LastModifierId") .HasColumnType("char(36)") .HasColumnName("LastModifierId"); b.Property<decimal?>("LimitHeight") .HasPrecision(18, 2) .HasColumnType("decimal(18,2)") .HasComment("éé«"); b.Property<decimal?>("LimitLength") .HasPrecision(18, 2) .HasColumnType("decimal(18,2)") .HasComment("éé¿"); b.Property<decimal?>("LimitWidth") .HasPrecision(18, 2) .HasColumnType("decimal(18,2)") .HasComment("é宽"); b.Property<int?>("MaterialNumber") .HasColumnType("int") .HasComment("ç©ææ°é"); b.Property<decimal?>("MaxWeight") .HasPrecision(18, 2) .HasColumnType("decimal(18,2)") .HasComment("è½½éä¸é"); b.Property<string>("RedundantField1") .HasMaxLength(200) .HasColumnType("varchar(200)") .HasComment("åä½å段1 - é¢çæ©å±ç¨é"); b.Property<string>("RedundantField2") .HasMaxLength(200) .HasColumnType("varchar(200)") .HasComment("åä½å段2 - é¢çæ©å±ç¨é"); b.Property<string>("RedundantField3") .HasMaxLength(200) .HasColumnType("varchar(200)") .HasComment("åä½å段3 - é¢çæ©å±ç¨é"); b.Property<string>("Remark") .HasMaxLength(256) .HasColumnType("varchar(256)") .HasComment("夿³¨"); b.Property<int>("Sort") .HasColumnType("int") .HasComment("æåº"); b.Property<decimal?>("SpecHeight") .HasPrecision(18, 2) .HasColumnType("decimal(18,2)") .HasComment("é«åº¦"); b.Property<decimal?>("SpecLength") .HasPrecision(18, 2) .HasColumnType("decimal(18,2)") .HasComment("é¿åº¦"); b.Property<decimal?>("SpecWidth") .HasPrecision(18, 2) .HasColumnType("decimal(18,2)") .HasComment("宽度"); b.HasKey("Id"); b.HasIndex("ContainerNo") .IsUnique(); b.HasIndex("ContainerStatus"); b.HasIndex("ContainerType"); b.ToTable("scms_wmscontainers", (string)null); b.HasComment("æçä¿¡æ¯è¡¨"); }); modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterials.WmsMaterial", b => { b.Property<Guid>("Id") .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property<string>("Certification") .HasMaxLength(128) .HasColumnType("varchar(128)") .HasComment("è¯ä¹¦ç¼å·"); b.Property<string>("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) .HasColumnType("varchar(40)") .HasColumnName("ConcurrencyStamp"); b.Property<DateTime>("CreationTime") .HasColumnType("datetime(6)") .HasColumnName("CreationTime"); b.Property<Guid?>("CreatorId") .HasColumnType("char(36)") .HasColumnName("CreatorId"); b.Property<Guid?>("DeleterId") .HasColumnType("char(36)") .HasColumnName("DeleterId"); b.Property<DateTime?>("DeletionTime") .HasColumnType("datetime(6)") .HasColumnName("DeletionTime"); b.Property<string>("ExtraProperties") .HasColumnType("longtext") .HasColumnName("ExtraProperties"); b.Property<string>("Factory") .HasMaxLength(64) .HasColumnType("varchar(64)") .HasComment("ç产工å"); b.Property<bool>("IsDeleted") .ValueGeneratedOnAdd() .HasColumnType("tinyint(1)") .HasDefaultValue(false) .HasColumnName("IsDeleted"); b.Property<bool?>("IsDisabled") .ValueGeneratedOnAdd() .HasColumnType("tinyint(1)") .HasDefaultValue(false) .HasComment("æ¯å¦ç¦ç¨"); b.Property<int>("IsMainBranch") .ValueGeneratedOnAdd() .HasColumnType("int") .HasDefaultValue(2) .HasComment("æ¯å¦ä¸ºä¸»æ¯ç®¡"); b.Property<DateTime?>("LastModificationTime") .HasColumnType("datetime(6)") .HasColumnName("LastModificationTime"); b.Property<Guid?>("LastModifierId") .HasColumnType("char(36)") .HasColumnName("LastModifierId"); b.Property<decimal>("Length") .HasColumnType("decimal(18,2)") .HasComment("é¿åº¦ï¼åä½ï¼mï¼"); b.Property<string>("MaterialCode") .IsRequired() .HasMaxLength(64) .HasColumnType("varchar(64)") .HasComment("ç©æç¼ç ï¼å¯ä¸æ è¯ï¼"); b.Property<string>("MaterialName") .IsRequired() .HasMaxLength(128) .HasColumnType("varchar(128)") .HasComment("ç©æåç§°"); b.Property<string>("MaterialQuality") .HasMaxLength(64) .HasColumnType("varchar(64)") .HasComment("æè´¨ï¼å¦ï¼304ä¸éé¢ï¼"); b.Property<int>("MaterialType") .HasColumnType("int") .HasComment("ç©æç±»åï¼æä¸¾å¼ï¼"); b.Property<decimal>("OuterDiameter") .HasColumnType("decimal(18,2)") .HasComment("å¤å¾ï¼åä½ï¼mmï¼"); b.Property<string>("PrimaryUnit") .HasMaxLength(20) .HasColumnType("varchar(20)") .HasComment("主åä½ï¼å¦ï¼kgãmã个ï¼"); b.Property<int>("PurchaseType") .HasColumnType("int") .HasComment("éè´ç±»åï¼æä¸¾å¼ï¼"); b.Property<string>("RedundantField1") .HasMaxLength(256) .HasColumnType("varchar(256)") .HasComment("åä½å段1 - é¢çæ©å±ç¨é"); b.Property<string>("RedundantField2") .HasMaxLength(256) .HasColumnType("varchar(256)") .HasComment("åä½å段2 - é¢çæ©å±ç¨é"); b.Property<string>("RedundantField3") .HasMaxLength(256) .HasColumnType("varchar(256)") .HasComment("åä½å段3 - é¢çæ©å±ç¨é"); b.Property<string>("Remark") .HasMaxLength(500) .HasColumnType("varchar(500)") .HasComment("夿³¨"); b.Property<int>("Sort") .ValueGeneratedOnAdd() .HasColumnType("int") .HasDefaultValue(0) .HasComment("æåº"); b.Property<string>("Standard") .HasMaxLength(128) .HasColumnType("varchar(128)") .HasComment("è§æ ¼/æ åï¼å¦ï¼GB/T 8163-2018ï¼"); b.Property<decimal>("WallThickness") .HasColumnType("decimal(18,2)") .HasComment("å£åï¼åä½ï¼mmï¼"); b.HasKey("Id"); b.HasIndex("MaterialCode") .IsUnique(); b.HasIndex("MaterialName"); b.HasIndex("MaterialType"); b.HasIndex("PurchaseType"); b.ToTable("scms_wmsmaterials", (string)null); b.HasComment("ç©æåºç¡ä¿¡æ¯è¡¨"); }); modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsPlaces.WmsPlace", b => { b.Property<Guid>("Id") .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property<int>("Aisle") .HasColumnType("int") .HasComment("å··é"); b.Property<string>("AreaCode") .IsRequired() .HasMaxLength(50) .HasColumnType("varchar(50)") .HasComment("æå¨åºåº"); b.Property<int>("ColumnNo") .HasColumnType("int") .HasComment("å"); b.Property<string>("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) .HasColumnType("varchar(40)") .HasColumnName("ConcurrencyStamp"); b.Property<DateTime>("CreationTime") .HasColumnType("datetime(6)") .HasColumnName("CreationTime"); b.Property<Guid?>("CreatorId") .HasColumnType("char(36)") .HasColumnName("CreatorId"); b.Property<Guid?>("DeleterId") .HasColumnType("char(36)") .HasColumnName("DeleterId"); b.Property<DateTime?>("DeletionTime") .HasColumnType("datetime(6)") .HasColumnName("DeletionTime"); b.Property<int>("EmptyContainer") .HasColumnType("int") .HasComment("æ¯å¦ç©ºæ"); b.Property<string>("ExtraProperties") .HasColumnType("longtext") .HasColumnName("ExtraProperties"); b.Property<bool>("IsDeleted") .ValueGeneratedOnAdd() .HasColumnType("tinyint(1)") .HasDefaultValue(false) .HasColumnName("IsDeleted"); b.Property<bool?>("IsDisabled") .HasColumnType("tinyint(1)") .HasComment("æ¯å¦ç¦ç¨"); b.Property<int>("Islock") .HasColumnType("int") .HasComment("æ¯å¦éå®"); b.Property<DateTime?>("LastModificationTime") .HasColumnType("datetime(6)") .HasColumnName("LastModificationTime"); b.Property<Guid?>("LastModifierId") .HasColumnType("char(36)") .HasColumnName("LastModifierId"); b.Property<int>("LayerNo") .HasColumnType("int") .HasComment("å±"); b.Property<string>("PlaceNo") .IsRequired() .HasMaxLength(50) .HasColumnType("varchar(50)") .HasComment("ç¼å·"); b.Property<int>("PlaceStatus") .HasColumnType("int") .HasComment("è´§ä½ç¶æ"); b.Property<string>("RedundantField1") .HasMaxLength(100) .HasColumnType("varchar(100)") .HasComment("åä½å段1 - é¢çæ©å±ç¨é"); b.Property<string>("RedundantField2") .HasMaxLength(100) .HasColumnType("varchar(100)") .HasComment("åä½å段2 - é¢çæ©å±ç¨é"); b.Property<string>("RedundantField3") .HasMaxLength(100) .HasColumnType("varchar(100)") .HasComment("åä½å段3 - é¢çæ©å±ç¨é"); b.Property<string>("Remark") .HasMaxLength(256) .HasColumnType("varchar(256)") .HasComment("夿³¨"); b.Property<int>("RowNo") .HasColumnType("int") .HasComment("æ"); b.Property<int>("Sort") .HasColumnType("int") .HasComment("æåº"); b.Property<int>("StorageTypeNo") .HasColumnType("int") .HasComment("è´§ä½ç±»å"); b.HasKey("Id"); b.HasIndex("AreaCode"); b.HasIndex("PlaceNo") .IsUnique(); b.HasIndex("PlaceStatus"); b.HasIndex("StorageTypeNo"); b.ToTable("scms_wmsplaces", (string)null); b.HasComment("åºä½è¡¨"); }); modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsStores.WmsStore", b => { b.Property<Guid>("Id") .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property<string>("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) .HasColumnType("varchar(40)") .HasColumnName("ConcurrencyStamp"); b.Property<DateTime>("CreationTime") .HasColumnType("datetime(6)") .HasColumnName("CreationTime"); b.Property<Guid?>("CreatorId") .HasColumnType("char(36)") .HasColumnName("CreatorId"); b.Property<Guid?>("DeleterId") .HasColumnType("char(36)") .HasColumnName("DeleterId"); b.Property<DateTime?>("DeletionTime") .HasColumnType("datetime(6)") .HasColumnName("DeletionTime"); b.Property<string>("ExtraProperties") .HasColumnType("longtext") .HasColumnName("ExtraProperties"); b.Property<bool>("IsDeleted") .ValueGeneratedOnAdd() .HasColumnType("tinyint(1)") .HasDefaultValue(false) .HasColumnName("IsDeleted"); b.Property<bool?>("IsDisabled") .HasColumnType("tinyint(1)") .HasComment("æ¯å¦ç¦ç¨"); b.Property<DateTime?>("LastModificationTime") .HasColumnType("datetime(6)") .HasColumnName("LastModificationTime"); b.Property<Guid?>("LastModifierId") .HasColumnType("char(36)") .HasColumnName("LastModifierId"); b.Property<string>("RedundantField1") .HasMaxLength(100) .HasColumnType("varchar(100)") .HasComment("åä½å段1 - é¢çæ©å±ç¨é"); b.Property<string>("RedundantField2") .HasMaxLength(100) .HasColumnType("varchar(100)") .HasComment("åä½å段2 - é¢çæ©å±ç¨é"); b.Property<string>("RedundantField3") .HasMaxLength(100) .HasColumnType("varchar(100)") .HasComment("åä½å段3 - é¢çæ©å±ç¨é"); b.Property<string>("Remark") .HasMaxLength(256) .HasColumnType("varchar(256)") .HasComment("夿³¨"); b.Property<int>("Sort") .HasColumnType("int") .HasComment("æåº"); b.Property<string>("StoreCode") .HasMaxLength(50) .HasColumnType("varchar(50)") .HasComment("ä»åºä»£ç "); b.Property<string>("StoreName") .HasMaxLength(100) .HasColumnType("varchar(100)") .HasComment("ä»åºåç§°"); b.HasKey("Id"); b.HasIndex("StoreName"); b.ToTable("scms_wmsstores", (string)null); b.HasComment("ä»åºä¿¡æ¯è¡¨"); }); #pragma warning restore 612, 618 } } } HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250430035549_InitialCreate1.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,39 @@ using Microsoft.EntityFrameworkCore.Migrations; #nullable disable namespace CMS.Plugin.HIAWms.MySQL.Migrations { public partial class InitialCreate1 : Migration { protected override void Up(MigrationBuilder migrationBuilder) { migrationBuilder.AlterColumn<int>( name: "IsMainBranch", table: "scms_wmsmaterials", type: "int", nullable: false, defaultValue: 2, comment: "æ¯å¦ä¸ºä¸»æ¯ç®¡", oldClrType: typeof(bool), oldType: "tinyint(1)", oldDefaultValue: false, oldComment: "æ¯å¦ä¸ºä¸»æ¯ç®¡"); } protected override void Down(MigrationBuilder migrationBuilder) { migrationBuilder.AlterColumn<bool>( name: "IsMainBranch", table: "scms_wmsmaterials", type: "tinyint(1)", nullable: false, defaultValue: false, comment: "æ¯å¦ä¸ºä¸»æ¯ç®¡", oldClrType: typeof(int), oldType: "int", oldDefaultValue: 2, oldComment: "æ¯å¦ä¸ºä¸»æ¯ç®¡"); } } } HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
@@ -338,10 +338,10 @@ .HasDefaultValue(false) .HasComment("æ¯å¦ç¦ç¨"); b.Property<bool>("IsMainBranch") b.Property<int>("IsMainBranch") .ValueGeneratedOnAdd() .HasColumnType("tinyint(1)") .HasDefaultValue(false) .HasColumnType("int") .HasDefaultValue(2) .HasComment("æ¯å¦ä¸ºä¸»æ¯ç®¡"); b.Property<DateTime?>("LastModificationTime") HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat
@@ -1,5 +1,5 @@ cd ../ dotnet ef migrations add InitialCreate -c CMSPluginDbContext -o Migrations dotnet ef migrations add InitialCreate1 -c CMSPluginDbContext -o Migrations ::dotnet ef migrations add Update1 -c CMSPluginDbContext -o Migrations ::dotnet ef migrations add Update2 -c CMSPluginDbContext -o Migrations ::dotnet ef migrations add Update3 -c CMSPluginDbContext -o Migrations HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,45 @@ using CMS.Extensions.Abp.AspNetCore.Mvc.Filters; using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto; using CMS.Plugin.HIAWms.Application.Contracts.Services; using CMS.Plugin.HIAWms.Domain.Shared.Util; using Microsoft.AspNetCore.Mvc; using System; using System.Web; namespace CMS.Plugin.HIAWms.Controller { /// <summary> /// æä¸¾æå¡æ¥å£. /// </summary> [ApiController] [TypeFilter(typeof(CMSLanguageFilter))] [TypeFilter(typeof(CMSUowActionFilter))] [TypeFilter(typeof(CMSAuditActionFilter))] [TypeFilter(typeof(CMSExceptionFilter))] [Route("api/v{version:apiVersion}/HIAWms/[controller]")] public class WmsEnumController : ControllerBase { private readonly IWmsEnumAppService _wmsEnumAppService; /// <summary> /// Initializes a new instance of the <see cref="WmsEnumController"/> class. /// æé 彿°. /// </summary> /// <param name="wmsEnumAppService"></param> public WmsEnumController(IWmsEnumAppService wmsEnumAppService) { _wmsEnumAppService = wmsEnumAppService; } /// <summary> /// è·åæä¸¾æ°æ®. /// </summary> /// <param name="input"></param> /// <returns></returns> [HttpPost] public List<EnumItem> GetEnumDataList(WmsEnumInput input) { return _wmsEnumAppService.GetEnumDataList(input); } } } HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/Sampleµ¼³öÄ£°å.xlsxBinary files differ
HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsAreaµ¼³öÄ£°å.xlsxBinary files differ
HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsContainerµ¼³öÄ£°å.xlsxBinary files differ
HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterialµ¼³öÄ£°å.xlsxBinary files differ
HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsPlaceµ¼³öÄ£°å.xlsxBinary files differ
HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsStoreµ¼³öÄ£°å.xlsxBinary files differ
HIAWms/web/src/config/menu.ts
@@ -21,7 +21,7 @@ "notPage": false }, { "name": "ç©æåºç¡", "name": "Wmsç©æåºç¡", "path": "/information-base/HIAWms", "patchName": "HIAWms", "icon": "p", @@ -51,7 +51,7 @@ "notPage": false }, "HIAWms": { "name": "ç©æåºç¡", "name": "Wmsç©æåºç¡", "path": "/information-base/HIAWms", "patchName": "HIAWms", "icon": "p", HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx
ÎļþÃû´Ó HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.ts ÐÞ¸Ä @@ -1,4 +1,13 @@ import { ref, onMounted, reactive, computed, Ref, watch } from 'vue' import { ref, onMounted, reactive, computed, Ref, watch, SetupContext, h, } from 'vue' import { injectModel } from '@/libs/Provider/Provider' import { WmsMaterialDrawer } from '../Models/WmsMaterialDrawer' import { ElMessage } from 'element-plus' @@ -16,9 +25,23 @@ // 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 @@ -35,6 +58,7 @@ label: 'ç©æç¼ç ', prop: 'materialCode', el: 'input', disabled: disabled, placeholder: '请è¾å ¥ç©æç¼ç ', rules: [{ required: true, message: 'ç©æç¼ç ä¸è½ä¸ºç©º', trigger: 'blur' }], }, @@ -50,11 +74,7 @@ prop: 'purchaseType', el: 'select', placeholder: 'è¯·éæ©éè´ç±»å', options: [ { label: 'ç±»å1', value: 1 }, { label: 'ç±»å2', value: 2 }, // Add all enum values ], options: [], rules: [{ required: true, message: 'è¯·éæ©éè´ç±»å', trigger: 'change' }], }, { @@ -62,11 +82,7 @@ prop: 'materialType', el: 'select', placeholder: 'è¯·éæ©ç©æç±»å', options: [ { label: 'ç±»åA', value: 1 }, { label: 'ç±»åB', value: 2 }, // Add all enum values ], options: [], rules: [{ required: true, message: 'è¯·éæ©ç©æç±»å', trigger: 'change' }], }, { @@ -84,7 +100,14 @@ { label: 'å¤å¾(mm)', prop: 'outerDiameter', el: 'input-number', el: (props: any, { attrs }: SetupContext) => { return h(inputNumber, { ...props, clearable: true, ...attrs, }) }, width: '100%', placeholder: '请è¾å ¥å¤å¾', step: 0.01, precision: 2, @@ -92,7 +115,14 @@ { label: 'å£å(mm)', prop: 'wallThickness', el: 'input-number', el: (props: any, { attrs }: SetupContext) => { return h(inputNumber, { ...props, clearable: true, ...attrs, }) }, width: '100%', placeholder: '请è¾å ¥å£å', step: 0.01, precision: 2, @@ -106,7 +136,14 @@ { label: 'é¿åº¦(m)', prop: 'length', el: 'input-number', el: (props: any, { attrs }: SetupContext) => { return h(inputNumber, { ...props, clearable: true, ...attrs, }) }, width: '100%', placeholder: '请è¾å ¥é¿åº¦', step: 0.1, precision: 2, @@ -115,10 +152,7 @@ label: 'æ¯å¦ä¸»æ¯ç®¡', prop: 'isMainBranch', el: 'select', options: [ { label: 'æ¯', value: 1 }, { label: 'å¦', value: 2 }, ], options: [], }, { label: 'ç产工å', @@ -184,7 +218,7 @@ wallThickness: formData.value.wallThickness, materialQuality: formData.value.materialQuality, length: formData.value.length, isMainBranch: formData.value.isMainBranch === 1, isMainBranch: formData.value.isMainBranch, factory: formData.value.factory, certification: formData.value.certification, remark: formData.value.remark, @@ -206,10 +240,34 @@ }, } } 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 onOpen = async () => { const materialTypeEnum = await wmsMaterialDrawer.getWmsEnumData({ EnumName: 'MaterialTypeEnum', }) updateFormItemOptions('materialType', materialTypeEnum) const purchaseTypeEnum = await wmsMaterialDrawer.getWmsEnumData({ EnumName: 'PurchaseTypeEnum', }) updateFormItemOptions('purchaseType', purchaseTypeEnum) const yesOrNoTypeEnum = await wmsMaterialDrawer.getWmsEnumData({ EnumName: 'YesNoEnum', }) updateFormItemOptions('isMainBranch', yesOrNoTypeEnum) if (current.value) { const res = await wmsMaterialDrawer.getWmsMaterialDetail(current.value) @@ -224,15 +282,18 @@ wallThickness: res.wallThickness, materialQuality: res.materialQuality, length: res.length, isMainBranch: res.isMainBranch ? 1 : 2, isMainBranch: res.isMainBranch, factory: res.factory, certification: res.certification, remark: res.remark, id: res.id, } disabled.value = true updateCheckData() } else { formData.value = {} disabled.value = false updateCheckData() } } HIAWms/web/src/widgets/HIAWms/Models/Service/WmsMaterialDrawer.ts
@@ -24,3 +24,11 @@ export const updateWmsMaterial = (id: string, data: Record<string, any>) => { return request.put(`/api/v1/hIAWms/wmsMaterial/${id}`, data) } /** * è·åæä¸¾ * @returns */ export const getWmsEnumData = (data: any) => { return request.post('/api/v1/hIAWms/WmsEnum', data) } HIAWms/web/src/widgets/HIAWms/Models/WmsMaterialDrawer.ts
@@ -3,6 +3,7 @@ addWmsMaterial, getWmsMaterial, updateWmsMaterial, getWmsEnumData, } from './Service/WmsMaterialDrawer' import { useGlobalState } from '@/libs/Store/Store' @@ -35,4 +36,9 @@ async getWmsMaterialDetail(current: any, id?: string) { return getWmsMaterial(id || current?.id) } // è·åæä¸¾å¼ async getWmsEnumData(data: Record<string, any>) { return getWmsEnumData(data) } } HIAWms/web/src/widgets/HIAWms/Views/HIAWms.tsx
@@ -68,7 +68,7 @@ return ( <TabPane label={widgetInfo.label} name={widgetInfo.name}> <Widget ref={(r: any) => (rf.value['WmsContainer'] = r)} ref={(r: any) => (rf.value['WmsMaterial'] = r)} ></Widget> </TabPane> ) HIAWms/web/src/widgets/HIAWms/Views/Pages/Dialog/WmsMaterialDrawer/WmsMaterialDrawer.tsx
@@ -1,7 +1,7 @@ import { SetupContext, defineComponent } from 'vue' import BaseDrawer from '@/components/BaseDrawer/BaseDrawer' import styles from './WmsMaterialDrawer.module.scss' import { useWmsMaterialDrawer } from '../../../../Controllers/WmsMaterialDrawer' import { useWmsMaterialDrawer } from '../../../../Controllers/WmsMaterialDrawer.tsx' import DyForm from '@/components/DyForm/DyForm' // @ts-ignore HIAWms/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/Config.ts
@@ -13,30 +13,12 @@ title: 'ç©æåç§°', }, { field: 'purchaseType', field: 'purchaseTypeDesc', title: 'éè´ç±»å', formatter: ({ cellValue }) => { // You'll need to map the enum values to display text const purchaseTypeMap = { 0: 'ç±»å1', 1: 'ç±»å2', // Add all enum values } return purchaseTypeMap[cellValue] || cellValue }, }, { field: 'materialType', field: 'materialTypeDesc', title: 'ç©æç±»å', formatter: ({ cellValue }) => { // Map material type enum to display text const materialTypeMap = { 0: 'ç±»åA', 1: 'ç±»åB', // Add all enum values } return materialTypeMap[cellValue] || cellValue }, }, { field: 'primaryUnit', @@ -63,9 +45,8 @@ title: 'é¿åº¦(m)', }, { field: 'isMainBranch', title: '主æ¯ç®¡', formatter: ({ cellValue }) => (cellValue ? 'æ¯' : 'å¦'), field: 'isMainBranchDesc', title: 'æ¯å¦ä¸»æ¯ç®¡', }, { field: 'factory', @@ -74,10 +55,6 @@ { field: 'certification', title: 'è¯ä¹¦ç¼å·', }, { field: 'sort', title: 'æåº', }, { field: 'remark',