修改模型,取消外键关联

This commit is contained in:
zhougf committed 2024-12-24 19:08:25 +08:00
1 parent 45bc46a828
commit d23544c9d8
27 files changed
+22 -48

No files matched your search

@@ -90,7 +90,6 @@ namespace HHWMS.Web.Controllers
{ {
var vm = Wtm.CreateVM<ReceiptDetailVM>(passInit: true); var vm = Wtm.CreateVM<ReceiptDetailVM>(passInit: true);
vm.Entity.HeaderId = id; vm.Entity.HeaderId = id;
vm.Entity.ReceiptHeader = new ReceiptHeader();
//vm.Entity.ReceiptHeader.Code = vm.DC.Set<ReceiptHeader>().Find(id).Code; //vm.Entity.ReceiptHeader.Code = vm.DC.Set<ReceiptHeader>().Find(id).Code;
return PartialView(vm); return PartialView(vm);
} }
@@ -66,7 +66,7 @@ namespace HHWMS.Web
.Select(x => new ReceiptDetail_View .Select(x => new ReceiptDetail_View
{ {
ID = x.ID, ID = x.ID,
Code_view = x.ReceiptHeader.Code, Code_view = x.HeaderId.ToString(),
ZoneCode = x.ZoneCode, ZoneCode = x.ZoneCode,
MaterialCode = x.MaterialCode, MaterialCode = x.MaterialCode,
MaterialType = x.MaterialType, MaterialType = x.MaterialType,
@@ -63,7 +63,7 @@ namespace HHWMS.Web
.Select(x => new ReceiptDetail_View .Select(x => new ReceiptDetail_View
{ {
ID = x.ID, ID = x.ID,
Code_view = x.ReceiptHeader.Code, Code_view = x.HeaderId.ToString(),
ZoneCode = x.ZoneCode, ZoneCode = x.ZoneCode,
MaterialCode = x.MaterialCode, MaterialCode = x.MaterialCode,
MaterialType = x.MaterialType, MaterialType = x.MaterialType,
@@ -11,7 +11,6 @@ namespace HHWMS.Web
public ReceiptDetailVM() public ReceiptDetailVM()
{ {
SetInclude(x => x.ReceiptHeader);
} }
protected override void InitVM() protected override void InitVM()
@@ -4,7 +4,7 @@
<wt:form vm="@Model"> <wt:form vm="@Model">
<wt:quote>@Localizer["Sys.DeleteConfirm"]</wt:quote> <wt:quote>@Localizer["Sys.DeleteConfirm"]</wt:quote>
<wt:row items-per-row="ItemsPerRowEnum.Two"> <wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.ReceiptHeader.Code" /> <wt:display field="Entity.HeaderId" />
<wt:display field="Entity.ZoneCode" /> <wt:display field="Entity.ZoneCode" />
<wt:display field="Entity.MaterialCode" /> <wt:display field="Entity.MaterialCode" />
<wt:display field="Entity.MaterialType" /> <wt:display field="Entity.MaterialType" />
@@ -3,7 +3,7 @@
<wt:form vm="@Model"> <wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two"> <wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.ReceiptHeader.Code" /> <wt:display field="Entity.HeaderId" />
<wt:display field="Entity.ZoneCode" /> <wt:display field="Entity.ZoneCode" />
<wt:display field="Entity.MaterialCode" /> <wt:display field="Entity.MaterialCode" />
<wt:display field="Entity.MaterialType" /> <wt:display field="Entity.MaterialType" />
@@ -115,7 +115,7 @@ namespace HHWMS.Web
.Select(x => new ShipmentDetail_View .Select(x => new ShipmentDetail_View
{ {
ID = x.ID, ID = x.ID,
Code_view = x.ShipmentHeader.Code, Code_view = x.HeaderId.ToString(),
ZoneCode = x.ZoneCode, ZoneCode = x.ZoneCode,
MaterialCode = x.MaterialCode, MaterialCode = x.MaterialCode,
MaterialType = x.MaterialType, MaterialType = x.MaterialType,
@@ -11,7 +11,6 @@ namespace HHWMS.Web
public ShipmentDetailVM() public ShipmentDetailVM()
{ {
SetInclude(x => x.ShipmentHeader);
} }
protected override void InitVM() protected override void InitVM()
@@ -4,7 +4,7 @@
<wt:form vm="@Model"> <wt:form vm="@Model">
<wt:quote>@Localizer["Sys.DeleteConfirm"]</wt:quote> <wt:quote>@Localizer["Sys.DeleteConfirm"]</wt:quote>
<wt:row items-per-row="ItemsPerRowEnum.Two"> <wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.ShipmentHeader.Code" /> <wt:display field="Entity.HeaderId" />
<wt:display field="Entity.ZoneCode" /> <wt:display field="Entity.ZoneCode" />
<wt:display field="Entity.MaterialCode" /> <wt:display field="Entity.MaterialCode" />
<wt:display field="Entity.MaterialType" /> <wt:display field="Entity.MaterialType" />
@@ -3,7 +3,7 @@
<wt:form vm="@Model"> <wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two"> <wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.ShipmentHeader.Code" /> <wt:display field="Entity.HeaderId" />
<wt:display field="Entity.ZoneCode" /> <wt:display field="Entity.ZoneCode" />
<wt:display field="Entity.MaterialCode" /> <wt:display field="Entity.MaterialCode" />
<wt:display field="Entity.MaterialType" /> <wt:display field="Entity.MaterialType" />
@@ -60,7 +60,7 @@ namespace HHWMS.Web
.Select(x => new TaskDetail_View .Select(x => new TaskDetail_View
{ {
ID = x.ID, ID = x.ID,
TaskNo_view = x.TaskHeader.TaskNo, TaskNo_view = x.HeaderId.ToString(),
OrderCode = x.OrderCode, OrderCode = x.OrderCode,
OrderDetailId = x.OrderDetailId, OrderDetailId = x.OrderDetailId,
MaterialCode = x.MaterialCode, MaterialCode = x.MaterialCode,
@@ -50,7 +50,7 @@ namespace HHWMS.Web
.Select(x => new TaskDetail_View .Select(x => new TaskDetail_View
{ {
ID = x.ID, ID = x.ID,
TaskNo_view = $"{x.TaskHeader.TaskNo}-{x.FromLocation}", TaskNo_view = $"{x.HeaderId}-{x.FromLocation}",
OrderCode = x.OrderCode, OrderCode = x.OrderCode,
OrderDetailId = x.OrderDetailId, OrderDetailId = x.OrderDetailId,
MaterialCode = x.MaterialCode, MaterialCode = x.MaterialCode,
@@ -16,7 +16,6 @@ namespace HHWMS.Web
public TaskDetailVM() public TaskDetailVM()
{ {
SetInclude(x => x.TaskHeader);
} }
protected override void InitVM() protected override void InitVM()
@@ -4,7 +4,7 @@
<wt:form vm="@Model"> <wt:form vm="@Model">
<wt:quote>@Localizer["Sys.DeleteConfirm"]</wt:quote> <wt:quote>@Localizer["Sys.DeleteConfirm"]</wt:quote>
<wt:row items-per-row="ItemsPerRowEnum.Two"> <wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.TaskHeader.TaskNo" /> <wt:display field="Entity.HeaderId" />
<wt:display field="Entity.OrderCode" /> <wt:display field="Entity.OrderCode" />
<wt:display field="Entity.OrderDetailId" /> <wt:display field="Entity.OrderDetailId" />
<wt:display field="Entity.MaterialCode" /> <wt:display field="Entity.MaterialCode" />
@@ -3,7 +3,7 @@
<wt:form vm="@Model"> <wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two"> <wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.TaskHeader.TaskNo" /> <wt:display field="Entity.HeaderId" />
<wt:display field="Entity.OrderCode" /> <wt:display field="Entity.OrderCode" />
<wt:display field="Entity.OrderDetailId" /> <wt:display field="Entity.OrderDetailId" />
<wt:display field="Entity.MaterialCode" /> <wt:display field="Entity.MaterialCode" />
+1 -16
View File
@@ -96,21 +96,6 @@ namespace HHWMS.Web
{ {
base.OnModelCreating(modelBuilder); base.OnModelCreating(modelBuilder);
modelBuilder.Entity<ReceiptHeader>()
.HasMany(e => e.ReceiptDetails)
.WithOne(e => e.ReceiptHeader)
.HasForeignKey("HeaderId");
modelBuilder.Entity<ShipmentHeader>()
.HasMany(e => e.ShipmentDetails)
.WithOne(e => e.ShipmentHeader)
.HasForeignKey("HeaderId");
modelBuilder.Entity<TaskHeader>()
.HasMany(e => e.TaskDetails)
.WithOne(e => e.TaskHeader)
.HasForeignKey("HeaderId");
// ef生成表 添加字段注释,只有本项目的表才添加,需要在DisplayAttribute,添加Description // ef生成表 添加字段注释,只有本项目的表才添加,需要在DisplayAttribute,添加Description
var ddd = modelBuilder.Model.GetEntityTypes(); var ddd = modelBuilder.Model.GetEntityTypes();
ddd = ddd.Where(x => x.ClrType.FullName.Contains("HHWMS.Web")).ToList(); ddd = ddd.Where(x => x.ClrType.FullName.Contains("HHWMS.Web")).ToList();
@@ -138,7 +123,7 @@ namespace HHWMS.Web
{ {
public DataContext CreateDbContext(string[] args) public DataContext CreateDbContext(string[] args)
{ {
return new DataContext("Server=127.0.0.1;Port=3306;Database=WMS;Uid=root;Password=abc123*;Character Set=utf8mb4;", DBTypeEnum.MySql); return new DataContext("Server=127.0.0.1;Port=3306;Database=WMS2;Uid=root;Password=abc123*;Character Set=utf8mb4;", DBTypeEnum.MySql);
} }
} }
} }
@@ -16,8 +16,6 @@ namespace HHWMS.Web.Models
[Display(Name = "Inventory.ReceiptCode")] [Display(Name = "Inventory.ReceiptCode")]
public int HeaderId { get; set; } public int HeaderId { get; set; }
public ReceiptHeader ReceiptHeader { get; set; }
[Display(Name = "Task.ZoneCode", Description = "库区")] [Display(Name = "Task.ZoneCode", Description = "库区")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string ZoneCode { get; set; } public string ZoneCode { get; set; }
@@ -10,7 +10,6 @@ namespace HHWMS.Web.Models
public class ReceiptDetailHistory : BasePoco public class ReceiptDetailHistory : BasePoco
{ {
[Key] [Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public new int ID { get; set; } public new int ID { get; set; }
[Display(Name = "Inventory.ReceiptCode")] [Display(Name = "Inventory.ReceiptCode")]
@@ -53,7 +53,5 @@ namespace HHWMS.Web.Models
[Display(Name = "_Admin.Remark", Description = "备注")] [Display(Name = "_Admin.Remark", Description = "备注")]
public string Remark { get; set; } public string Remark { get; set; }
public ICollection<ReceiptDetail> ReceiptDetails { get; set; }
} }
} }
@@ -16,8 +16,6 @@ namespace HHWMS.Web.Models
[Display(Name = "Ship.ShipmentCode")] [Display(Name = "Ship.ShipmentCode")]
public int HeaderId { get; set; } public int HeaderId { get; set; }
public ShipmentHeader ShipmentHeader { get; set; }
[Display(Name = "Task.ZoneCode", Description = "库区")] [Display(Name = "Task.ZoneCode", Description = "库区")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string ZoneCode { get; set; } public string ZoneCode { get; set; }
@@ -10,7 +10,6 @@ namespace HHWMS.Web.Models
public class ShipmentDetailHistory : BasePoco public class ShipmentDetailHistory : BasePoco
{ {
[Key] [Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public new int ID { get; set; } public new int ID { get; set; }
[Display(Name = "Ship.ShipmentCode")] [Display(Name = "Ship.ShipmentCode")]
@@ -49,7 +49,5 @@ namespace HHWMS.Web.Models
[Display(Name = "_Admin.Remark", Description = "备注")] [Display(Name = "_Admin.Remark", Description = "备注")]
public string Remark { get; set; } public string Remark { get; set; }
public ICollection<ShipmentDetail> ShipmentDetails { get; set; }
} }
} }
+1 -2
View File
@@ -15,8 +15,6 @@ namespace HHWMS.Web.Models
[Display(Name = "Task.TaskNo", Description = "任务号")] [Display(Name = "Task.TaskNo", Description = "任务号")]
public int HeaderId { get; set; } public int HeaderId { get; set; }
public TaskHeader TaskHeader { get; set; }
[Display(Name = "Inventory.ReceiptCode", Description = "单据编号")] [Display(Name = "Inventory.ReceiptCode", Description = "单据编号")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string OrderCode { get; set; } public string OrderCode { get; set; }
@@ -33,6 +31,7 @@ namespace HHWMS.Web.Models
public string MaterialName { get; set; } public string MaterialName { get; set; }
[Display(Name = "Inventory.MaterialSpec", Description = "物料规格")] [Display(Name = "Inventory.MaterialSpec", Description = "物料规格")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string MaterialSpec { get; set; } public string MaterialSpec { get; set; }
[Display(Name = "Inventory.MaterialUnit", Description = "单位")] [Display(Name = "Inventory.MaterialUnit", Description = "单位")]
+1 -1
View File
@@ -9,7 +9,6 @@ namespace HHWMS.Web.Models
public class TaskDetailHistory : BasePoco public class TaskDetailHistory : BasePoco
{ {
[Key] [Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public new int ID { get; set; } public new int ID { get; set; }
[Display(Name = "Task.TaskNo", Description = "任务号")] [Display(Name = "Task.TaskNo", Description = "任务号")]
@@ -31,6 +30,7 @@ namespace HHWMS.Web.Models
public string MaterialName { get; set; } public string MaterialName { get; set; }
[Display(Name = "Inventory.MaterialSpec", Description = "物料规格")] [Display(Name = "Inventory.MaterialSpec", Description = "物料规格")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string MaterialSpec { get; set; } public string MaterialSpec { get; set; }
[Display(Name = "Inventory.MaterialUnit", Description = "单位")] [Display(Name = "Inventory.MaterialUnit", Description = "单位")]
+1 -2
View File
@@ -56,7 +56,6 @@ namespace HHWMS.Web.Models
[Display(Name = "Task.ErrorMsg", Description = "错误信息")] [Display(Name = "Task.ErrorMsg", Description = "错误信息")]
public string ErrorMsg { get; set; } public string ErrorMsg { get; set; }
public ICollection<TaskDetail> TaskDetails { get; set; }
} }
} }
+6 -1
View File
@@ -1,10 +1,15 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
using System.Security.Policy;
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core;
namespace HHWMS.Web.Models namespace HHWMS.Web.Models
{ {
[Index(nameof(TaskNo), IsUnique = true)]
[Table("TaskHeaderHistory")] [Table("TaskHeaderHistory")]
public class TaskHeaderHistory : BasePoco public class TaskHeaderHistory : BasePoco
{ {
@@ -50,6 +55,6 @@ namespace HHWMS.Web.Models
[Display(Name = "Task.ErrorMsg", Description = "错误信息")] [Display(Name = "Task.ErrorMsg", Description = "错误信息")]
public string ErrorMsg { get; set; } public string ErrorMsg { get; set; }
} }
} }
+1 -1
View File
@@ -24,7 +24,7 @@
"Connections": [ "Connections": [
{ {
"Key": "default", "Key": "default",
"Value": "Server=127.0.0.1;Port=3306;Database=WMS;Uid=root;Password=abc123*;Character Set=utf8mb4;", "Value": "Server=127.0.0.1;Port=3306;Database=WMS2;Uid=root;Password=abc123*;Character Set=utf8mb4;",
"DBType": "mysql" "DBType": "mysql"
}, },
// { // {