From 4b3fd35893972bb05fd7ab89dc624ab805093ff3 Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周日, 18 5月 2025 19:47:46 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo --- HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs | 591 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 563 insertions(+), 28 deletions(-) diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs index 2df82ec..9f6d04a 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs @@ -139,7 +139,7 @@ b.HasComment("搴撳尯琛�"); }); - modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsContainerPlaces.WmsContainerPlace", b => + modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsContainerPlace.WmsContainerPlace", b => { b.Property<string>("PlaceNo") .HasMaxLength(50) @@ -155,27 +155,60 @@ .IsConcurrencyToken() .HasMaxLength(40) .HasColumnType("varchar(40)") - .HasColumnName("ConcurrencyStamp"); + .HasColumnName("ConcurrencyStamp") + .HasComment("骞跺彂鎴�"); b.Property<DateTime>("CreationTime") .HasColumnType("datetime(6)") - .HasColumnName("CreationTime"); + .HasColumnName("CreationTime") + .HasComment("鍒涘缓鏃堕棿"); b.Property<Guid?>("CreatorId") + .HasMaxLength(36) .HasColumnType("char(36)") - .HasColumnName("CreatorId"); + .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"); + .HasColumnName("DeleterId") + .HasComment("鍒犻櫎浜篒D"); b.Property<DateTime?>("DeletionTime") .HasColumnType("datetime(6)") - .HasColumnName("DeletionTime"); + .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"); + .HasColumnName("ExtraProperties") + .HasComment("鎵╁睍灞炴��"); b.Property<Guid>("Id") .HasColumnType("char(36)"); @@ -184,21 +217,46 @@ .ValueGeneratedOnAdd() .HasColumnType("tinyint(1)") .HasDefaultValue(false) - .HasColumnName("IsDeleted"); + .HasColumnName("IsDeleted") + .HasComment("鏄惁鍒犻櫎"); b.Property<bool?>("IsDisabled") - .HasColumnType("tinyint(1)"); + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false) + .HasComment("鏄惁绂佺敤"); b.Property<DateTime?>("LastModificationTime") .HasColumnType("datetime(6)") - .HasColumnName("LastModificationTime"); + .HasColumnName("LastModificationTime") + .HasComment("淇敼鏃堕棿"); b.Property<Guid?>("LastModifierId") + .HasMaxLength(36) .HasColumnType("char(36)") - .HasColumnName("LastModifierId"); + .HasColumnName("LastModifierId") + .HasComment("淇敼浜篒D"); + + b.Property<string>("LastModifierName") + .HasMaxLength(64) + .HasColumnType("varchar(64)") + .HasComment("淇敼浜�"); + + b.Property<string>("OperationRemark") + .HasMaxLength(256) + .HasColumnType("varchar(256)") + .HasComment("鎿嶄綔澶囨敞"); + + b.Property<string>("Remark") + .HasMaxLength(256) + .HasColumnType("varchar(256)") + .HasComment("澶囨敞"); b.Property<int>("Sort") - .HasColumnType("int"); + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(0) + .HasComment("鎺掑簭"); b.HasKey("PlaceNo", "ContainerNo"); @@ -356,6 +414,280 @@ b.HasComment("鎵樼洏淇℃伅琛�"); }); + modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockOrder.WmsInOutStockOrder", b => + { + b.Property<Guid>("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)"); + + b.Property<int>("CompleteNumber") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(0) + .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>("DistributeNumber") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(0) + .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") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false) + .HasComment("鏄惁绂佺敤"); + + b.Property<DateTime?>("LastModificationTime") + .HasColumnType("datetime(6)") + .HasColumnName("LastModificationTime"); + + b.Property<Guid?>("LastModifierId") + .HasColumnType("char(36)") + .HasColumnName("LastModifierId"); + + b.Property<string>("MaterialBatch") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("varchar(50)") + .HasComment("鎵规鍙�"); + + 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<int>("MaterialNumber") + .HasColumnType("int") + .HasComment("鍗曟嵁鏁伴噺"); + + b.Property<DateTime?>("OperateTime") + .HasColumnType("datetime(6)") + .HasComment("鎿嶄綔鏃堕棿"); + + b.Property<string>("OrderNo") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("varchar(50)") + .HasComment("鍗曟嵁缂栧彿"); + + b.Property<int>("OrderStatus") + .HasColumnType("int") + .HasComment("鍗曟嵁鐘舵��"); + + b.Property<int>("OrderType") + .HasColumnType("int") + .HasComment("鍗曟嵁绫诲瀷"); + + b.Property<string>("PlanNo") + .HasMaxLength(50) + .HasColumnType("varchar(50)") + .HasComment("鍏宠仈璁″垝缂栧彿"); + + b.Property<int>("Priority") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(1) + .HasComment("浼樺厛绾�"); + + b.Property<string>("Remark") + .HasMaxLength(500) + .HasColumnType("varchar(500)") + .HasComment("澶囨敞"); + + b.Property<int>("Sort") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(0) + .HasComment("鎺掑簭"); + + b.Property<int>("StockType") + .HasColumnType("int") + .HasComment("鎿嶄綔绫诲瀷锛堟灇涓惧�硷級"); + + b.HasKey("Id"); + + b.HasIndex("MaterialBatch"); + + b.HasIndex("MaterialNo"); + + b.HasIndex("OperateTime"); + + b.HasIndex("OrderNo") + .IsUnique(); + + b.HasIndex("PlanNo"); + + b.ToTable("scms_wmsinoutstockorder", (string)null); + + b.HasComment("鍑哄叆搴撳崟鎹〃"); + }); + + modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockOrderDetail.WmsInOutStockOrderDetail", 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") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false) + .HasComment("鏄惁绂佺敤"); + + b.Property<DateTime?>("LastModificationTime") + .HasColumnType("datetime(6)") + .HasColumnName("LastModificationTime"); + + b.Property<Guid?>("LastModifierId") + .HasColumnType("char(36)") + .HasColumnName("LastModifierId"); + + b.Property<string>("MaterialBatch") + .HasMaxLength(50) + .HasColumnType("varchar(50)") + .HasComment("鐗╂枡鎵规"); + + b.Property<string>("MaterialId") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)") + .HasComment("鐗╂枡鍞竴鐮�"); + + 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<string>("OrderNo") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("varchar(50)") + .HasComment("鍗曟嵁缂栧彿"); + + b.Property<int>("OrderType") + .HasColumnType("int") + .HasComment("鍗曟嵁绫诲瀷锛堟灇涓惧�硷級"); + + b.Property<string>("Remark") + .HasMaxLength(500) + .HasColumnType("varchar(500)") + .HasComment("澶囨敞"); + + b.Property<int>("Sort") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(0) + .HasComment("鎺掑簭"); + + b.HasKey("Id"); + + b.HasIndex("ContainerNo"); + + b.HasIndex("MaterialId"); + + b.HasIndex("MaterialNo"); + + b.HasIndex("OrderNo"); + + b.HasIndex("OrderNo", "OrderType"); + + b.ToTable("scms_wmsinoutstockorderdetail", (string)null); + + b.HasComment("鍑哄叆搴撳崟鎹槑缁嗚〃"); + }); + modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord.WmsInOutStockRecord", b => { b.Property<Guid>("Id") @@ -411,6 +743,11 @@ .HasColumnType("char(36)") .HasColumnName("LastModifierId"); + b.Property<string>("MaterialBatch") + .HasMaxLength(64) + .HasColumnType("varchar(64)") + .HasComment("鐗╂枡鎵规"); + b.Property<string>("MaterialId") .IsRequired() .HasMaxLength(50) @@ -438,7 +775,6 @@ .HasComment("鎿嶄綔鏃堕棿"); b.Property<string>("OrderNo") - .IsRequired() .HasMaxLength(50) .HasColumnType("varchar(50)") .HasComment("鍗曟嵁缂栧彿"); @@ -491,6 +827,78 @@ b.ToTable("scms_wmsinoutstockrecords", (string)null); b.HasComment("鍑哄叆搴撹褰曡〃"); + }); + + modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterialContainer.WmsMaterialContainer", b => + { + b.Property<string>("MaterialId") + .HasMaxLength(64) + .HasColumnType("varchar(64)") + .HasComment("鐗╂枡ID"); + + b.Property<string>("ContainerNo") + .HasMaxLength(50) + .HasColumnType("varchar(50)") + .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<Guid>("Id") + .HasColumnType("char(36)"); + + b.Property<bool>("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false) + .HasColumnName("IsDeleted"); + + b.Property<bool?>("IsDisabled") + .HasColumnType("tinyint(1)"); + + b.Property<DateTime?>("LastModificationTime") + .HasColumnType("datetime(6)") + .HasColumnName("LastModificationTime"); + + b.Property<Guid?>("LastModifierId") + .HasColumnType("char(36)") + .HasColumnName("LastModifierId"); + + b.Property<int>("Sort") + .HasColumnType("int"); + + b.HasKey("MaterialId", "ContainerNo"); + + b.HasIndex("ContainerNo"); + + b.HasIndex("MaterialId"); + + b.ToTable("scms_wmsmaterialcontainer", (string)null); + + b.HasComment("鐗╂枡瀹瑰櫒鍏崇郴琛�"); }); modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterialInfos.WmsMaterialInfo", b => @@ -688,7 +1096,7 @@ b.Property<int>("IsMainBranch") .ValueGeneratedOnAdd() .HasColumnType("int") - .HasDefaultValue(2) + .HasDefaultValue(0) .HasComment("鏄惁涓轰富鏀"); b.Property<DateTime?>("LastModificationTime") @@ -703,12 +1111,6 @@ .HasColumnType("decimal(18,2)") .HasComment("闀垮害锛堝崟浣嶏細m锛�"); - b.Property<string>("MaterialCode") - .IsRequired() - .HasMaxLength(64) - .HasColumnType("varchar(64)") - .HasComment("鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�"); - b.Property<string>("MaterialModel") .HasMaxLength(128) .HasColumnType("varchar(128)") @@ -720,14 +1122,26 @@ .HasColumnType("varchar(128)") .HasComment("鐗╂枡鍚嶇О"); + b.Property<string>("MaterialNo") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)") + .HasComment("鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�"); + b.Property<string>("MaterialQuality") .HasMaxLength(64) .HasColumnType("varchar(64)") .HasComment("鏉愯川锛堝锛�304涓嶉攬閽級"); - b.Property<int>("MaterialType") - .HasColumnType("int") - .HasComment("鐗╂枡绫诲瀷锛堟灇涓惧�硷級"); + b.Property<string>("MaterialTypeCode") + .HasMaxLength(20) + .HasColumnType("varchar(20)") + .HasComment("鐗╂枡绫诲瀷缂栫爜"); + + b.Property<string>("MaterialTypeDesc") + .HasMaxLength(20) + .HasColumnType("varchar(20)") + .HasComment("鐗╂枡绫诲瀷"); b.Property<decimal>("OuterDiameter") .HasColumnType("decimal(18,2)") @@ -779,12 +1193,12 @@ b.HasKey("Id"); - b.HasIndex("MaterialCode") - .IsUnique(); - b.HasIndex("MaterialName"); - b.HasIndex("MaterialType"); + b.HasIndex("MaterialNo") + .IsUnique(); + + b.HasIndex("MaterialTypeCode"); b.HasIndex("PurchaseType"); @@ -977,6 +1391,115 @@ b.HasComment("WMS鐗╂枡搴撳瓨琛�"); }); + modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterialTypes.WmsMaterialType", 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") + .HasComment("鍒涘缓鏃堕棿"); + + b.Property<Guid?>("CreatorId") + .HasColumnType("char(36)") + .HasColumnName("CreatorId") + .HasComment("鍒涘缓浜篒D"); + + b.Property<string>("CreatorName") + .HasColumnType("longtext"); + + b.Property<string>("DeleteRemark") + .HasColumnType("longtext"); + + b.Property<Guid?>("DeleterId") + .HasColumnType("char(36)") + .HasColumnName("DeleterId") + .HasComment("鍒犻櫎浜篒D"); + + b.Property<DateTime?>("DeletionTime") + .HasColumnType("datetime(6)") + .HasColumnName("DeletionTime") + .HasComment("鍒犻櫎鏃堕棿"); + + b.Property<string>("ExtraField1") + .HasColumnType("longtext"); + + b.Property<string>("ExtraField2") + .HasColumnType("longtext"); + + b.Property<string>("ExtraField3") + .HasColumnType("longtext"); + + b.Property<string>("ExtraProperties") + .HasColumnType("longtext") + .HasColumnName("ExtraProperties"); + + b.Property<bool>("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(false) + .HasColumnName("IsDeleted") + .HasComment("鏄惁宸插垹闄�"); + + b.Property<bool?>("IsDisabled") + .HasColumnType("tinyint(1)"); + + b.Property<DateTime?>("LastModificationTime") + .HasColumnType("datetime(6)") + .HasColumnName("LastModificationTime") + .HasComment("鏈�鍚庝慨鏀规椂闂�"); + + b.Property<Guid?>("LastModifierId") + .HasColumnType("char(36)") + .HasColumnName("LastModifierId") + .HasComment("鏈�鍚庝慨鏀逛汉ID"); + + b.Property<string>("LastModifierName") + .HasColumnType("longtext"); + + b.Property<string>("MaterialTypeCode") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)") + .HasComment("绫诲瀷缂栫爜"); + + b.Property<string>("MaterialTypeDesc") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)") + .HasComment("绫诲瀷鎻忚堪"); + + b.Property<string>("OperationRemark") + .HasColumnType("longtext"); + + b.Property<string>("Remark") + .HasMaxLength(50) + .HasColumnType("varchar(50)") + .HasComment("澶囨敞"); + + b.Property<int>("Sort") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("MaterialTypeCode") + .IsUnique(); + + b.HasIndex("MaterialTypeDesc"); + + b.ToTable("scms_wmsmaterialtype", (string)null); + + b.HasComment("鐗╂枡绫诲瀷琛�"); + }); + modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsPlaces.WmsPlace", b => { b.Property<Guid>("Id") @@ -1033,8 +1556,10 @@ .HasDefaultValue(false) .HasColumnName("IsDeleted"); - b.Property<bool?>("IsDisabled") + b.Property<bool>("IsDisabled") + .ValueGeneratedOnAdd() .HasColumnType("tinyint(1)") + .HasDefaultValue(false) .HasComment("鏄惁绂佺敤"); b.Property<int>("Islock") @@ -1052,6 +1577,10 @@ b.Property<int>("LayerNo") .HasColumnType("int") .HasComment("灞�"); + + b.Property<int>("MaxStockNumber") + .HasColumnType("int") + .HasComment("鏈�澶у簱瀛橀噺"); b.Property<string>("PlaceNo") .IsRequired() @@ -1294,6 +1823,12 @@ .HasColumnType("varchar(200)") .HasComment("鍙彉鍙橀噺3"); + b.Property<int>("PlcTaskId") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(0) + .HasComment("浠诲姟鐘舵��"); + b.Property<int?>("SonTaskType") .HasColumnType("int") .HasComment("瀛愪换鍔$被鍨�"); -- Gitblit v1.9.3