From d23544c9d814fcbfe1b7a15dfef9fb52d70c1c94 Mon Sep 17 00:00:00 2001 From: zhougf Date: Tue, 24 Dec 2024 19:08:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=A4=96=E9=94=AE=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ReceiptDetailController.cs | 1 - .../ReceiptDetailVMs/ReceiptDetailListVM.cs | 2 +- .../ReceiptDetailVMs/ReceiptDetailListVM2.cs | 2 +- .../ReceiptDetailVMs/ReceiptDetailVM.cs | 1 - .../Receipt/Views/ReceiptDetail/Delete.cshtml | 2 +- .../Receipt/Views/ReceiptDetail/Details.cshtml | 2 +- .../ShipmentDetailVMs/ShipmentDetailListVM.cs | 2 +- .../ShipmentDetailVMs/ShipmentDetailVM.cs | 1 - .../Shipment/Views/ShipmentDetail/Delete.cshtml | 2 +- .../Views/ShipmentDetail/Details.cshtml | 2 +- .../TaskDetailVMs/TaskDetailListVM.cs | 2 +- .../TaskDetailVMs/TaskDetailListVM2.cs | 2 +- .../ViewModels/TaskDetailVMs/TaskDetailVM.cs | 1 - .../TaskManage/Views/TaskDetail/Delete.cshtml | 2 +- .../TaskManage/Views/TaskDetail/Details.cshtml | 2 +- HHWMS.Web/DataContext.cs | 17 +---------------- HHWMS.Web/Models/Receipt/ReceiptDetail.cs | 2 -- .../Models/Receipt/ReceiptDetailHistory.cs | 1 - HHWMS.Web/Models/Receipt/ReceiptHeader.cs | 2 -- HHWMS.Web/Models/Shipment/ShipmentDetail.cs | 2 -- .../Models/Shipment/ShipmentDetailHistory.cs | 1 - HHWMS.Web/Models/Shipment/ShipmentHeader.cs | 2 -- HHWMS.Web/Models/Task/TaskDetail.cs | 3 +-- HHWMS.Web/Models/Task/TaskDetailHistory.cs | 2 +- HHWMS.Web/Models/Task/TaskHeader.cs | 3 +-- HHWMS.Web/Models/Task/TaskHeaderHistory.cs | 7 ++++++- HHWMS.Web/appsettings.json | 2 +- 27 files changed, 22 insertions(+), 48 deletions(-) diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs index 6dd37c9..211496c 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs @@ -90,7 +90,6 @@ namespace HHWMS.Web.Controllers { var vm = Wtm.CreateVM(passInit: true); vm.Entity.HeaderId = id; - vm.Entity.ReceiptHeader = new ReceiptHeader(); //vm.Entity.ReceiptHeader.Code = vm.DC.Set().Find(id).Code; return PartialView(vm); } diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs index e196665..b0e9436 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs @@ -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, diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs index 14ab660..3298689 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs @@ -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, diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailVM.cs index be19b08..dc9cb8b 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailVM.cs @@ -11,7 +11,6 @@ namespace HHWMS.Web public ReceiptDetailVM() { - SetInclude(x => x.ReceiptHeader); } protected override void InitVM() diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Delete.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Delete.cshtml index ed3fce0..b76b8be 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Delete.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Delete.cshtml @@ -4,7 +4,7 @@ @Localizer["Sys.DeleteConfirm"] - + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Details.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Details.cshtml index 5743325..4d77da1 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Details.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Details.cshtml @@ -3,7 +3,7 @@ - + diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs index 3d25241..615a44a 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs @@ -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, diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailVM.cs index c09d2a2..fd93541 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailVM.cs @@ -11,7 +11,6 @@ namespace HHWMS.Web public ShipmentDetailVM() { - SetInclude(x => x.ShipmentHeader); } protected override void InitVM() diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Delete.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Delete.cshtml index bb77d5c..5702572 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Delete.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Delete.cshtml @@ -4,7 +4,7 @@ @Localizer["Sys.DeleteConfirm"] - + diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Details.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Details.cshtml index 61ad9e3..6adbcb6 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Details.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Details.cshtml @@ -3,7 +3,7 @@ - + diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM.cs index 4ede4ab..36afd2d 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM.cs @@ -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, diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs index 7aeef57..4a96d28 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs @@ -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, diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailVM.cs index 4285bb5..463a7c4 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailVM.cs @@ -16,7 +16,6 @@ namespace HHWMS.Web public TaskDetailVM() { - SetInclude(x => x.TaskHeader); } protected override void InitVM() diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Delete.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Delete.cshtml index 841a0f3..46a6047 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Delete.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Delete.cshtml @@ -4,7 +4,7 @@ @Localizer["Sys.DeleteConfirm"] - + diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Details.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Details.cshtml index 23fb730..9b47e51 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Details.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Details.cshtml @@ -3,7 +3,7 @@ - + diff --git a/HHWMS.Web/DataContext.cs b/HHWMS.Web/DataContext.cs index 9dbe0e6..7cee9a6 100644 --- a/HHWMS.Web/DataContext.cs +++ b/HHWMS.Web/DataContext.cs @@ -96,21 +96,6 @@ namespace HHWMS.Web { base.OnModelCreating(modelBuilder); - modelBuilder.Entity() - .HasMany(e => e.ReceiptDetails) - .WithOne(e => e.ReceiptHeader) - .HasForeignKey("HeaderId"); - - modelBuilder.Entity() - .HasMany(e => e.ShipmentDetails) - .WithOne(e => e.ShipmentHeader) - .HasForeignKey("HeaderId"); - - modelBuilder.Entity() - .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); } } } diff --git a/HHWMS.Web/Models/Receipt/ReceiptDetail.cs b/HHWMS.Web/Models/Receipt/ReceiptDetail.cs index 65b9889..1cdd840 100644 --- a/HHWMS.Web/Models/Receipt/ReceiptDetail.cs +++ b/HHWMS.Web/Models/Receipt/ReceiptDetail.cs @@ -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; } diff --git a/HHWMS.Web/Models/Receipt/ReceiptDetailHistory.cs b/HHWMS.Web/Models/Receipt/ReceiptDetailHistory.cs index 4f0c44b..4843397 100644 --- a/HHWMS.Web/Models/Receipt/ReceiptDetailHistory.cs +++ b/HHWMS.Web/Models/Receipt/ReceiptDetailHistory.cs @@ -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")] diff --git a/HHWMS.Web/Models/Receipt/ReceiptHeader.cs b/HHWMS.Web/Models/Receipt/ReceiptHeader.cs index 9d1391e..0839d6c 100644 --- a/HHWMS.Web/Models/Receipt/ReceiptHeader.cs +++ b/HHWMS.Web/Models/Receipt/ReceiptHeader.cs @@ -53,7 +53,5 @@ namespace HHWMS.Web.Models [Display(Name = "_Admin.Remark", Description = "备注")] public string Remark { get; set; } - - public ICollection ReceiptDetails { get; set; } } } diff --git a/HHWMS.Web/Models/Shipment/ShipmentDetail.cs b/HHWMS.Web/Models/Shipment/ShipmentDetail.cs index 2b61c8e..72bef7c 100644 --- a/HHWMS.Web/Models/Shipment/ShipmentDetail.cs +++ b/HHWMS.Web/Models/Shipment/ShipmentDetail.cs @@ -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; } diff --git a/HHWMS.Web/Models/Shipment/ShipmentDetailHistory.cs b/HHWMS.Web/Models/Shipment/ShipmentDetailHistory.cs index e93e970..a3030d1 100644 --- a/HHWMS.Web/Models/Shipment/ShipmentDetailHistory.cs +++ b/HHWMS.Web/Models/Shipment/ShipmentDetailHistory.cs @@ -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")] diff --git a/HHWMS.Web/Models/Shipment/ShipmentHeader.cs b/HHWMS.Web/Models/Shipment/ShipmentHeader.cs index 2886d4c..a78fe84 100644 --- a/HHWMS.Web/Models/Shipment/ShipmentHeader.cs +++ b/HHWMS.Web/Models/Shipment/ShipmentHeader.cs @@ -49,7 +49,5 @@ namespace HHWMS.Web.Models [Display(Name = "_Admin.Remark", Description = "备注")] public string Remark { get; set; } - - public ICollection ShipmentDetails { get; set; } } } diff --git a/HHWMS.Web/Models/Task/TaskDetail.cs b/HHWMS.Web/Models/Task/TaskDetail.cs index 54bfaff..c5f2276 100644 --- a/HHWMS.Web/Models/Task/TaskDetail.cs +++ b/HHWMS.Web/Models/Task/TaskDetail.cs @@ -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 = "单位")] diff --git a/HHWMS.Web/Models/Task/TaskDetailHistory.cs b/HHWMS.Web/Models/Task/TaskDetailHistory.cs index 4f828ec..da153cc 100644 --- a/HHWMS.Web/Models/Task/TaskDetailHistory.cs +++ b/HHWMS.Web/Models/Task/TaskDetailHistory.cs @@ -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 = "单位")] diff --git a/HHWMS.Web/Models/Task/TaskHeader.cs b/HHWMS.Web/Models/Task/TaskHeader.cs index 4cf6606..6d581ad 100644 --- a/HHWMS.Web/Models/Task/TaskHeader.cs +++ b/HHWMS.Web/Models/Task/TaskHeader.cs @@ -56,7 +56,6 @@ namespace HHWMS.Web.Models [Display(Name = "Task.ErrorMsg", Description = "错误信息")] public string ErrorMsg { get; set; } - - public ICollection TaskDetails { get; set; } + } } diff --git a/HHWMS.Web/Models/Task/TaskHeaderHistory.cs b/HHWMS.Web/Models/Task/TaskHeaderHistory.cs index ad32e73..ab16acc 100644 --- a/HHWMS.Web/Models/Task/TaskHeaderHistory.cs +++ b/HHWMS.Web/Models/Task/TaskHeaderHistory.cs @@ -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; } - + } } diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index 2cf5e05..72cdfc8 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -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" }, // {