2222

schangxiang@126.com

2025-05-09 78d4c83632f0ee3e51f343e5ae0c66fc4c4b237b

2222

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/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.精准查询;


 Weben_CMSרÓôúÂëÉú³ÉÆ÷/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; }


 Weben_CMSרÓôúÂëÉú³ÉÆ÷/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; }


 Weben_CMSרÓôúÂëÉú³ÉÆ÷/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>

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/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);           // ç‰©æ–™åç§°æ™®é€šç´¢å¼•

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509003959_InitialCreate6.Designer.cs

ÎļþÒÑɾ³ý

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509003959_InitialCreate6.cs

ÎļþÒÑɾ³ý

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509005007_InitialCreate6.Designer.cs

ÎļþÃû´Ó Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509000114_InitialCreate5.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)

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509005007_InitialCreate6.cs

ÎļþÃû´Ó Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509000114_InitialCreate5.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、m、个）")

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/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")

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterialµ¼³öÄ£°å.xlsx

Binary files differ

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/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: '采购类型（枚举值）', 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/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: '采购类型（枚举值）', 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts

@@ -36,7 +36,7 @@
}, 
{ 
  field: 'nullLength', 
  title: '', 
  title: '可空长度', 
  width:160, 
}, 
{