Compare commits
	
		
			No commits in common. "1a9edcad1a5a526da6ed561799d0d07b9d49c2c6" and "80ef98f15c5652582b5eefb25e1234192b446ae4" have entirely different histories.
		
	
	
		
			1a9edcad1a
			...
			80ef98f15c
		
	
		
@ -88,11 +88,6 @@ namespace APT.BaseData.Domain.Entities.FM
 | 
				
			|||||||
        [Description("生产单元")]
 | 
					        [Description("生产单元")]
 | 
				
			||||||
        public virtual ICollection<T_FM_DEPARTMENT_PRODUCTION_UNIT> Nav_ProdutionUnit { get; set; }
 | 
					        public virtual ICollection<T_FM_DEPARTMENT_PRODUCTION_UNIT> Nav_ProdutionUnit { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        [Description("生产单元")]
 | 
					 | 
				
			||||||
        [DataFieldForeignKey("Nav_Unit")]
 | 
					 | 
				
			||||||
        public Guid? PRODUCTION_UNIT_ID { get; set; }
 | 
					 | 
				
			||||||
        [Description("导航属性:生产单元")]
 | 
					 | 
				
			||||||
        public T_FM_USER_PRODUCTION_UNIT_SET Nav_Unit { get; set; }
 | 
					 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
        /// 生产单元类型
 | 
					        /// 生产单元类型
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
 | 
				
			|||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@ -1,55 +0,0 @@
 | 
				
			|||||||
using System;
 | 
					 | 
				
			||||||
using Microsoft.EntityFrameworkCore.Migrations;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
namespace APT.Data.Migrations.Migrations
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    public partial class hmr2025102303 : Migration
 | 
					 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        protected override void Up(MigrationBuilder migrationBuilder)
 | 
					 | 
				
			||||||
        {
 | 
					 | 
				
			||||||
            migrationBuilder.AddColumn<Guid>(
 | 
					 | 
				
			||||||
                name: "Nav_UnitID",
 | 
					 | 
				
			||||||
                table: "T_FM_DEPARTMENT",
 | 
					 | 
				
			||||||
                type: "uniqueidentifier",
 | 
					 | 
				
			||||||
                nullable: true);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            migrationBuilder.AddColumn<Guid>(
 | 
					 | 
				
			||||||
                name: "PRODUCTION_UNIT_ID",
 | 
					 | 
				
			||||||
                table: "T_FM_DEPARTMENT",
 | 
					 | 
				
			||||||
                type: "uniqueidentifier",
 | 
					 | 
				
			||||||
                nullable: true);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            migrationBuilder.CreateIndex(
 | 
					 | 
				
			||||||
                name: "IX_T_FM_DEPARTMENT_Nav_UnitID",
 | 
					 | 
				
			||||||
                table: "T_FM_DEPARTMENT",
 | 
					 | 
				
			||||||
                column: "Nav_UnitID");
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            migrationBuilder.AddForeignKey(
 | 
					 | 
				
			||||||
                name: "FK_T_FM_DEPARTMENT_T_FM_USER_PRODUCTION_UNIT_SET_Nav_UnitID",
 | 
					 | 
				
			||||||
                table: "T_FM_DEPARTMENT",
 | 
					 | 
				
			||||||
                column: "Nav_UnitID",
 | 
					 | 
				
			||||||
                principalTable: "T_FM_USER_PRODUCTION_UNIT_SET",
 | 
					 | 
				
			||||||
                principalColumn: "ID",
 | 
					 | 
				
			||||||
                onDelete: ReferentialAction.Restrict);
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        protected override void Down(MigrationBuilder migrationBuilder)
 | 
					 | 
				
			||||||
        {
 | 
					 | 
				
			||||||
            migrationBuilder.DropForeignKey(
 | 
					 | 
				
			||||||
                name: "FK_T_FM_DEPARTMENT_T_FM_USER_PRODUCTION_UNIT_SET_Nav_UnitID",
 | 
					 | 
				
			||||||
                table: "T_FM_DEPARTMENT");
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            migrationBuilder.DropIndex(
 | 
					 | 
				
			||||||
                name: "IX_T_FM_DEPARTMENT_Nav_UnitID",
 | 
					 | 
				
			||||||
                table: "T_FM_DEPARTMENT");
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            migrationBuilder.DropColumn(
 | 
					 | 
				
			||||||
                name: "Nav_UnitID",
 | 
					 | 
				
			||||||
                table: "T_FM_DEPARTMENT");
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            migrationBuilder.DropColumn(
 | 
					 | 
				
			||||||
                name: "PRODUCTION_UNIT_ID",
 | 
					 | 
				
			||||||
                table: "T_FM_DEPARTMENT");
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@ -1548,9 +1548,6 @@ namespace APT.Data.Migrations.Migrations
 | 
				
			|||||||
                    b.Property<int>("NUM")
 | 
					                    b.Property<int>("NUM")
 | 
				
			||||||
                        .HasColumnType("int");
 | 
					                        .HasColumnType("int");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    b.Property<Guid?>("Nav_UnitID")
 | 
					 | 
				
			||||||
                        .HasColumnType("uniqueidentifier");
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                    b.Property<Guid?>("ORG_ID")
 | 
					                    b.Property<Guid?>("ORG_ID")
 | 
				
			||||||
                        .IsRequired()
 | 
					                        .IsRequired()
 | 
				
			||||||
                        .HasColumnType("uniqueidentifier");
 | 
					                        .HasColumnType("uniqueidentifier");
 | 
				
			||||||
@ -1562,9 +1559,6 @@ namespace APT.Data.Migrations.Migrations
 | 
				
			|||||||
                        .HasMaxLength(100)
 | 
					                        .HasMaxLength(100)
 | 
				
			||||||
                        .HasColumnType("uniqueidentifier");
 | 
					                        .HasColumnType("uniqueidentifier");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    b.Property<Guid?>("PRODUCTION_UNIT_ID")
 | 
					 | 
				
			||||||
                        .HasColumnType("uniqueidentifier");
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                    b.Property<string>("REMARK")
 | 
					                    b.Property<string>("REMARK")
 | 
				
			||||||
                        .HasMaxLength(500)
 | 
					                        .HasMaxLength(500)
 | 
				
			||||||
                        .HasColumnType("nvarchar(500)");
 | 
					                        .HasColumnType("nvarchar(500)");
 | 
				
			||||||
@ -1580,8 +1574,6 @@ namespace APT.Data.Migrations.Migrations
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                    b.HasIndex("CHARGEUSER_ID");
 | 
					                    b.HasIndex("CHARGEUSER_ID");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    b.HasIndex("Nav_UnitID");
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                    b.HasIndex("ORG_ID");
 | 
					                    b.HasIndex("ORG_ID");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    b.HasIndex("PARENT_ID");
 | 
					                    b.HasIndex("PARENT_ID");
 | 
				
			||||||
@ -93777,10 +93769,6 @@ namespace APT.Data.Migrations.Migrations
 | 
				
			|||||||
                        .HasForeignKey("CHARGEUSER_ID")
 | 
					                        .HasForeignKey("CHARGEUSER_ID")
 | 
				
			||||||
                        .OnDelete(DeleteBehavior.Restrict);
 | 
					                        .OnDelete(DeleteBehavior.Restrict);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER_PRODUCTION_UNIT_SET", "Nav_Unit")
 | 
					 | 
				
			||||||
                        .WithMany()
 | 
					 | 
				
			||||||
                        .HasForeignKey("Nav_UnitID");
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                    b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
 | 
					                    b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
 | 
				
			||||||
                        .WithMany()
 | 
					                        .WithMany()
 | 
				
			||||||
                        .HasForeignKey("ORG_ID")
 | 
					                        .HasForeignKey("ORG_ID")
 | 
				
			||||||
@ -93810,8 +93798,6 @@ namespace APT.Data.Migrations.Migrations
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                    b.Navigation("Nav_Person");
 | 
					                    b.Navigation("Nav_Person");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    b.Navigation("Nav_Unit");
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                    b.Navigation("Nav_User");
 | 
					                    b.Navigation("Nav_User");
 | 
				
			||||||
                });
 | 
					                });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user