BoXu.Zheng
/
BeiJinSettleAccount
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

master
mahao 1 year ago
parent
e660b83f53 917e20df26
commit
4569b84f38
20 changed files with 12571 additions and 131 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 208
      code/src/Modules/BaseService/BaseService.EntityFrameworkCore/Migrations/20230822033456_202308220001.Designer.cs
  2. 117
      code/src/Modules/BaseService/BaseService.EntityFrameworkCore/Migrations/20230822033456_202308220001.cs
  3. 208
      code/src/Modules/BaseService/BaseService.EntityFrameworkCore/Migrations/20230822034321_2023082200001.Designer.cs
  4. 17
      code/src/Modules/BaseService/BaseService.EntityFrameworkCore/Migrations/20230822034321_2023082200001.cs
  5. 206
      code/src/Modules/BaseService/BaseService.EntityFrameworkCore/Migrations/BaseServiceDbContextModelSnapshot.cs
  6. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
  7. 20
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs
  8. 23
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
  9. 17
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs
  10. 15
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SEC_DETAIL.cs
  11. 3
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_NOT_SA_DETAIL.cs
  12. 12
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SEC_DETAIL.cs
  13. 162
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
  14. 11
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SEC_DETAIL.cs
  15. 5587
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230822025542_202308120001.Designer.cs
  16. 224
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230822025542_202308120001.cs
  17. 5584
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230822032309_202308230001.Designer.cs
  18. 200
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230822032309_202308230001.cs
  19. 82
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs
  20. 2
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/appsettings.json

208
code/src/Modules/BaseService/BaseService.EntityFrameworkCore/Migrations/20230822033456_202308220001.Designer.cs
View File

@ -0,0 +1,208 @@
// <auto-generated />
using System;
using BaseService.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Volo.Abp.EntityFrameworkCore;
namespace BaseService.Migrations
{
[DbContext(typeof(BaseServiceDbContext))]
[Migration("20230822033456_202308220001")]
partial class _202308220001
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
.HasAnnotation("Relational:MaxIdentifierLength", 128)
.HasAnnotation("ProductVersion", "5.0.17")
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
modelBuilder.Entity("BaseService.BaseData.Branch", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("CascadeId")
.HasColumnType("nvarchar(max)");
b.Property<short>("CategoryId")
.HasColumnType("smallint");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<bool>("Enabled")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false);
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
b.Property<string>("FullName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<bool>("Leaf")
.HasColumnType("bit");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<Guid?>("Pid")
.HasColumnType("uniqueidentifier");
b.Property<int>("Sort")
.HasColumnType("int");
b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier");
b.HasKey("Id");
b.HasIndex("Pid");
b.ToTable("base_branches");
});
modelBuilder.Entity("BaseService.BaseData.UserBranch", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("BranchId")
.HasColumnType("uniqueidentifier");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<Guid>("UserId")
.HasColumnType("uniqueidentifier");
b.HasKey("Id");
b.ToTable("base_user_branches");
});
modelBuilder.Entity("BaseService.RelationBaseData.BranchRole", b =>
{
b.Property<Guid>("BranchId")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("RoleId")
.HasColumnType("uniqueidentifier");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.HasKey("BranchId", "RoleId");
b.ToTable("base_branch_role");
});
modelBuilder.Entity("BaseService.BaseData.UserBranch", b =>
{
b.OwnsMany("BaseService.BaseData.UserBranchRole", "Roles", b1 =>
{
b1.Property<Guid>("UserBranchId")
.HasColumnType("uniqueidentifier");
b1.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
b1.Property<Guid>("RoleId")
.HasColumnType("uniqueidentifier");
b1.HasKey("UserBranchId", "Id");
b1.ToTable("base_user_branch_role");
b1.WithOwner()
.HasForeignKey("UserBranchId");
});
b.Navigation("Roles");
});
modelBuilder.Entity("BaseService.RelationBaseData.BranchRole", b =>
{
b.HasOne("BaseService.BaseData.Branch", null)
.WithMany("Roles")
.HasForeignKey("BranchId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("BaseService.BaseData.Branch", b =>
{
b.Navigation("Roles");
});
#pragma warning restore 612, 618
}
}
}

117
code/src/Modules/BaseService/BaseService.EntityFrameworkCore/Migrations/20230822033456_202308220001.cs
View File

@ -0,0 +1,117 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace BaseService.Migrations
{
public partial class _202308220001 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "base_branches",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CategoryId = table.Column<short>(type: "smallint", nullable: false),
Pid = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
Name = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
FullName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
Sort = table.Column<int>(type: "int", nullable: false),
Leaf = table.Column<bool>(type: "bit", nullable: false),
CascadeId = table.Column<string>(type: "nvarchar(max)", nullable: true),
Enabled = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_base_branches", x => x.Id);
});
migrationBuilder.CreateTable(
name: "base_user_branches",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_base_user_branches", x => x.Id);
});
migrationBuilder.CreateTable(
name: "base_branch_role",
columns: table => new
{
RoleId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_base_branch_role", x => new { x.BranchId, x.RoleId });
table.ForeignKey(
name: "FK_base_branch_role_base_branches_BranchId",
column: x => x.BranchId,
principalTable: "base_branches",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "base_user_branch_role",
columns: table => new
{
UserBranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("SqlServer:Identity", "1, 1"),
RoleId = table.Column<Guid>(type: "uniqueidentifier", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_base_user_branch_role", x => new { x.UserBranchId, x.Id });
table.ForeignKey(
name: "FK_base_user_branch_role_base_user_branches_UserBranchId",
column: x => x.UserBranchId,
principalTable: "base_user_branches",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_base_branches_Pid",
table: "base_branches",
column: "Pid");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "base_branch_role");
migrationBuilder.DropTable(
name: "base_user_branch_role");
migrationBuilder.DropTable(
name: "base_branches");
migrationBuilder.DropTable(
name: "base_user_branches");
}
}
}

208
code/src/Modules/BaseService/BaseService.EntityFrameworkCore/Migrations/20230822034321_2023082200001.Designer.cs
View File

@ -0,0 +1,208 @@
// <auto-generated />
using System;
using BaseService.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Volo.Abp.EntityFrameworkCore;
namespace BaseService.Migrations
{
[DbContext(typeof(BaseServiceDbContext))]
[Migration("20230822034321_2023082200001")]
partial class _2023082200001
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
.HasAnnotation("Relational:MaxIdentifierLength", 128)
.HasAnnotation("ProductVersion", "5.0.17")
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
modelBuilder.Entity("BaseService.BaseData.Branch", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("CascadeId")
.HasColumnType("nvarchar(max)");
b.Property<short>("CategoryId")
.HasColumnType("smallint");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<bool>("Enabled")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false);
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
b.Property<string>("FullName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<bool>("Leaf")
.HasColumnType("bit");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<Guid?>("Pid")
.HasColumnType("uniqueidentifier");
b.Property<int>("Sort")
.HasColumnType("int");
b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier");
b.HasKey("Id");
b.HasIndex("Pid");
b.ToTable("base_branches");
});
modelBuilder.Entity("BaseService.BaseData.UserBranch", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("BranchId")
.HasColumnType("uniqueidentifier");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<Guid>("UserId")
.HasColumnType("uniqueidentifier");
b.HasKey("Id");
b.ToTable("base_user_branches");
});
modelBuilder.Entity("BaseService.RelationBaseData.BranchRole", b =>
{
b.Property<Guid>("BranchId")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("RoleId")
.HasColumnType("uniqueidentifier");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.HasKey("BranchId", "RoleId");
b.ToTable("base_branch_role");
});
modelBuilder.Entity("BaseService.BaseData.UserBranch", b =>
{
b.OwnsMany("BaseService.BaseData.UserBranchRole", "Roles", b1 =>
{
b1.Property<Guid>("UserBranchId")
.HasColumnType("uniqueidentifier");
b1.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
b1.Property<Guid>("RoleId")
.HasColumnType("uniqueidentifier");
b1.HasKey("UserBranchId", "Id");
b1.ToTable("base_user_branch_role");
b1.WithOwner()
.HasForeignKey("UserBranchId");
});
b.Navigation("Roles");
});
modelBuilder.Entity("BaseService.RelationBaseData.BranchRole", b =>
{
b.HasOne("BaseService.BaseData.Branch", null)
.WithMany("Roles")
.HasForeignKey("BranchId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("BaseService.BaseData.Branch", b =>
{
b.Navigation("Roles");
});
#pragma warning restore 612, 618
}
}
}

17
code/src/Modules/BaseService/BaseService.EntityFrameworkCore/Migrations/20230822034321_2023082200001.cs
View File

@ -0,0 +1,17 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace BaseService.Migrations
{
public partial class _2023082200001 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
}
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

206
code/src/Modules/BaseService/BaseService.EntityFrameworkCore/Migrations/BaseServiceDbContextModelSnapshot.cs
View File

@ -0,0 +1,206 @@
// <auto-generated />
using System;
using BaseService.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Volo.Abp.EntityFrameworkCore;
namespace BaseService.Migrations
{
[DbContext(typeof(BaseServiceDbContext))]
partial class BaseServiceDbContextModelSnapshot : ModelSnapshot
{
protected override void BuildModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
.HasAnnotation("Relational:MaxIdentifierLength", 128)
.HasAnnotation("ProductVersion", "5.0.17")
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
modelBuilder.Entity("BaseService.BaseData.Branch", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("CascadeId")
.HasColumnType("nvarchar(max)");
b.Property<short>("CategoryId")
.HasColumnType("smallint");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<bool>("Enabled")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false);
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
b.Property<string>("FullName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<bool>("Leaf")
.HasColumnType("bit");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<Guid?>("Pid")
.HasColumnType("uniqueidentifier");
b.Property<int>("Sort")
.HasColumnType("int");
b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier");
b.HasKey("Id");
b.HasIndex("Pid");
b.ToTable("base_branches");
});
modelBuilder.Entity("BaseService.BaseData.UserBranch", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("BranchId")
.HasColumnType("uniqueidentifier");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<Guid>("UserId")
.HasColumnType("uniqueidentifier");
b.HasKey("Id");
b.ToTable("base_user_branches");
});
modelBuilder.Entity("BaseService.RelationBaseData.BranchRole", b =>
{
b.Property<Guid>("BranchId")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("RoleId")
.HasColumnType("uniqueidentifier");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.HasKey("BranchId", "RoleId");
b.ToTable("base_branch_role");
});
modelBuilder.Entity("BaseService.BaseData.UserBranch", b =>
{
b.OwnsMany("BaseService.BaseData.UserBranchRole", "Roles", b1 =>
{
b1.Property<Guid>("UserBranchId")
.HasColumnType("uniqueidentifier");
b1.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
b1.Property<Guid>("RoleId")
.HasColumnType("uniqueidentifier");
b1.HasKey("UserBranchId", "Id");
b1.ToTable("base_user_branch_role");
b1.WithOwner()
.HasForeignKey("UserBranchId");
});
b.Navigation("Roles");
});
modelBuilder.Entity("BaseService.RelationBaseData.BranchRole", b =>
{
b.HasOne("BaseService.BaseData.Branch", null)
.WithMany("Roles")
.HasForeignKey("BranchId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("BaseService.BaseData.Branch", b =>
{
b.Navigation("Roles");
});
#pragma warning restore 612, 618
}
}
}

4
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
View File

@ -3,8 +3,8 @@
"CorsOrigins": "https://*.abc.com,http://localhost:9527,http://149.223.116.5:8088"
},
"ConnectionStrings": {
"Default": "Server=dev.ccwin-in.com,13319;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True",
"SettleAccountService": "Server=dev.ccwin-in.com,13319;Database=BQ_SA;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;",
"Default": "Server=dev.ccwin-in.com,13326;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True",
"SettleAccountService": "Server=dev.ccwin-in.com,13326;Database=BQ_SA;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;",
"WMSBJBMPT": "Server=dev.ccwin-in.com,6208;Database=WMS_BJBMPT_2;User ID=sa;Password=ChangkeTec@2021;Trusted_Connection=False;TrustServerCertificate=True;",
"questdb": "host=dev.ccwin-in.com;port=10580;username=admin;password=quest;database=vmi;ServerCompatibilityMode=NoTypeLoading;"
},

20
code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs
View File

@ -139,12 +139,9 @@ namespace Win.Sfs.SettleAccount.Bases
{
//_repository.Where(p => p_list.Contains(p.BillNum));
//public VmiLog()
//{
//}
//public VmiLog(Guid id)
//{
// this.Id = id;
@ -267,11 +264,6 @@ namespace Win.Sfs.SettleAccount.Bases
// #endregion 库存备份
// public enum VmiLogType
//{
// /// <summary>
@ -310,18 +302,6 @@ namespace Win.Sfs.SettleAccount.Bases
// [Display(Name = "调整出库")]
// Type600 = 600,
//}
return ApplicationConsts.SuccessStr;
}
/// <summary>

23
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
View File

@ -12,6 +12,7 @@ using TaskJob.Interfaces;
using Volo.Abp.DependencyInjection;
using Win.Sfs.SettleAccount.Constant;
using Win.Sfs.SettleAccount.Entities.BQ.Vmi;
using Win.Sfs.SettleAccount.Entities.CodeSettings;
using Win.Sfs.Shared.RepositoryBase;
namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
@ -24,6 +25,8 @@ public class PendingDeductionService : ITransientDependency, IExportJob
protected readonly INormalEfCoreRepository<BBAC_PD_DETAIL, Guid> _bbacRepository;
protected readonly INormalEfCoreRepository<HBPO_PD_DETAIL, Guid> _hbpoRepository;
protected readonly INormalEfCoreRepository<PUB_PD_DETAIL, Guid> _pubRepository;
protected readonly INormalEfCoreRepository<CodeSetting, Guid> _codesetRepository;
public PendingDeductionService(
INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> bbacSecRepository,
INormalEfCoreRepository<HBPO_SEC_DETAIL, Guid> hbpoSecRepository,
@ -31,6 +34,9 @@ public class PendingDeductionService : ITransientDependency, IExportJob
INormalEfCoreRepository<BBAC_PD_DETAIL, Guid> bbacRepository,
INormalEfCoreRepository<HBPO_PD_DETAIL, Guid> hbpoRepository,
INormalEfCoreRepository<PUB_PD_DETAIL, Guid> pubRepository,
VmiAppService vimservice
)
{
@ -50,18 +56,11 @@ public class PendingDeductionService : ITransientDependency, IExportJob
var list=billList.Split(",");
// /// </summary>
//[Display(Name = "JisBBAC")]
// JisBBAC = 1,
///// <summary>
///// JisHBPO
///// </summary>
//[Display(Name = "JisHBPO")]
// JisHBPO = 2,
if (type == "JisBBAC")
{
var jisdetail = _bbacRepository.Where(p => list.Contains(p.BillNum) && p.IsMaiDan==false);
var mdetail = _bbacRepository.Where(p => list.Contains(p.BillNum) && p.IsMaiDan ==true);
var query = from itm in jisdetail
@ -79,8 +78,8 @@ public class PendingDeductionService : ITransientDependency, IExportJob
LogType = Entities.BQ.Vmi.VmiLogType.Type200,
ChangedQty = itm.Qty,
ChangedType = VmiType.Out,
SubBillType = EnumDeliverSubBillType.小件BBAC,
BillType = EnumDeliverBjBmpBillType.JIS件,
//SubBillType = EnumDeliverSubBillType.小件BBAC,
//BillType = EnumDeliverBjBmpBillType.JIS件,
PartCode = tm != null ? tm.ReplaceLU : itm.LU,
SettlementVinCode = itm.PN,
PartCode2 = tm != null ? tm.ReplaceLU : itm.LU,
@ -110,7 +109,7 @@ public class PendingDeductionService : ITransientDependency, IExportJob
PartCode2 = itm.PartCode2,
CustomerPartCode = itm.CustomerPartCode,
VinCode = itm.VinCode,
OrderNum = itm.OrderNum,
//OrderNum = itm.OrderNum,
ErpToLoc = "C0001"
}).ConfigureAwait(false);
}

17
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs
View File

@ -378,6 +378,11 @@ namespace SettleAccount.Bases
/// 厂内物料号
/// </summary>
public virtual string PartCode { get; set; }
/// <summary>
/// 业务分类
/// </summary>
@ -439,12 +444,11 @@ namespace SettleAccount.Bases
/// </summary>
public string SettleBillNum { get; set; }
public string InvbillNum { get; set; }
public string ErpLoc { get; set; }=string.Empty;
public string PartCode { get; set; }
public string RealPartCode { get; set; }
//public SA_CAN_BASE(int version, decimal price, string billNum, DateTime settleDate, string invGroupNum, string lU, string pN, string keyCode, decimal qty, string groupNum)
//{
@ -516,6 +520,13 @@ namespace SettleAccount.Bases
public string PartCode { get; set; }
/// <summary>
/// 实际出库厂内物料号
/// </summary>
public virtual string RealPartCode { get; set; }
public string ErpLoc { get; set; }
//public SA_NOT_BASE(decimal price, int version, string settleBillNum, DateTime settleDate, string invGroupNum, string lU, string pN, string keyCode, decimal qty, string groupNum)
//{
// Price = price;

15
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SEC_DETAIL.cs
View File

@ -127,8 +127,18 @@ public class BBAC_SEC_DETAIL : FullAuditedAggregateRoot<Guid>
[Display(Name = "PJIS日顺序号")]
[ExporterHeader(DisplayName = "PJIS日顺序号")]
public string PJISSeqNumber { get; set; }
public BBAC_SEC_DETAIL(Guid guid, EnumPubSaSeCompareCategory category, string wmsBillNum, DateTime shippingDate, string pN, string materialNumber, string materialDes, string primitiveLU, string replaceLU, DateTime customerOfflineTime, decimal sAQty, decimal sEQty, decimal diffQty, string mateType, decimal fixPrice, string seqNumber, string pJISSeqNumber)
/// <summary>
/// PJIS日顺序号
/// </summary>
[Display(Name = "库位")]
[ExporterHeader(DisplayName = "库位")]
public string ErpLoc { get; set; }
public BBAC_SEC_DETAIL(Guid guid, EnumPubSaSeCompareCategory category, string wmsBillNum, DateTime shippingDate, string pN, string materialNumber, string materialDes, string primitiveLU, string replaceLU, DateTime customerOfflineTime, decimal sAQty, decimal sEQty, decimal diffQty, string mateType, decimal fixPrice, string seqNumber, string pJISSeqNumber,string erploc)
{
Id = guid;
Category = category;
@ -147,6 +157,7 @@ public class BBAC_SEC_DETAIL : FullAuditedAggregateRoot<Guid>
FixPrice = fixPrice;
SeqNumber = seqNumber;
PJISSeqNumber = pJISSeqNumber;
ErpLoc = erploc;
}
public BBAC_SEC_DETAIL()

3
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_NOT_SA_DETAIL.cs
View File

@ -99,6 +99,9 @@ public class HBPO_NOT_SA_DETAIL :SA_NOT_BASE
public EnumBusinessType BusinessType { get; set; }
public HBPO_NOT_SA_DETAIL(Guid guid ,string keyCode, int version, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, DateTime settleDate, string groupNum, string invGroupNum, EnumBusinessType businessType,string partcode)
{
Id = guid;

12
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SEC_DETAIL.cs
View File

@ -129,7 +129,16 @@ public class HBPO_SEC_DETAIL: FullAuditedAggregateRoot<Guid>
[ExporterHeader(DisplayName = "PJIS日顺序号")]
public string PJISSeqNumber { get; set; }
public HBPO_SEC_DETAIL(Guid guid, EnumPubSaSeCompareCategory category, string wmsBillNum, DateTime shippingDate, string pN, string materialNumber, string materialDes, string primitiveLU, string replaceLU, DateTime customerOfflineTime, decimal sAQty, decimal sEQty, decimal diffQty, string mateType, decimal fixPrice, string seqNumber, string pJISSeqNumber)
/// <summary>
/// PJIS日顺序号
/// </summary>
[Display(Name = "库位")]
[ExporterHeader(DisplayName = "库位")]
public string ErpLoc { get; set; }
public HBPO_SEC_DETAIL(Guid guid, EnumPubSaSeCompareCategory category, string wmsBillNum, DateTime shippingDate, string pN, string materialNumber, string materialDes, string primitiveLU, string replaceLU, DateTime customerOfflineTime, decimal sAQty, decimal sEQty, decimal diffQty, string mateType, decimal fixPrice, string seqNumber, string pJISSeqNumber,string erploc)
{
Id = guid;
Category = category;
@ -148,6 +157,7 @@ public class HBPO_SEC_DETAIL: FullAuditedAggregateRoot<Guid>
FixPrice = fixPrice;
SeqNumber = seqNumber;
PJISSeqNumber = pJISSeqNumber;
ErpLoc= erploc;
}
public HBPO_SEC_DETAIL()

162
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
View File

@ -25,6 +25,7 @@ using Volo.Abp.Domain.Services;
using Volo.Abp.Json;
using Win.Sfs.SettleAccount.Bases;
using Win.Sfs.SettleAccount.Entities.BQ.Temp;
using Win.Sfs.SettleAccount.Entities.CodeSettings;
using Win.Sfs.SettleAccount.Entities.Prices;
using Win.Sfs.Shared.RepositoryBase;
@ -38,7 +39,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
private readonly INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> _detailRepository;
private readonly INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> _notRepository;
private readonly INormalEfCoreRepository<PUB_ADJ_DETAIL, Guid> _adjRepository;
protected readonly INormalEfCoreRepository<CodeSetting, Guid> _codesetRepository;
private readonly INormalEfCoreRepository<BBAC_PD, Guid> _pdbbacRepository;
private readonly INormalEfCoreRepository<HBPO_PD, Guid> _pdhbpoRepository;
private readonly INormalEfCoreRepository<PUB_PD, Guid> _pdpubRepository;
@ -57,7 +58,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> groupRepository,
INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> detailRepository,
INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> notRepository,
INormalEfCoreRepository<PUB_ADJ_DETAIL, Guid> adjRepository
INormalEfCoreRepository<PUB_ADJ_DETAIL, Guid> adjRepository,
INormalEfCoreRepository<CodeSetting, Guid> codesetRepository
)
{
@ -73,6 +75,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
_pdbbacRepository=pdbbacRepository;
_pdhbpoRepository=pdhbpoRepository;
_pdpubRepository =pdpubRepository;
_codesetRepository = codesetRepository;
}
public INV_MNG()
@ -497,36 +500,41 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
state: SettleBillState.客户已收票,
invGroupNum: itm.InvGroupNum,
site: string.Empty
);
bbacmainlist.Add( bbac );
}
var bbacDetail = new List<BBAC_PD_DETAIL>();
foreach (var itm in entityList)
{
bbacDetail.Add(
new BBAC_PD_DETAIL(
guid: itm.Id,
keyCode: itm.KeyCode,
version: itm.Version,
billNum: itm.InvbillNum,
lU: itm.LU,
rELU: string.Empty,
pN: itm.PN,
rEPN: string.Empty,
site: itm.Site,
qty: itm.Qty,
price: 0,
invGroupNum: itm.InvGroupNum,
settleDate: itm.SettleDate,
groupNum: itm.GroupNum,
extend1: string.Empty,
extend2: string.Empty,
extend3: string.Empty,
extend4: itm.PartCode
));
var detail= new BBAC_PD_DETAIL(
guid: itm.Id,
keyCode: itm.KeyCode,
version: itm.Version,
billNum: itm.InvbillNum,
lU: itm.LU,
rELU: string.Empty,
pN: itm.PN,
rEPN: string.Empty,
site: itm.Site,
qty: itm.Qty,
price: 0,
invGroupNum: itm.InvGroupNum,
settleDate: itm.SettleDate,
groupNum: itm.GroupNum,
extend1: string.Empty,
extend2: string.Empty,
extend3: string.Empty,
extend4: itm.PartCode);//厂内实际零件号
detail.RELU = itm.RealPartCode;//厂内替换零件号
detail.Extend2 = itm.ErpLoc;//ERP库位
bbacDetail.Add(detail);
}
await _repository.DbContext.BulkInsertAsync(bbacmainlist);
await _repository.DbContext.BulkInsertAsync(bbacDetail);
@ -606,7 +614,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{
foreach (var itm in adjlist)
{
entityDetail.Add(new HBPO_CAN_SA_DETAIL(
var entity= new HBPO_CAN_SA_DETAIL(
guid: GuidGenerator.Create(),
keyCode: itm.KeyCode,
version: itm.Version,
@ -622,8 +630,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
groupNum: itm.GroupNum,
invGroupNum: itm.InvGroupNum,
invbillnum: itm.InvBillNum,
partcode: itm.PartCode
));
partcode: itm.PartCode);
entityDetail.Add(entity
);
}
}
entityList.AddRange(entityDetail);
@ -645,27 +654,31 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var bbacDetail = new List<HBPO_PD_DETAIL>();
foreach (var itm in entityList)
{
bbacDetail.Add(
new HBPO_PD_DETAIL(
guid: itm.Id,
keyCode: itm.KeyCode,
version: itm.Version,
billNum: itm.BillNum,
lU: itm.LU,
rELU: string.Empty,
pN: itm.PN,
rEPN: string.Empty,
site: itm.Site,
qty: itm.Qty,
price: 0,
invGroupNum: itm.InvGroupNum,
settleDate: itm.SettleDate,
groupNum: itm.GroupNum,
extend1: string.Empty,
extend2: string.Empty,
extend3: string.Empty,
extend4: itm.PartCode
));
var entity = new HBPO_PD_DETAIL(
guid: itm.Id,
keyCode: itm.KeyCode,
version: itm.Version,
billNum: itm.BillNum,
lU: itm.LU,
rELU: string.Empty,
pN: itm.PN,
rEPN: string.Empty,
site: itm.Site,
qty: itm.Qty,
price: 0,
invGroupNum: itm.InvGroupNum,
settleDate: itm.SettleDate,
groupNum: itm.GroupNum,
extend1: string.Empty,
extend2: string.Empty,
extend3: string.Empty,
extend4: itm.PartCode
);
entity.RELU = itm.RealPartCode;//厂内替换零件号
entity.Extend2 = itm.ErpLoc;//ERP库位
bbacDetail.Add(entity
);
}
await _repository.DbContext.BulkInsertAsync(bbacmainlist);
await _repository.DbContext.BulkInsertAsync(bbacDetail);
@ -728,8 +741,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
invGroupNum: itm.InvGroupNum,
invbillnum: itm.InvBillNum,
partcode:itm.PartCode,
pobillnum:string.Empty
@ -763,14 +774,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
invGroupNum: itm.InvGroupNum,
invbillnum: itm.InvBillNum,
partcode: itm.PartCode,
pobillnum: string.Empty
pobillnum: string.Empty
));
}
}
entityList.AddRange(entityDetail);
}
var bbacmainlist = new List<PUB_PD>();
foreach (var itm in invList)
{
@ -789,28 +798,31 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var bbacDetail = new List<PUB_PD_DETAIL>();
foreach (var itm in entityList)
{
bbacDetail.Add(
new PUB_PD_DETAIL(
guid: itm.Id,
keyCode: itm.KeyCode,
version: itm.Version,
billNum: itm.BillNum,
lU: itm.LU,
rELU: string.Empty,
pN: itm.PN,
rEPN: string.Empty,
site: itm.Site,
qty: itm.Qty,
price: 0,
businessType:itm.BusinessType,
invGroupNum: itm.InvGroupNum,
settleDate: itm.SettleDate,
groupNum: itm.GroupNum,
extend1: string.Empty,
extend2: string.Empty,
extend3: string.Empty,
extend4: itm.PartCode
));
var entity = new PUB_PD_DETAIL(
guid: itm.Id,
keyCode: itm.KeyCode,
version: itm.Version,
billNum: itm.BillNum,
lU: itm.LU,
rELU: string.Empty,
pN: itm.PN,
rEPN: string.Empty,
site: itm.Site,
qty: itm.Qty,
price: 0,
businessType: itm.BusinessType,
invGroupNum: itm.InvGroupNum,
settleDate: itm.SettleDate,
groupNum: itm.GroupNum,
extend1: string.Empty,
extend2: string.Empty,
extend3: string.Empty,
extend4: itm.PartCode
);
entity.RELU = itm.RealPartCode;//厂内替换零件号
entity.Extend2 = itm.ErpLoc;//ERP库位
bbacDetail.Add(entity
);
}
await _repository.DbContext.BulkInsertAsync(bbacmainlist);
await _repository.DbContext.BulkInsertAsync(bbacDetail);

11
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SEC_DETAIL.cs
View File

@ -128,7 +128,15 @@ public class PUB_SEC_DETAIL:FullAuditedAggregateRoot<Guid>
[ExporterHeader(DisplayName = "PJIS日顺序号")]
public string PJISSeqNumber { get; set; }
public PUB_SEC_DETAIL(Guid guid, EnumPubSaSeCompareCategory category, string wmsBillNum, DateTime shippingDate, string pN, string materialNumber, string materialDes, string primitiveLU, string replaceLU, DateTime customerOfflineTime, decimal sAQty, decimal sEQty, decimal diffQty, string mateType, decimal fixPrice, string seqNumber, string pJISSeqNumber)
/// <summary>
/// PJIS日顺序号
/// </summary>
[Display(Name = "库位")]
[ExporterHeader(DisplayName = "库位")]
public string ErpLoc { get; set; }
public PUB_SEC_DETAIL(Guid guid, EnumPubSaSeCompareCategory category, string wmsBillNum, DateTime shippingDate, string pN, string materialNumber, string materialDes, string primitiveLU, string replaceLU, DateTime customerOfflineTime, decimal sAQty, decimal sEQty, decimal diffQty, string mateType, decimal fixPrice, string seqNumber, string pJISSeqNumber,string erploc)
{
Id = guid;
Category = category;
@ -147,6 +155,7 @@ public class PUB_SEC_DETAIL:FullAuditedAggregateRoot<Guid>
FixPrice = fixPrice;
SeqNumber = seqNumber;
PJISSeqNumber = pJISSeqNumber;
ErpLoc = erploc;
}
public PUB_SEC_DETAIL()

5587
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230822025542_202308120001.Designer.cs
View File

File diff suppressed because it is too large

224
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230822025542_202308120001.cs
View File

@ -0,0 +1,224 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace Win.Sfs.SettleAccount.Migrations
{
public partial class _202308120001 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "Set_VmiBalance",
keyColumn: "Id",
keyValue: new Guid("3fc80398-34df-4288-9ad7-37db79c80192"));
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_PUB_SEC_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_PUB_NOT_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_PUB_NOT_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_PUB_CAN_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_PUB_CAN_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_PUB_ADJ_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_PUB_ADJ_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_HBPO_SEC_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_HBPO_NOT_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_HBPO_NOT_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_HBPO_CAN_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_HBPO_CAN_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_HBPO_ADJ_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_HBPO_ADJ_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_BBAC_SEC_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_BBAC_NOT_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_BBAC_NOT_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ErpLoc",
table: "Set_BBAC_CAN_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RealPartCode",
table: "Set_BBAC_CAN_SA_DETAIL",
type: "nvarchar(50)",
nullable: true);
migrationBuilder.InsertData(
table: "Set_VmiBalance",
columns: new[] { "Id", "BackupTime", "BillTime", "BillType", "CodeType", "ConcurrencyStamp", "Configcode", "CustomerPartCode", "DeliverTime", "ErpToLoc", "MatchNumber", "OrderNum", "PartCode", "PjsNum", "Qty", "ReMark", "RealCode", "Seq", "SubBillType", "UniqueCode", "VinCode", "factory" },
values: new object[] { new Guid("0986cf48-5c48-4d14-a7b5-77e0d5da28b9"), null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), 1, null, "60e9bdd1236e478e861a8d0d950d715b", null, null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), "ErpToLoc", null, "OrderNum", "PartCode", null, 0m, null, null, null, 0, null, "VinCode", null });
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "Set_VmiBalance",
keyColumn: "Id",
keyValue: new Guid("0986cf48-5c48-4d14-a7b5-77e0d5da28b9"));
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_PUB_SEC_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_PUB_NOT_SA_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_PUB_NOT_SA_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_PUB_CAN_SA_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_PUB_CAN_SA_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_PUB_ADJ_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_PUB_ADJ_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_HBPO_SEC_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_HBPO_NOT_SA_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_HBPO_NOT_SA_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_HBPO_CAN_SA_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_HBPO_CAN_SA_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_HBPO_ADJ_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_HBPO_ADJ_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_BBAC_SEC_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_BBAC_NOT_SA_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_BBAC_NOT_SA_DETAIL");
migrationBuilder.DropColumn(
name: "ErpLoc",
table: "Set_BBAC_CAN_SA_DETAIL");
migrationBuilder.DropColumn(
name: "RealPartCode",
table: "Set_BBAC_CAN_SA_DETAIL");
migrationBuilder.InsertData(
table: "Set_VmiBalance",
columns: new[] { "Id", "BackupTime", "BillTime", "BillType", "CodeType", "ConcurrencyStamp", "Configcode", "CustomerPartCode", "DeliverTime", "ErpToLoc", "MatchNumber", "OrderNum", "PartCode", "PjsNum", "Qty", "ReMark", "RealCode", "Seq", "SubBillType", "UniqueCode", "VinCode", "factory" },
values: new object[] { new Guid("3fc80398-34df-4288-9ad7-37db79c80192"), null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), 1, null, "b792ebaa809446988e3a5e7887e75ecb", null, null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), "ErpToLoc", null, "OrderNum", "PartCode", null, 0m, null, null, null, 0, null, "VinCode", null });
}
}
}

5584
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230822032309_202308230001.Designer.cs
View File

File diff suppressed because it is too large

200
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230822032309_202308230001.cs
View File

@ -0,0 +1,200 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace Win.Sfs.SettleAccount.Migrations
{
public partial class _202308230001 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_Set_VmiBalance_BillType_CodeType_PartCode_VinCode_ErpToLoc_OrderNum_factory_Configcode",
table: "Set_VmiBalance");
migrationBuilder.DeleteData(
table: "Set_VmiBalance",
keyColumn: "Id",
keyValue: new Guid("0986cf48-5c48-4d14-a7b5-77e0d5da28b9"));
migrationBuilder.AlterColumn<int>(
name: "SubBillType",
table: "Set_VmiLog",
type: "int",
nullable: true,
oldClrType: typeof(int),
oldType: "int");
migrationBuilder.AlterColumn<DateTime>(
name: "DeliverTime",
table: "Set_VmiLog",
type: "datetime2",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "datetime2");
migrationBuilder.AlterColumn<int>(
name: "BillType",
table: "Set_VmiLog",
type: "int",
nullable: true,
oldClrType: typeof(int),
oldType: "int");
migrationBuilder.AlterColumn<DateTime>(
name: "BillTime",
table: "Set_VmiLog",
type: "datetime2",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "datetime2");
migrationBuilder.AlterColumn<int>(
name: "SubBillType",
table: "Set_VmiBalance",
type: "int",
nullable: true,
oldClrType: typeof(int),
oldType: "int");
migrationBuilder.AlterColumn<DateTime>(
name: "DeliverTime",
table: "Set_VmiBalance",
type: "datetime2",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "datetime2");
migrationBuilder.AlterColumn<int>(
name: "BillType",
table: "Set_VmiBalance",
type: "int",
nullable: true,
oldClrType: typeof(int),
oldType: "int");
migrationBuilder.AlterColumn<DateTime>(
name: "BillTime",
table: "Set_VmiBalance",
type: "datetime2",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "datetime2");
migrationBuilder.InsertData(
table: "Set_VmiBalance",
columns: new[] { "Id", "BackupTime", "BillTime", "BillType", "CodeType", "ConcurrencyStamp", "Configcode", "CustomerPartCode", "DeliverTime", "ErpToLoc", "MatchNumber", "OrderNum", "PartCode", "PjsNum", "Qty", "ReMark", "RealCode", "Seq", "SubBillType", "UniqueCode", "VinCode", "factory" },
values: new object[] { new Guid("daf33f05-698e-49cf-b688-9288f5e94be5"), null, null, 1, null, "2232ce1052044e5db3c50a381547b2bc", null, null, null, "ErpToLoc", null, "OrderNum", "PartCode", null, 0m, null, null, null, null, null, "VinCode", null });
migrationBuilder.CreateIndex(
name: "IX_Set_VmiBalance_BillType_CodeType_PartCode_VinCode_ErpToLoc_OrderNum_factory_Configcode",
table: "Set_VmiBalance",
columns: new[] { "BillType", "CodeType", "PartCode", "VinCode", "ErpToLoc", "OrderNum", "factory", "Configcode" },
unique: true,
filter: "[BillType] IS NOT NULL AND [CodeType] IS NOT NULL AND [PartCode] IS NOT NULL AND [VinCode] IS NOT NULL AND [ErpToLoc] IS NOT NULL AND [OrderNum] IS NOT NULL AND [factory] IS NOT NULL AND [Configcode] IS NOT NULL");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_Set_VmiBalance_BillType_CodeType_PartCode_VinCode_ErpToLoc_OrderNum_factory_Configcode",
table: "Set_VmiBalance");
migrationBuilder.DeleteData(
table: "Set_VmiBalance",
keyColumn: "Id",
keyValue: new Guid("daf33f05-698e-49cf-b688-9288f5e94be5"));
migrationBuilder.AlterColumn<int>(
name: "SubBillType",
table: "Set_VmiLog",
type: "int",
nullable: false,
defaultValue: 0,
oldClrType: typeof(int),
oldType: "int",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeliverTime",
table: "Set_VmiLog",
type: "datetime2",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
oldClrType: typeof(DateTime),
oldType: "datetime2",
oldNullable: true);
migrationBuilder.AlterColumn<int>(
name: "BillType",
table: "Set_VmiLog",
type: "int",
nullable: false,
defaultValue: 0,
oldClrType: typeof(int),
oldType: "int",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "BillTime",
table: "Set_VmiLog",
type: "datetime2",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
oldClrType: typeof(DateTime),
oldType: "datetime2",
oldNullable: true);
migrationBuilder.AlterColumn<int>(
name: "SubBillType",
table: "Set_VmiBalance",
type: "int",
nullable: false,
defaultValue: 0,
oldClrType: typeof(int),
oldType: "int",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeliverTime",
table: "Set_VmiBalance",
type: "datetime2",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
oldClrType: typeof(DateTime),
oldType: "datetime2",
oldNullable: true);
migrationBuilder.AlterColumn<int>(
name: "BillType",
table: "Set_VmiBalance",
type: "int",
nullable: false,
defaultValue: 0,
oldClrType: typeof(int),
oldType: "int",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "BillTime",
table: "Set_VmiBalance",
type: "datetime2",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
oldClrType: typeof(DateTime),
oldType: "datetime2",
oldNullable: true);
migrationBuilder.InsertData(
table: "Set_VmiBalance",
columns: new[] { "Id", "BackupTime", "BillTime", "BillType", "CodeType", "ConcurrencyStamp", "Configcode", "CustomerPartCode", "DeliverTime", "ErpToLoc", "MatchNumber", "OrderNum", "PartCode", "PjsNum", "Qty", "ReMark", "RealCode", "Seq", "SubBillType", "UniqueCode", "VinCode", "factory" },
values: new object[] { new Guid("0986cf48-5c48-4d14-a7b5-77e0d5da28b9"), null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), 1, null, "60e9bdd1236e478e861a8d0d950d715b", null, null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), "ErpToLoc", null, "OrderNum", "PartCode", null, 0m, null, null, null, 0, null, "VinCode", null });
migrationBuilder.CreateIndex(
name: "IX_Set_VmiBalance_BillType_CodeType_PartCode_VinCode_ErpToLoc_OrderNum_factory_Configcode",
table: "Set_VmiBalance",
columns: new[] { "BillType", "CodeType", "PartCode", "VinCode", "ErpToLoc", "OrderNum", "factory", "Configcode" },
unique: true,
filter: "[CodeType] IS NOT NULL AND [PartCode] IS NOT NULL AND [VinCode] IS NOT NULL AND [ErpToLoc] IS NOT NULL AND [OrderNum] IS NOT NULL AND [factory] IS NOT NULL AND [Configcode] IS NOT NULL");
}
}
}

82
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs
View File

@ -113,6 +113,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@ -164,6 +167,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
@ -209,6 +215,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@ -257,6 +266,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
@ -1168,6 +1180,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@ -1220,6 +1235,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
@ -1328,6 +1346,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@ -1372,6 +1393,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
@ -1414,6 +1438,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@ -1455,6 +1482,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
@ -2847,6 +2877,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("Extend1")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
@ -2903,6 +2936,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
@ -3012,6 +3048,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@ -3059,6 +3098,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
@ -3102,6 +3144,9 @@ namespace Win.Sfs.SettleAccount.Migrations
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("Extend1")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
@ -3158,6 +3203,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("Qty")
.HasColumnType("decimal(18,2)");
b.Property<string>("RealPartCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("SettleBillNum")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
@ -3978,6 +4026,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("DiffQty")
.HasColumnType("decimal(18,2)");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@ -4086,6 +4137,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("DiffQty")
.HasColumnType("decimal(18,2)");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@ -4194,6 +4248,9 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<decimal>("DiffQty")
.HasColumnType("decimal(18,2)");
b.Property<string>("ErpLoc")
.HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@ -4475,10 +4532,10 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<DateTime?>("BackupTime")
.HasColumnType("datetime2");
b.Property<DateTime>("BillTime")
b.Property<DateTime?>("BillTime")
.HasColumnType("datetime2");
b.Property<int>("BillType")
b.Property<int?>("BillType")
.HasColumnType("int");
b.Property<string>("CodeType")
@ -4496,7 +4553,7 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<string>("CustomerPartCode")
.HasColumnType("nvarchar(max)");
b.Property<DateTime>("DeliverTime")
b.Property<DateTime?>("DeliverTime")
.HasColumnType("datetime2");
b.Property<string>("ErpToLoc")
@ -4526,7 +4583,7 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<string>("Seq")
.HasColumnType("nvarchar(max)");
b.Property<int>("SubBillType")
b.Property<int?>("SubBillType")
.HasColumnType("int");
b.Property<string>("UniqueCode")
@ -4542,23 +4599,20 @@ namespace Win.Sfs.SettleAccount.Migrations
b.HasIndex("BillType", "CodeType", "PartCode", "VinCode", "ErpToLoc", "OrderNum", "factory", "Configcode")
.IsUnique()
.HasFilter("[CodeType] IS NOT NULL AND [PartCode] IS NOT NULL AND [VinCode] IS NOT NULL AND [ErpToLoc] IS NOT NULL AND [OrderNum] IS NOT NULL AND [factory] IS NOT NULL AND [Configcode] IS NOT NULL");
.HasFilter("[BillType] IS NOT NULL AND [CodeType] IS NOT NULL AND [PartCode] IS NOT NULL AND [VinCode] IS NOT NULL AND [ErpToLoc] IS NOT NULL AND [OrderNum] IS NOT NULL AND [factory] IS NOT NULL AND [Configcode] IS NOT NULL");
b.ToTable("Set_VmiBalance");
b.HasData(
new
{
Id = new Guid("3fc80398-34df-4288-9ad7-37db79c80192"),
BillTime = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
Id = new Guid("daf33f05-698e-49cf-b688-9288f5e94be5"),
BillType = 1,
ConcurrencyStamp = "b792ebaa809446988e3a5e7887e75ecb",
DeliverTime = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
ConcurrencyStamp = "2232ce1052044e5db3c50a381547b2bc",
ErpToLoc = "ErpToLoc",
OrderNum = "OrderNum",
PartCode = "PartCode",
Qty = 0m,
SubBillType = 0,
VinCode = "VinCode"
});
});
@ -4569,10 +4623,10 @@ namespace Win.Sfs.SettleAccount.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<DateTime>("BillTime")
b.Property<DateTime?>("BillTime")
.HasColumnType("datetime2");
b.Property<int>("BillType")
b.Property<int?>("BillType")
.HasColumnType("int");
b.Property<string>("ChangedBy")
@ -4599,7 +4653,7 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<string>("CustomerPartCode")
.HasColumnType("nvarchar(max)");
b.Property<DateTime>("DeliverTime")
b.Property<DateTime?>("DeliverTime")
.HasColumnType("datetime2");
b.Property<string>("ErpToLoc")
@ -4644,7 +4698,7 @@ namespace Win.Sfs.SettleAccount.Migrations
b.Property<string>("SettlementVinCode")
.HasColumnType("nvarchar(max)");
b.Property<int>("SubBillType")
b.Property<int?>("SubBillType")
.HasColumnType("int");
b.Property<string>("UniqueCode")

2
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/appsettings.json
View File

@ -9,7 +9,7 @@
"CorsOrigins": "http://localhost:9527,http://dev.ccwin-in.com:10588,http://localhost:44307"
},
"ConnectionStrings": {
"Default": "Server=dev.ccwin-in.com,13319;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True",
"Default": "Server=dev.ccwin-in.com,13326;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True",
"SettleAccountService": "Server=dev.ccwin-in.com,13319;Database=BQ_SA;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;"
//"SettleAccountService": "Server=localhost;Database=BQ_SA;User ID=sa;Password=aA123456!;Trusted_Connection=False;TrustServerCertificate=True",
//"Default": "Server=localhost;Database=BJABP;User ID=sa;Password=aA123456!;Trusted_Connection=False;TrustServerCertificate=True"

Write Preview
Loading…
Cancel
Save