diff --git a/MagMan.Data.Tenant/MagMan.Data.Tenant.csproj b/MagMan.Data.Tenant/MagMan.Data.Tenant.csproj
index cd5d5f6..1986e8e 100644
--- a/MagMan.Data.Tenant/MagMan.Data.Tenant.csproj
+++ b/MagMan.Data.Tenant/MagMan.Data.Tenant.csproj
@@ -42,6 +42,7 @@
+
diff --git a/MagMan.Data.Tenant/MagManContext.cs b/MagMan.Data.Tenant/MagManContext.cs
index b15aa10..02e8cdd 100644
--- a/MagMan.Data.Tenant/MagManContext.cs
+++ b/MagMan.Data.Tenant/MagManContext.cs
@@ -47,8 +47,10 @@ namespace MagMan.Data.Tenant
public virtual DbSet DbSetReqDet{ get; set; } = null!;
- public virtual DbSet DbSetMovMag { get; set; } = null!;
- public virtual DbSet DbSetPrintJob { get; set; } = null!;
+#if false
+ public virtual DbSet DbSetMovMag { get; set; } = null!;
+ public virtual DbSet DbSetPrintJob { get; set; } = null!;
+#endif
private string connString = "";
diff --git a/MagMan.Data.Tenant/Migrations/20231222163946_InitDb.Designer.cs b/MagMan.Data.Tenant/Migrations/20231222163946_InitDb.Designer.cs
deleted file mode 100644
index 9171131..0000000
--- a/MagMan.Data.Tenant/Migrations/20231222163946_InitDb.Designer.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-using MagMan.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace MagMan.Data.Tenant.Migrations
-{
- [DbContext(typeof(MagManContext))]
- [Migration("20231222163946_InitDb")]
- partial class InitDb
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "6.0.25")
- .HasAnnotation("Relational:MaxIdentifierLength", 64);
-
- modelBuilder.Entity("MagMan.Data.DbModels.ConfigModel", b =>
- {
- b.Property("KeyName")
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasColumnOrder(0);
-
- b.Property("Note")
- .IsRequired()
- .HasMaxLength(250)
- .HasColumnType("varchar(250)")
- .HasColumnOrder(3);
-
- b.Property("Val")
- .IsRequired()
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasColumnOrder(1);
-
- b.Property("ValStd")
- .IsRequired()
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasColumnOrder(2)
- .HasComment("Valore di default/riferimento per la variabile");
-
- b.HasKey("KeyName");
-
- b.ToTable("Config");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/MagMan.Data.Tenant/Migrations/20231222163946_InitDb.cs b/MagMan.Data.Tenant/Migrations/20231222163946_InitDb.cs
deleted file mode 100644
index 0a7e484..0000000
--- a/MagMan.Data.Tenant/Migrations/20231222163946_InitDb.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace MagMan.Data.Tenant.Migrations
-{
- public partial class InitDb : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.AlterDatabase()
- .Annotation("MySql:CharSet", "utf8mb4");
-
- migrationBuilder.CreateTable(
- name: "Config",
- columns: table => new
- {
- KeyName = table.Column(type: "varchar(50)", maxLength: 50, nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4"),
- Val = table.Column(type: "varchar(50)", maxLength: 50, nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4"),
- ValStd = table.Column(type: "varchar(50)", maxLength: 50, nullable: false, comment: "Valore di default/riferimento per la variabile")
- .Annotation("MySql:CharSet", "utf8mb4"),
- Note = table.Column(type: "varchar(250)", maxLength: 250, nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4")
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Config", x => x.KeyName);
- })
- .Annotation("MySql:CharSet", "utf8mb4");
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "Config");
- }
- }
-}
diff --git a/MagMan.Data.Tenant/Migrations/20231222180319_AddMagBaseObj.Designer.cs b/MagMan.Data.Tenant/Migrations/20231222180319_AddMagBaseObj.Designer.cs
deleted file mode 100644
index afd3983..0000000
--- a/MagMan.Data.Tenant/Migrations/20231222180319_AddMagBaseObj.Designer.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-using System;
-using MagMan.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace MagMan.Data.Tenant.Migrations
-{
- [DbContext(typeof(MagManContext))]
- [Migration("20231222180319_AddMagBaseObj")]
- partial class AddMagBaseObj
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "6.0.25")
- .HasAnnotation("Relational:MaxIdentifierLength", 64);
-
- modelBuilder.Entity("MagMan.Data.DbModels.ConfigModel", b =>
- {
- b.Property("KeyName")
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasColumnOrder(0);
-
- b.Property("Note")
- .IsRequired()
- .HasMaxLength(250)
- .HasColumnType("varchar(250)")
- .HasColumnOrder(3);
-
- b.Property("Val")
- .IsRequired()
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasColumnOrder(1);
-
- b.Property("ValStd")
- .IsRequired()
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasColumnOrder(2)
- .HasComment("Valore di default/riferimento per la variabile");
-
- b.HasKey("KeyName");
-
- b.ToTable("Config");
- });
-
- modelBuilder.Entity("MagMan.Data.DbModels.ItemModel", b =>
- {
- b.Property("RawItemId")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- b.Property("DtMod")
- .HasColumnType("datetime(6)");
-
- b.Property("IsRemn")
- .HasColumnType("tinyint(1)");
-
- b.Property("LMm")
- .HasColumnType("decimal(65,30)");
-
- b.Property("Location")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.Property("MatId")
- .HasColumnType("int");
-
- b.Property("Note")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.Property("QtyAvail")
- .HasColumnType("int");
-
- b.Property("HMm")
- .HasColumnType("decimal(65,30)");
-
- b.Property("WMm")
- .HasColumnType("decimal(65,30)");
-
- b.HasKey("RawItemId");
-
- b.HasIndex("MatId");
-
- b.ToTable("ItemsList");
- });
-
- modelBuilder.Entity("MagMan.Data.DbModels.MaterialModel", b =>
- {
- b.Property("MatId")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- b.Property("ApprovDate")
- .HasColumnType("datetime(6)");
-
- b.Property("ApprovUser")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.Property("LMm")
- .HasColumnType("decimal(65,30)");
-
- b.Property("MatDesc")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.Property("MatExtCode")
- .HasColumnType("int");
-
- b.Property("HMm")
- .HasColumnType("decimal(65,30)");
-
- b.Property("WMm")
- .HasColumnType("decimal(65,30)");
-
- b.HasKey("MatId");
-
- b.ToTable("Materials");
- });
-
- modelBuilder.Entity("MagMan.Data.DbModels.ItemModel", b =>
- {
- b.HasOne("MagMan.Data.DbModels.MaterialModel", "MaterialNav")
- .WithMany("RawItemList")
- .HasForeignKey("MatId")
- .OnDelete(DeleteBehavior.Restrict)
- .IsRequired();
-
- b.Navigation("MaterialNav");
- });
-
- modelBuilder.Entity("MagMan.Data.DbModels.MaterialModel", b =>
- {
- b.Navigation("RawItemList");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/MagMan.Data.Tenant/Migrations/20231222180319_AddMagBaseObj.cs b/MagMan.Data.Tenant/Migrations/20231222180319_AddMagBaseObj.cs
deleted file mode 100644
index 7e1ad36..0000000
--- a/MagMan.Data.Tenant/Migrations/20231222180319_AddMagBaseObj.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace MagMan.Data.Tenant.Migrations
-{
- public partial class AddMagBaseObj : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.CreateTable(
- name: "Materials",
- columns: table => new
- {
- MatID = table.Column(type: "int", nullable: false)
- .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
- MatExtCode = table.Column(type: "int", nullable: false),
- MatDesc = table.Column(type: "longtext", nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4"),
- ApprovDate = table.Column(type: "datetime(6)", nullable: false),
- ApprovUser = table.Column(type: "longtext", nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4"),
- LMm = table.Column(type: "decimal(65,30)", nullable: false),
- WMm = table.Column(type: "decimal(65,30)", nullable: false),
- TMm = table.Column(type: "decimal(65,30)", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Materials", x => x.MatID);
- })
- .Annotation("MySql:CharSet", "utf8mb4");
-
- migrationBuilder.CreateTable(
- name: "ItemsList",
- columns: table => new
- {
- ItemID = table.Column(type: "int", nullable: false)
- .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
- MatID = table.Column(type: "int", nullable: false),
- IsRemn = table.Column(type: "tinyint(1)", nullable: false),
- Location = table.Column(type: "longtext", nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4"),
- QtyAvail = table.Column(type: "int", nullable: false),
- DtMod = table.Column(type: "datetime(6)", nullable: false),
- LMm = table.Column(type: "decimal(65,30)", nullable: false),
- WMm = table.Column(type: "decimal(65,30)", nullable: false),
- TMm = table.Column(type: "decimal(65,30)", nullable: false),
- Note = table.Column(type: "longtext", nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4")
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_ItemsList", x => x.ItemID);
- table.ForeignKey(
- name: "FK_ItemsList_Materials_MatID",
- column: x => x.MatID,
- principalTable: "Materials",
- principalColumn: "MatId",
- onDelete: ReferentialAction.Restrict);
- })
- .Annotation("MySql:CharSet", "utf8mb4");
-
- migrationBuilder.CreateIndex(
- name: "IX_ItemsList_MatID",
- table: "ItemsList",
- column: "MatId");
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "ItemsList");
-
- migrationBuilder.DropTable(
- name: "Materials");
- }
- }
-}
diff --git a/MagMan.Data.Tenant/Migrations/20231222180523_AddMagBaseObj01.Designer.cs b/MagMan.Data.Tenant/Migrations/20231222180523_AddMagBaseObj01.Designer.cs
deleted file mode 100644
index a01a8e0..0000000
--- a/MagMan.Data.Tenant/Migrations/20231222180523_AddMagBaseObj01.Designer.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-//
-using System;
-using MagMan.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace MagMan.Data.Tenant.Migrations
-{
- [DbContext(typeof(MagManContext))]
- [Migration("20231222180523_AddMagBaseObj01")]
- partial class AddMagBaseObj01
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "6.0.25")
- .HasAnnotation("Relational:MaxIdentifierLength", 64);
-
- modelBuilder.Entity("MagMan.Data.DbModels.ConfigModel", b =>
- {
- b.Property("KeyName")
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasColumnOrder(0);
-
- b.Property("Note")
- .IsRequired()
- .HasMaxLength(250)
- .HasColumnType("varchar(250)")
- .HasColumnOrder(3);
-
- b.Property("Val")
- .IsRequired()
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasColumnOrder(1);
-
- b.Property("ValStd")
- .IsRequired()
- .HasMaxLength(50)
- .HasColumnType("varchar(50)")
- .HasColumnOrder(2)
- .HasComment("Valore di default/riferimento per la variabile");
-
- b.HasKey("KeyName");
-
- b.ToTable("Config");
- });
-
- modelBuilder.Entity("MagMan.Data.DbModels.ItemModel", b =>
- {
- b.Property("RawItemId")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- b.Property("DtMod")
- .HasColumnType("datetime(6)");
-
- b.Property("IsRemn")
- .HasColumnType("tinyint(1)");
-
- b.Property("LMm")
- .HasColumnType("decimal(65,30)");
-
- b.Property("Location")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.Property("MatId")
- .HasColumnType("int");
-
- b.Property("Note")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.Property("QtyAvail")
- .HasColumnType("int");
-
- b.Property("HMm")
- .HasColumnType("decimal(65,30)");
-
- b.Property("WMm")
- .HasColumnType("decimal(65,30)");
-
- b.HasKey("RawItemId");
-
- b.HasIndex("MatId");
-
- b.ToTable("ItemsList");
- });
-
- modelBuilder.Entity("MagMan.Data.DbModels.MaterialModel", b =>
- {
- b.Property("MatId")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- b.Property("ApprovDate")
- .HasColumnType("datetime(6)");
-
- b.Property("ApprovUser")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.Property("LMm")
- .HasColumnType("decimal(65,30)");
-
- b.Property("MatDesc")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.Property("MatExtCode")
- .HasColumnType("int");
-
- b.Property("HMm")
- .HasColumnType("decimal(65,30)");
-
- b.Property("WMm")
- .HasColumnType("decimal(65,30)");
-
- b.HasKey("MatId");
-
- b.ToTable("Materials");
- });
-
- modelBuilder.Entity("MagMan.Data.DbModels.MovMagModel", b =>
- {
- b.Property("MovID")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- b.Property("DtRec")
- .HasColumnType("datetime(6)");
-
- b.Property("RawItemId")
- .HasColumnType("int");
-
- b.Property("QtyRec")
- .HasColumnType("int");
-
- b.Property("UserId")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.HasKey("MovID");
-
- b.HasIndex("RawItemId");
-
- b.ToTable("MovMag");
- });
-
- modelBuilder.Entity("MagMan.Data.DbModels.PrintJobQueueModel", b =>
- {
- b.Property("IdxPrintJob")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- b.Property("DtEnd")
- .HasColumnType("datetime(6)");
-
- b.Property("DtLastTry")
- .HasColumnType("datetime(6)");
-
- b.Property("DtStart")
- .HasColumnType("datetime(6)");
-
- b.Property("KeyParam")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.Property("PrtName")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.Property("Stato")
- .HasColumnType("int");
-
- b.Property("TipoReport")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.HasKey("IdxPrintJob");
-
- b.ToTable("PrintJobQueue");
- });
-
- modelBuilder.Entity("MagMan.Data.DbModels.ItemModel", b =>
- {
- b.HasOne("MagMan.Data.DbModels.MaterialModel", "MaterialNav")
- .WithMany("RawItemList")
- .HasForeignKey("MatId")
- .OnDelete(DeleteBehavior.Restrict)
- .IsRequired();
-
- b.Navigation("MaterialNav");
- });
-
- modelBuilder.Entity("MagMan.Data.DbModels.MovMagModel", b =>
- {
- b.HasOne("MagMan.Data.DbModels.ItemModel", "ITemNav")
- .WithMany()
- .HasForeignKey("RawItemId")
- .OnDelete(DeleteBehavior.Restrict)
- .IsRequired();
-
- b.Navigation("ITemNav");
- });
-
- modelBuilder.Entity("MagMan.Data.DbModels.MaterialModel", b =>
- {
- b.Navigation("RawItemList");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/MagMan.Data.Tenant/Migrations/20231222180523_AddMagBaseObj01.cs b/MagMan.Data.Tenant/Migrations/20231222180523_AddMagBaseObj01.cs
deleted file mode 100644
index fc35790..0000000
--- a/MagMan.Data.Tenant/Migrations/20231222180523_AddMagBaseObj01.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace MagMan.Data.Tenant.Migrations
-{
- public partial class AddMagBaseObj01 : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.CreateTable(
- name: "MovMag",
- columns: table => new
- {
- MovID = table.Column(type: "int", nullable: false)
- .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
- DtRec = table.Column(type: "datetime(6)", nullable: false),
- ItemID = table.Column(type: "int", nullable: false),
- QtyRec = table.Column(type: "int", nullable: false),
- UserId = table.Column(type: "longtext", nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4")
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_MovMag", x => x.MovID);
- table.ForeignKey(
- name: "FK_MovMag_ItemsList_ItemID",
- column: x => x.ItemID,
- principalTable: "ItemsList",
- principalColumn: "RawItemId",
- onDelete: ReferentialAction.Restrict);
- })
- .Annotation("MySql:CharSet", "utf8mb4");
-
- migrationBuilder.CreateTable(
- name: "PrintJobQueue",
- columns: table => new
- {
- IdxPrintJob = table.Column(type: "int", nullable: false)
- .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
- TipoReport = table.Column(type: "longtext", nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4"),
- KeyParam = table.Column(type: "longtext", nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4"),
- PrtName = table.Column(type: "longtext", nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4"),
- DtStart = table.Column(type: "datetime(6)", nullable: false),
- DtEnd = table.Column(type: "datetime(6)", nullable: true),
- Stato = table.Column(type: "int", nullable: false),
- DtLastTry = table.Column(type: "datetime(6)", nullable: true)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_PrintJobQueue", x => x.IdxPrintJob);
- })
- .Annotation("MySql:CharSet", "utf8mb4");
-
- migrationBuilder.CreateIndex(
- name: "IX_MovMag_ItemID",
- table: "MovMag",
- column: "RawItemId");
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "MovMag");
-
- migrationBuilder.DropTable(
- name: "PrintJobQueue");
- }
- }
-}
diff --git a/MagMan.Data.Tenant/Migrations/20240118161406_AddRequestAndFixMag01.Designer.cs b/MagMan.Data.Tenant/Migrations/20240118161646_InitDb.Designer.cs
similarity index 71%
rename from MagMan.Data.Tenant/Migrations/20240118161406_AddRequestAndFixMag01.Designer.cs
rename to MagMan.Data.Tenant/Migrations/20240118161646_InitDb.Designer.cs
index 6dd42f6..f6c513d 100644
--- a/MagMan.Data.Tenant/Migrations/20240118161406_AddRequestAndFixMag01.Designer.cs
+++ b/MagMan.Data.Tenant/Migrations/20240118161646_InitDb.Designer.cs
@@ -11,8 +11,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace MagMan.Data.Tenant.Migrations
{
[DbContext(typeof(MagManContext))]
- [Migration("20240118161406_AddRequestAndFixMag01")]
- partial class AddRequestAndFixMag01
+ [Migration("20240118161646_InitDb")]
+ partial class InitDb
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
@@ -97,70 +97,6 @@ namespace MagMan.Data.Tenant.Migrations
b.ToTable("MaterialsList");
});
- modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
- {
- b.Property("MovID")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- b.Property("DtRec")
- .HasColumnType("datetime(6)");
-
- b.Property("ItemID")
- .HasColumnType("int");
-
- b.Property("QtyRec")
- .HasColumnType("int");
-
- b.Property("RawItemId")
- .HasColumnType("int");
-
- b.Property("UserId")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.HasKey("MovID");
-
- b.HasIndex("RawItemId");
-
- b.ToTable("MovMag");
- });
-
- modelBuilder.Entity("MagMan.Data.Tenant.DbModels.PrintJobQueueModel", b =>
- {
- b.Property("IdxPrintJob")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- b.Property("DtEnd")
- .HasColumnType("datetime(6)");
-
- b.Property("DtLastTry")
- .HasColumnType("datetime(6)");
-
- b.Property("DtStart")
- .HasColumnType("datetime(6)");
-
- b.Property("KeyParam")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.Property("PrtName")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.Property("Stato")
- .HasColumnType("int");
-
- b.Property("TipoReport")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.HasKey("IdxPrintJob");
-
- b.ToTable("PrintJobQueue");
- });
-
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.Property("RawItemId")
@@ -243,16 +179,6 @@ namespace MagMan.Data.Tenant.Migrations
b.ToTable("RequestPlan");
});
- modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
- {
- b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ITemNav")
- .WithMany()
- .HasForeignKey("RawItemId")
- .OnDelete(DeleteBehavior.Restrict);
-
- b.Navigation("ITemNav");
- });
-
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.MaterialModel", "MaterialNav")
diff --git a/MagMan.Data.Tenant/Migrations/20240118161406_AddRequestAndFixMag01.cs b/MagMan.Data.Tenant/Migrations/20240118161646_InitDb.cs
similarity index 58%
rename from MagMan.Data.Tenant/Migrations/20240118161406_AddRequestAndFixMag01.cs
rename to MagMan.Data.Tenant/Migrations/20240118161646_InitDb.cs
index 7e84ab9..2760326 100644
--- a/MagMan.Data.Tenant/Migrations/20240118161406_AddRequestAndFixMag01.cs
+++ b/MagMan.Data.Tenant/Migrations/20240118161646_InitDb.cs
@@ -6,34 +6,12 @@ using Microsoft.EntityFrameworkCore.Migrations;
namespace MagMan.Data.Tenant.Migrations
{
- public partial class AddRequestAndFixMag01 : Migration
+ public partial class InitDb : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
- migrationBuilder.DropForeignKey(
- name: "FK_MovMag_ItemsList_RawItemId",
- table: "MovMag");
-
- migrationBuilder.DropTable(
- name: "ItemsList");
-
- migrationBuilder.DropTable(
- name: "Materials");
-
- migrationBuilder.AlterColumn(
- name: "RawItemId",
- table: "MovMag",
- type: "int",
- nullable: true,
- oldClrType: typeof(int),
- oldType: "int");
-
- migrationBuilder.AddColumn(
- name: "ItemID",
- table: "MovMag",
- type: "int",
- nullable: false,
- defaultValue: 0);
+ migrationBuilder.AlterDatabase()
+ .Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable(
name: "AliasList",
@@ -52,6 +30,25 @@ namespace MagMan.Data.Tenant.Migrations
})
.Annotation("MySql:CharSet", "utf8mb4");
+ migrationBuilder.CreateTable(
+ name: "Config",
+ columns: table => new
+ {
+ KeyName = table.Column(type: "varchar(50)", maxLength: 50, nullable: false)
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ Val = table.Column(type: "varchar(50)", maxLength: 50, nullable: false)
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ ValStd = table.Column(type: "varchar(50)", maxLength: 50, nullable: false, comment: "Valore di default/riferimento per la variabile")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ Note = table.Column(type: "varchar(250)", maxLength: 250, nullable: false)
+ .Annotation("MySql:CharSet", "utf8mb4")
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_Config", x => x.KeyName);
+ })
+ .Annotation("MySql:CharSet", "utf8mb4");
+
migrationBuilder.CreateTable(
name: "MaterialsList",
columns: table => new
@@ -137,25 +134,16 @@ namespace MagMan.Data.Tenant.Migrations
name: "IX_RawItemList_MatId",
table: "RawItemList",
column: "MatId");
-
- migrationBuilder.AddForeignKey(
- name: "FK_MovMag_RawItemList_RawItemId",
- table: "MovMag",
- column: "RawItemId",
- principalTable: "RawItemList",
- principalColumn: "RawItemId",
- onDelete: ReferentialAction.Restrict);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
- migrationBuilder.DropForeignKey(
- name: "FK_MovMag_RawItemList_RawItemId",
- table: "MovMag");
-
migrationBuilder.DropTable(
name: "AliasList");
+ migrationBuilder.DropTable(
+ name: "Config");
+
migrationBuilder.DropTable(
name: "RawItemList");
@@ -167,85 +155,6 @@ namespace MagMan.Data.Tenant.Migrations
migrationBuilder.DropTable(
name: "MaterialsList");
-
- migrationBuilder.DropColumn(
- name: "ItemID",
- table: "MovMag");
-
- migrationBuilder.AlterColumn(
- name: "RawItemId",
- table: "MovMag",
- type: "int",
- nullable: false,
- defaultValue: 0,
- oldClrType: typeof(int),
- oldType: "int",
- oldNullable: true);
-
- migrationBuilder.CreateTable(
- name: "Materials",
- columns: table => new
- {
- MatId = table.Column(type: "int", nullable: false)
- .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
- ApprovDate = table.Column(type: "datetime(6)", nullable: false),
- ApprovUser = table.Column(type: "longtext", nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4"),
- HMm = table.Column(type: "decimal(65,30)", nullable: false),
- LMm = table.Column(type: "decimal(65,30)", nullable: false),
- MatDesc = table.Column(type: "longtext", nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4"),
- MatExtCode = table.Column(type: "int", nullable: false),
- WMm = table.Column(type: "decimal(65,30)", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Materials", x => x.MatId);
- })
- .Annotation("MySql:CharSet", "utf8mb4");
-
- migrationBuilder.CreateTable(
- name: "ItemsList",
- columns: table => new
- {
- RawItemId = table.Column(type: "int", nullable: false)
- .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
- MatId = table.Column(type: "int", nullable: false),
- DtMod = table.Column(type: "datetime(6)", nullable: false),
- HMm = table.Column(type: "decimal(65,30)", nullable: false),
- IsRemn = table.Column(type: "tinyint(1)", nullable: false),
- LMm = table.Column(type: "decimal(65,30)", nullable: false),
- Location = table.Column(type: "longtext", nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4"),
- Note = table.Column(type: "longtext", nullable: false)
- .Annotation("MySql:CharSet", "utf8mb4"),
- QtyAvail = table.Column(type: "int", nullable: false),
- WMm = table.Column(type: "decimal(65,30)", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_ItemsList", x => x.RawItemId);
- table.ForeignKey(
- name: "FK_ItemsList_Materials_MatId",
- column: x => x.MatId,
- principalTable: "Materials",
- principalColumn: "MatId",
- onDelete: ReferentialAction.Restrict);
- })
- .Annotation("MySql:CharSet", "utf8mb4");
-
- migrationBuilder.CreateIndex(
- name: "IX_ItemsList_MatId",
- table: "ItemsList",
- column: "MatId");
-
- migrationBuilder.AddForeignKey(
- name: "FK_MovMag_ItemsList_RawItemId",
- table: "MovMag",
- column: "RawItemId",
- principalTable: "ItemsList",
- principalColumn: "RawItemId",
- onDelete: ReferentialAction.Restrict);
}
}
}
diff --git a/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs b/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs
index baec33d..fea0ff6 100644
--- a/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs
+++ b/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs
@@ -95,70 +95,6 @@ namespace MagMan.Data.Tenant.Migrations
b.ToTable("MaterialsList");
});
- modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
- {
- b.Property("MovID")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- b.Property("DtRec")
- .HasColumnType("datetime(6)");
-
- b.Property("ItemID")
- .HasColumnType("int");
-
- b.Property("QtyRec")
- .HasColumnType("int");
-
- b.Property("RawItemId")
- .HasColumnType("int");
-
- b.Property("UserId")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.HasKey("MovID");
-
- b.HasIndex("RawItemId");
-
- b.ToTable("MovMag");
- });
-
- modelBuilder.Entity("MagMan.Data.Tenant.DbModels.PrintJobQueueModel", b =>
- {
- b.Property("IdxPrintJob")
- .ValueGeneratedOnAdd()
- .HasColumnType("int");
-
- b.Property("DtEnd")
- .HasColumnType("datetime(6)");
-
- b.Property("DtLastTry")
- .HasColumnType("datetime(6)");
-
- b.Property("DtStart")
- .HasColumnType("datetime(6)");
-
- b.Property("KeyParam")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.Property("PrtName")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.Property("Stato")
- .HasColumnType("int");
-
- b.Property("TipoReport")
- .IsRequired()
- .HasColumnType("longtext");
-
- b.HasKey("IdxPrintJob");
-
- b.ToTable("PrintJobQueue");
- });
-
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.Property("RawItemId")
@@ -241,16 +177,6 @@ namespace MagMan.Data.Tenant.Migrations
b.ToTable("RequestPlan");
});
- modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
- {
- b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ITemNav")
- .WithMany()
- .HasForeignKey("RawItemId")
- .OnDelete(DeleteBehavior.Restrict);
-
- b.Navigation("ITemNav");
- });
-
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.MaterialModel", "MaterialNav")
diff --git a/README.md b/README.md
index ecd1248..eaa78d9 100644
--- a/README.md
+++ b/README.md
@@ -135,11 +135,20 @@ Ogni nuovo user dovrà poi essere associato al bucket del cliente tramite un cod
+## Gestione Sync DB
+
+E' stato implementato un nuovo set di tabelle sul DB (locale) di EgtBeamWall per gestire materiali e grezzi non tramite file ma tramite DB e così gettare la base per la gestione del sync locale/cloud.
+
+Nello stesso tempo, il sito web, oltre a proporre pagine utente, implementa web API rest che, tramite apposita libreria di comuncazione SDK (messa sul repo nuget aziendale) permette di comuncare, sincronizzare e gestire i dati.
+
+
+
## Revisione documento
Version | Date | Editor | Note
:--: |----------|----- | ----:
+ 0.5 | 2024.01.18 | S.E. Locatelli | Prime note sync DB online/locale
0.3 | 2024.01.10 | S.E. Locatelli | Revisione modalità multi-tenant
0.2 | 2024.01.05 | S.E. Locatelli | update ruoli e workflow
0.1 | 2023.12.28 | S.E. Locatelli | Prima revisione documento
diff --git a/README.pdf b/README.pdf
index 7f550ac..660cfaf 100644
Binary files a/README.pdf and b/README.pdf differ