修改模型,取消外键关联

This commit is contained in:
Mac mini git server 2024-12-24 19:08:25 +08:00
parent 45bc46a828
commit d23544c9d8
27 changed files with 22 additions and 48 deletions

View File

@ -90,7 +90,6 @@ namespace HHWMS.Web.Controllers
{
var vm = Wtm.CreateVM<ReceiptDetailVM>(passInit: true);
vm.Entity.HeaderId = id;
vm.Entity.ReceiptHeader = new ReceiptHeader();
//vm.Entity.ReceiptHeader.Code = vm.DC.Set<ReceiptHeader>().Find(id).Code;
return PartialView(vm);
}

View File

@ -66,7 +66,7 @@ namespace HHWMS.Web
.Select(x => new ReceiptDetail_View
{
ID = x.ID,
Code_view = x.ReceiptHeader.Code,
Code_view = x.HeaderId.ToString(),
ZoneCode = x.ZoneCode,
MaterialCode = x.MaterialCode,
MaterialType = x.MaterialType,

View File

@ -63,7 +63,7 @@ namespace HHWMS.Web
.Select(x => new ReceiptDetail_View
{
ID = x.ID,
Code_view = x.ReceiptHeader.Code,
Code_view = x.HeaderId.ToString(),
ZoneCode = x.ZoneCode,
MaterialCode = x.MaterialCode,
MaterialType = x.MaterialType,

View File

@ -11,7 +11,6 @@ namespace HHWMS.Web
public ReceiptDetailVM()
{
SetInclude(x => x.ReceiptHeader);
}
protected override void InitVM()

View File

@ -4,7 +4,7 @@
<wt:form vm="@Model">
<wt:quote>@Localizer["Sys.DeleteConfirm"]</wt:quote>
<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.MaterialCode" />
<wt:display field="Entity.MaterialType" />

View File

@ -3,7 +3,7 @@
<wt:form vm="@Model">
<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.MaterialCode" />
<wt:display field="Entity.MaterialType" />

View File

@ -115,7 +115,7 @@ namespace HHWMS.Web
.Select(x => new ShipmentDetail_View
{
ID = x.ID,
Code_view = x.ShipmentHeader.Code,
Code_view = x.HeaderId.ToString(),
ZoneCode = x.ZoneCode,
MaterialCode = x.MaterialCode,
MaterialType = x.MaterialType,

View File

@ -11,7 +11,6 @@ namespace HHWMS.Web
public ShipmentDetailVM()
{
SetInclude(x => x.ShipmentHeader);
}
protected override void InitVM()

View File

@ -4,7 +4,7 @@
<wt:form vm="@Model">
<wt:quote>@Localizer["Sys.DeleteConfirm"]</wt:quote>
<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.MaterialCode" />
<wt:display field="Entity.MaterialType" />

View File

@ -3,7 +3,7 @@
<wt:form vm="@Model">
<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.MaterialCode" />
<wt:display field="Entity.MaterialType" />

View File

@ -60,7 +60,7 @@ namespace HHWMS.Web
.Select(x => new TaskDetail_View
{
ID = x.ID,
TaskNo_view = x.TaskHeader.TaskNo,
TaskNo_view = x.HeaderId.ToString(),
OrderCode = x.OrderCode,
OrderDetailId = x.OrderDetailId,
MaterialCode = x.MaterialCode,

View File

@ -50,7 +50,7 @@ namespace HHWMS.Web
.Select(x => new TaskDetail_View
{
ID = x.ID,
TaskNo_view = $"{x.TaskHeader.TaskNo}-{x.FromLocation}",
TaskNo_view = $"{x.HeaderId}-{x.FromLocation}",
OrderCode = x.OrderCode,
OrderDetailId = x.OrderDetailId,
MaterialCode = x.MaterialCode,

View File

@ -16,7 +16,6 @@ namespace HHWMS.Web
public TaskDetailVM()
{
SetInclude(x => x.TaskHeader);
}
protected override void InitVM()

View File

@ -4,7 +4,7 @@
<wt:form vm="@Model">
<wt:quote>@Localizer["Sys.DeleteConfirm"]</wt:quote>
<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.OrderDetailId" />
<wt:display field="Entity.MaterialCode" />

View File

@ -3,7 +3,7 @@
<wt:form vm="@Model">
<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.OrderDetailId" />
<wt:display field="Entity.MaterialCode" />

View File

@ -96,21 +96,6 @@ namespace HHWMS.Web
{
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
var ddd = modelBuilder.Model.GetEntityTypes();
ddd = ddd.Where(x => x.ClrType.FullName.Contains("HHWMS.Web")).ToList();
@ -138,7 +123,7 @@ namespace HHWMS.Web
{
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);
}
}
}

View File

@ -16,8 +16,6 @@ namespace HHWMS.Web.Models
[Display(Name = "Inventory.ReceiptCode")]
public int HeaderId { get; set; }
public ReceiptHeader ReceiptHeader { get; set; }
[Display(Name = "Task.ZoneCode", Description = "库区")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string ZoneCode { get; set; }

View File

@ -10,7 +10,6 @@ namespace HHWMS.Web.Models
public class ReceiptDetailHistory : BasePoco
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public new int ID { get; set; }
[Display(Name = "Inventory.ReceiptCode")]

View File

@ -53,7 +53,5 @@ namespace HHWMS.Web.Models
[Display(Name = "_Admin.Remark", Description = "备注")]
public string Remark { get; set; }
public ICollection<ReceiptDetail> ReceiptDetails { get; set; }
}
}

View File

@ -16,8 +16,6 @@ namespace HHWMS.Web.Models
[Display(Name = "Ship.ShipmentCode")]
public int HeaderId { get; set; }
public ShipmentHeader ShipmentHeader { get; set; }
[Display(Name = "Task.ZoneCode", Description = "库区")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string ZoneCode { get; set; }

View File

@ -10,7 +10,6 @@ namespace HHWMS.Web.Models
public class ShipmentDetailHistory : BasePoco
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public new int ID { get; set; }
[Display(Name = "Ship.ShipmentCode")]

View File

@ -49,7 +49,5 @@ namespace HHWMS.Web.Models
[Display(Name = "_Admin.Remark", Description = "备注")]
public string Remark { get; set; }
public ICollection<ShipmentDetail> ShipmentDetails { get; set; }
}
}

View File

@ -15,8 +15,6 @@ namespace HHWMS.Web.Models
[Display(Name = "Task.TaskNo", Description = "任务号")]
public int HeaderId { get; set; }
public TaskHeader TaskHeader { get; set; }
[Display(Name = "Inventory.ReceiptCode", Description = "单据编号")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string OrderCode { get; set; }
@ -33,6 +31,7 @@ namespace HHWMS.Web.Models
public string MaterialName { get; set; }
[Display(Name = "Inventory.MaterialSpec", Description = "物料规格")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string MaterialSpec { get; set; }
[Display(Name = "Inventory.MaterialUnit", Description = "单位")]

View File

@ -9,7 +9,6 @@ namespace HHWMS.Web.Models
public class TaskDetailHistory : BasePoco
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public new int ID { get; set; }
[Display(Name = "Task.TaskNo", Description = "任务号")]
@ -31,6 +30,7 @@ namespace HHWMS.Web.Models
public string MaterialName { get; set; }
[Display(Name = "Inventory.MaterialSpec", Description = "物料规格")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string MaterialSpec { get; set; }
[Display(Name = "Inventory.MaterialUnit", Description = "单位")]

View File

@ -56,7 +56,6 @@ namespace HHWMS.Web.Models
[Display(Name = "Task.ErrorMsg", Description = "错误信息")]
public string ErrorMsg { get; set; }
public ICollection<TaskDetail> TaskDetails { get; set; }
}
}

View File

@ -1,10 +1,15 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
using System.Security.Policy;
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using WalkingTec.Mvvm.Core;
namespace HHWMS.Web.Models
{
[Index(nameof(TaskNo), IsUnique = true)]
[Table("TaskHeaderHistory")]
public class TaskHeaderHistory : BasePoco
{
@ -50,6 +55,6 @@ namespace HHWMS.Web.Models
[Display(Name = "Task.ErrorMsg", Description = "错误信息")]
public string ErrorMsg { get; set; }
}
}

View File

@ -24,7 +24,7 @@
"Connections": [
{
"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"
},
// {