From 78d4c83632f0ee3e51f343e5ae0c66fc4c4b237b Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 09 5月 2025 08:53:10 +0800
Subject: [PATCH] 2222
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs | 2
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs | 4 ++
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509005007_InitialCreate6.cs | 8 ++--
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509005007_InitialCreate6.Designer.cs | 11 +++--
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs | 4 +-
/dev/null | 57 ----------------------------
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx | 4 +-
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts | 2
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial导出模板.xlsx | 0
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs | 2
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs | 4 +-
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx | 4 +-
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs | 3 +
13 files changed, 27 insertions(+), 78 deletions(-)
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs"
index 530f053..bc0347b 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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs"
@@ -104,12 +104,12 @@
public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- ///
+ /// 鍙┖闀垮害
/// </summary>
public decimal? NullLength { get; set; }
/// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// 鍙┖闀垮害-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
public SearchFilterModeEnum NullLength_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs"
index 0b778ed..49888bf 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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs"
@@ -40,7 +40,7 @@
public string MaterialName { get; set; }
/// <summary>
- ///
+ /// 鍙┖闀垮害
/// </summary>
public decimal? NullLength { get; set; }
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs"
index 025fe48..d8190e5 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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs"
@@ -43,7 +43,7 @@
public string MaterialName { get; set; }
/// <summary>
- ///
+ /// 鍙┖闀垮害
/// </summary>
public decimal? NullLength { get; set; }
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs"
index abf8d5b..b110054 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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs"
@@ -47,9 +47,9 @@
public string MaterialName { get; set; }
/// <summary>
- ///
+ /// 鍙┖闀垮害
/// </summary>
- [ExcelColumn(Name = "", Width = 25)]
+ [ExcelColumn(Name = "鍙┖闀垮害", Width = 25)]
public decimal? NullLength { get; set; }
/// <summary>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs"
index 4677928..6d5ee95 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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs"
@@ -147,6 +147,10 @@
.IsRequired(false)
.HasComment("鑷湁鏁伴噺");
+ b.Property(x => x.NullLength)
+ .IsRequired(false)
+ .HasComment("鍙┖闀垮害");
+
// 绱㈠紩閰嶇疆
b.HasIndex(x => x.MaterialCode).IsUnique(); // 鐗╂枡缂栫爜鍞竴绱㈠紩
b.HasIndex(x => x.MaterialName); // 鐗╂枡鍚嶇О鏅�氱储寮�
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509003959_InitialCreate6.Designer.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509003959_InitialCreate6.Designer.cs"
deleted file mode 100644
index 4b2aff5..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509003959_InitialCreate6.Designer.cs"
+++ /dev/null
@@ -1,1041 +0,0 @@
-锘�// <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("20250509003959_InitialCreate6")]
- partial class InitialCreate6
- {
- 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.WmsInOutStockRecord.WmsInOutStockRecord", 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")
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .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<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>("MaterialId")
- .IsRequired()
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasComment("鐗╂枡ID");
-
- b.Property<string>("MaterialModel")
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasComment("鏈哄瀷");
-
- b.Property<string>("MaterialName")
- .HasMaxLength(100)
- .HasColumnType("varchar(100)")
- .HasComment("鐗╂枡鍚嶇О");
-
- b.Property<string>("MaterialNo")
- .IsRequired()
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasComment("鐗╂枡浠跺彿");
-
- b.Property<DateTime?>("OperateTime")
- .HasColumnType("datetime(6)")
- .HasComment("鎿嶄綔鏃堕棿");
-
- b.Property<string>("OrderNo")
- .IsRequired()
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasComment("鍗曟嵁缂栧彿");
-
- b.Property<string>("Remark")
- .HasMaxLength(500)
- .HasColumnType("varchar(500)")
- .HasComment("澶囨敞");
-
- b.Property<int>("Sort")
- .HasColumnType("int")
- .HasComment("鎺掑簭");
-
- b.Property<string>("SourcePlace")
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasComment("璧峰搴撲綅");
-
- b.Property<int>("StockType")
- .HasColumnType("int")
- .HasComment("鎿嶄綔绫诲瀷");
-
- b.Property<string>("TaskNo")
- .IsRequired()
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasComment("浠诲姟鍙�");
-
- b.Property<string>("ToPlace")
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasComment("鐩爣搴撲綅");
-
- b.HasKey("Id");
-
- b.HasIndex("ContainerNo");
-
- b.HasIndex("MaterialId");
-
- b.HasIndex("MaterialNo");
-
- b.HasIndex("OperateTime");
-
- b.HasIndex("OrderNo");
-
- b.HasIndex("StockType");
-
- b.HasIndex("TaskNo");
-
- b.ToTable("scms_wmsinoutstockrecords", (string)null);
-
- b.HasComment("鍑哄叆搴撹褰曡〃");
- });
-
- modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterial.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")
- .HasComment("骞跺彂鎴�");
-
- b.Property<DateTime>("CreationTime")
- .HasColumnType("datetime(6)")
- .HasColumnName("CreationTime")
- .HasComment("鍒涘缓鏃堕棿");
-
- b.Property<Guid?>("CreatorId")
- .HasMaxLength(36)
- .HasColumnType("char(36)")
- .HasColumnName("CreatorId")
- .HasComment("鍒涘缓浜篒D");
-
- b.Property<string>("CreatorName")
- .HasMaxLength(64)
- .HasColumnType("varchar(64)")
- .HasComment("鍒涘缓浜�");
-
- b.Property<string>("DeleteRemark")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("鍒犻櫎澶囨敞");
-
- b.Property<Guid?>("DeleterId")
- .HasMaxLength(36)
- .HasColumnType("char(36)")
- .HasColumnName("DeleterId")
- .HasComment("鍒犻櫎浜篒D");
-
- b.Property<DateTime?>("DeletionTime")
- .HasColumnType("datetime(6)")
- .HasColumnName("DeletionTime")
- .HasComment("鍒犻櫎鏃堕棿");
-
- b.Property<string>("ExtraField1")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("鎵╁睍瀛楁1");
-
- b.Property<string>("ExtraField2")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("鎵╁睍瀛楁2");
-
- b.Property<string>("ExtraField3")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("鎵╁睍瀛楁3");
-
- b.Property<string>("ExtraProperties")
- .HasColumnType("longtext")
- .HasColumnName("ExtraProperties")
- .HasComment("鎵╁睍灞炴��");
-
- b.Property<string>("Factory")
- .HasMaxLength(64)
- .HasColumnType("varchar(64)")
- .HasComment("鐢熶骇宸ュ巶");
-
- b.Property<bool>("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnType("tinyint(1)")
- .HasDefaultValue(false)
- .HasColumnName("IsDeleted")
- .HasComment("鏄惁鍒犻櫎");
-
- b.Property<bool?>("IsDisabled")
- .ValueGeneratedOnAdd()
- .HasColumnType("tinyint(1)")
- .HasDefaultValue(false)
- .HasComment("鏄惁绂佺敤");
-
- b.Property<int>("IsMainBranch")
- .ValueGeneratedOnAdd()
- .HasColumnType("int")
- .HasDefaultValue(2)
- .HasComment("鏄惁涓轰富鏀");
-
- b.Property<bool?>("IsSelfMade")
- .HasColumnType("tinyint(1)")
- .HasComment("鏄惁鑷骇");
-
- b.Property<bool>("IsValid")
- .HasColumnType("tinyint(1)")
- .HasComment("鏄惁鏈夋晥鐗╂枡");
-
- b.Property<DateTime?>("LastModificationTime")
- .HasColumnType("datetime(6)")
- .HasColumnName("LastModificationTime")
- .HasComment("淇敼鏃堕棿");
-
- b.Property<Guid?>("LastModifierId")
- .HasMaxLength(36)
- .HasColumnType("char(36)")
- .HasColumnName("LastModifierId")
- .HasComment("淇敼浜篒D");
-
- b.Property<string>("LastModifierName")
- .HasMaxLength(64)
- .HasColumnType("varchar(64)")
- .HasComment("淇敼浜�");
-
- 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?>("NullLength")
- .HasColumnType("decimal(65,30)");
-
- b.Property<int>("Num")
- .HasColumnType("int")
- .HasComment("鏁伴噺");
-
- b.Property<string>("OperationRemark")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("鎿嶄綔澶囨敞");
-
- b.Property<decimal>("OuterDiameter")
- .HasColumnType("decimal(18,2)")
- .HasComment("澶栧緞锛堝崟浣嶏細mm锛�");
-
- b.Property<string>("PrimaryUnit")
- .HasMaxLength(20)
- .HasColumnType("varchar(20)")
- .HasComment("涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�");
-
- 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(256)
- .HasColumnType("varchar(256)")
- .HasComment("澶囨敞");
-
- b.Property<int?>("SelfNum")
- .HasColumnType("int")
- .HasComment("鑷湁鏁伴噺");
-
- b.Property<int>("Sort")
- .ValueGeneratedOnAdd()
- .HasColumnType("int")
- .HasDefaultValue(0)
- .HasComment("鎺掑簭");
-
- b.Property<string>("Standard")
- .HasMaxLength(128)
- .HasColumnType("varchar(128)")
- .HasComment("瑙勬牸/鏍囧噯锛堝锛欸B/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("浠撳簱淇℃伅琛�");
- });
-
- modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsTask.WmsTask", b =>
- {
- b.Property<Guid>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("char(36)");
-
- b.Property<int?>("Aisle")
- .HasColumnType("int")
- .HasComment("宸烽亾");
-
- b.Property<string>("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("varchar(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property<string>("ContainerNo")
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .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?>("DodeviceId")
- .HasColumnType("int")
- .HasComment("鍫嗗灈鏈篒D");
-
- b.Property<int>("Dodevicetype")
- .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?>("IsNextTask")
- .HasColumnType("int")
- .HasComment("涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛");
-
- b.Property<bool>("IsRead")
- .HasColumnType("tinyint(1)")
- .HasComment("WCS鏄惁鍙互璇诲彇");
-
- b.Property<DateTime?>("LastModificationTime")
- .HasColumnType("datetime(6)")
- .HasColumnName("LastModificationTime");
-
- b.Property<Guid?>("LastModifierId")
- .HasColumnType("char(36)")
- .HasColumnName("LastModifierId");
-
- b.Property<string>("MutableParam1")
- .HasMaxLength(200)
- .HasColumnType("varchar(200)")
- .HasComment("鍙彉鍙橀噺1");
-
- b.Property<string>("MutableParam2")
- .HasMaxLength(200)
- .HasColumnType("varchar(200)")
- .HasComment("鍙彉鍙橀噺2");
-
- b.Property<string>("MutableParam3")
- .HasMaxLength(200)
- .HasColumnType("varchar(200)")
- .HasComment("鍙彉鍙橀噺3");
-
- b.Property<int?>("SonTaskType")
- .HasColumnType("int")
- .HasComment("瀛愪换鍔＄被鍨�");
-
- b.Property<int>("Sort")
- .HasColumnType("int")
- .HasComment("鎺掑簭");
-
- b.Property<string>("SourceOrderNo")
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasComment("鏉ユ簮鍗曟嵁鍙�");
-
- b.Property<string>("SourcePlace")
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasComment("璧峰搴撲綅");
-
- b.Property<int>("TaskDodeviceStatus")
- .HasColumnType("int")
- .HasComment("璁惧浠诲姟鐘舵��");
-
- b.Property<int>("TaskLevel")
- .HasColumnType("int")
- .HasComment("浠诲姟绛夌骇");
-
- b.Property<string>("TaskNo")
- .IsRequired()
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasComment("浠诲姟鍙�");
-
- b.Property<int>("TaskStatus")
- .HasColumnType("int")
- .HasComment("浠诲姟鐘舵��");
-
- b.Property<int>("TaskType")
- .HasColumnType("int")
- .HasComment("浠诲姟绫诲瀷");
-
- b.Property<string>("ToPlace")
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasComment("鐩爣搴撲綅");
-
- b.HasKey("Id");
-
- b.HasIndex("ContainerNo");
-
- b.HasIndex("DodeviceId");
-
- b.HasIndex("IsRead");
-
- b.HasIndex("Sort");
-
- b.HasIndex("SourceOrderNo");
-
- b.HasIndex("SourcePlace");
-
- b.HasIndex("TaskNo")
- .IsUnique();
-
- b.HasIndex("TaskStatus");
-
- b.HasIndex("TaskType");
-
- b.HasIndex("ToPlace");
-
- b.ToTable("scms_wmstasks", (string)null);
-
- b.HasComment("浠诲姟琛�");
- });
-#pragma warning restore 612, 618
- }
- }
-}
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509003959_InitialCreate6.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509003959_InitialCreate6.cs"
deleted file mode 100644
index 94e9eff..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509003959_InitialCreate6.cs"
+++ /dev/null
@@ -1,57 +0,0 @@
-锘縰sing Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CMS.Plugin.HIAWms.MySQL.Migrations
-{
- public partial class InitialCreate6 : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.AlterColumn<int>(
- name: "Num",
- table: "scms_wmsmaterials",
- type: "int",
- nullable: false,
- comment: "鏁伴噺",
- oldClrType: typeof(int),
- oldType: "int",
- oldComment: "鏄惁鏈夋晥鐗╂枡");
-
- migrationBuilder.AlterColumn<bool>(
- name: "IsSelfMade",
- table: "scms_wmsmaterials",
- type: "tinyint(1)",
- nullable: true,
- comment: "鏄惁鑷骇",
- oldClrType: typeof(bool),
- oldType: "tinyint(1)",
- oldNullable: true,
- oldComment: "鏁伴噺");
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.AlterColumn<int>(
- name: "Num",
- table: "scms_wmsmaterials",
- type: "int",
- nullable: false,
- comment: "鏄惁鏈夋晥鐗╂枡",
- oldClrType: typeof(int),
- oldType: "int",
- oldComment: "鏁伴噺");
-
- migrationBuilder.AlterColumn<bool>(
- name: "IsSelfMade",
- table: "scms_wmsmaterials",
- type: "tinyint(1)",
- nullable: true,
- comment: "鏁伴噺",
- oldClrType: typeof(bool),
- oldType: "tinyint(1)",
- oldNullable: true,
- oldComment: "鏄惁鑷骇");
- }
- }
-}
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509000114_InitialCreate5.Designer.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509005007_InitialCreate6.Designer.cs"
similarity index 99%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509000114_InitialCreate5.Designer.cs"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509005007_InitialCreate6.Designer.cs"
index a29e742..25bfb9c 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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509000114_InitialCreate5.Designer.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509005007_InitialCreate6.Designer.cs"
@@ -12,8 +12,8 @@
namespace CMS.Plugin.HIAWms.MySQL.Migrations
{
[DbContext(typeof(CMSPluginDbContext))]
- [Migration("20250509000114_InitialCreate5")]
- partial class InitialCreate5
+ [Migration("20250509005007_InitialCreate6")]
+ partial class InitialCreate6
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
@@ -519,7 +519,7 @@
b.Property<bool?>("IsSelfMade")
.HasColumnType("tinyint(1)")
- .HasComment("鏁伴噺");
+ .HasComment("鏄惁鑷骇");
b.Property<bool>("IsValid")
.HasColumnType("tinyint(1)")
@@ -567,11 +567,12 @@
.HasComment("鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
b.Property<decimal?>("NullLength")
- .HasColumnType("decimal(65,30)");
+ .HasColumnType("decimal(65,30)")
+ .HasComment("鍙┖闀垮害");
b.Property<int>("Num")
.HasColumnType("int")
- .HasComment("鏄惁鏈夋晥鐗╂枡");
+ .HasComment("鏁伴噺");
b.Property<string>("OperationRemark")
.HasMaxLength(256)
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509000114_InitialCreate5.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509005007_InitialCreate6.cs"
similarity index 99%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509000114_InitialCreate5.cs"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509005007_InitialCreate6.cs"
index aed560d..b851038 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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509000114_InitialCreate5.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509005007_InitialCreate6.cs"
@@ -5,7 +5,7 @@
namespace CMS.Plugin.HIAWms.MySQL.Migrations
{
- public partial class InitialCreate5 : Migration
+ public partial class InitialCreate6 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
@@ -161,12 +161,12 @@
MaterialCode = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: false, comment: "鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�")
.Annotation("MySql:CharSet", "utf8mb4"),
IsValid = table.Column<bool>(type: "tinyint(1)", nullable: false, comment: "鏄惁鏈夋晥鐗╂枡"),
- IsSelfMade = table.Column<bool>(type: "tinyint(1)", nullable: true, comment: "鏁伴噺"),
- Num = table.Column<int>(type: "int", nullable: false, comment: "鏄惁鏈夋晥鐗╂枡"),
+ IsSelfMade = table.Column<bool>(type: "tinyint(1)", nullable: true, comment: "鏄惁鑷骇"),
+ Num = table.Column<int>(type: "int", nullable: false, comment: "鏁伴噺"),
SelfNum = table.Column<int>(type: "int", nullable: true, comment: "鑷湁鏁伴噺"),
MaterialName = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false, comment: "鐗╂枡鍚嶇О")
.Annotation("MySql:CharSet", "utf8mb4"),
- NullLength = table.Column<decimal>(type: "decimal(65,30)", nullable: true),
+ NullLength = table.Column<decimal>(type: "decimal(65,30)", nullable: true, comment: "鍙┖闀垮害"),
PurchaseType = table.Column<int>(type: "int", nullable: false, comment: "閲囪喘绫诲瀷锛堟灇涓惧�硷級"),
MaterialType = table.Column<int>(type: "int", nullable: false, comment: "鐗╂枡绫诲瀷锛堟灇涓惧�硷級"),
PrimaryUnit = table.Column<string>(type: "varchar(20)", maxLength: 20, nullable: true, comment: "涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�")
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs"
index 5d8a198..f8b58cd 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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs"
@@ -565,7 +565,8 @@
.HasComment("鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
b.Property<decimal?>("NullLength")
- .HasColumnType("decimal(65,30)");
+ .HasColumnType("decimal(65,30)")
+ .HasComment("鍙┖闀垮害");
b.Property<int>("Num")
.HasColumnType("int")
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
index 063de39..7aad9c1 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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
Binary files differ
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/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx"
index b44aba5..9b9e2f6 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/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx"
@@ -143,7 +143,7 @@
rules: [{required: true, message: '鐗╂枡鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }],
},
{
- label: '',
+ label: '鍙┖闀垮害',
prop: 'nullLength',
el: (props: any, { attrs }: SetupContext) => {
return h(inputNumber, {
@@ -156,7 +156,7 @@
step: 0.01,
precision: 2,
//disabled: disabled,
- placeholder: '璇疯緭鍏�',
+ placeholder: '璇疯緭鍏ュ彲绌洪暱搴�',
},
{
label: '閲囪喘绫诲瀷锛堟灇涓惧�硷級',
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/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx"
index 9ffe64f..ea15e00 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/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx"
@@ -141,7 +141,7 @@
placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
},
{
- label: '',
+ label: '鍙┖闀垮害',
prop: 'nullLength',
el: (props: any, { attrs }: SetupContext) => {
return h(inputNumber, {
@@ -154,7 +154,7 @@
step: 0.01,
precision: 2,
//disabled: disabled,
- placeholder: '璇疯緭鍏�',
+ placeholder: '璇疯緭鍏ュ彲绌洪暱搴�',
},
{
label: '閲囪喘绫诲瀷锛堟灇涓惧�硷級',
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/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts"
index 965bfe3..1033632 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/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts"
@@ -36,7 +36,7 @@
},
{
field: 'nullLength',
- title: '',
+ title: '鍙┖闀垮害',
width:160,
},
{
--
Gitblit v1.9.3