From 0e1b70f2aa9fce783404d875a4a001fd3e674db9 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Wed, 17 Apr 2024 13:06:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=BA=95=E7=9B=98?= =?UTF-8?q?=E5=BA=8F=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTOs/ChassisOperationSequenceDTO.cs | 41 +++++------------- .../ChassisOperationSequenceEditInput.cs | 40 +++++------------- .../ChassisOperationSequenceImportInput.cs | 40 +++++------------- .../ChassisOperationSequence.cs | 42 +++++-------------- ...equenceDbContextModelCreatingExtensions.cs | 8 ---- 5 files changed, 44 insertions(+), 127 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceDTO.cs index 31994e458..8ffb91877 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceDTO.cs @@ -3,46 +3,27 @@ using System.ComponentModel.DataAnnotations; using Win_in.Sfs.Shared.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts; - /// -/// 底盘信息 +/// 底盘执行位置序列 /// -[Display(Name = "底盘信息")] +[Display(Name = "底盘执行位置序列")] public class ChassisOperationSequenceDTO : SfsBasicDTOBase { /// - /// Wms编号 - /// - [Display(Name = "Wms编号")] - public string Number { get; set; } - - /// - /// 底盘号 - /// - [Display(Name = "底盘号")] - public string ChassisOperationSequenceNumber { get; set; } - - /// - /// 描述 + /// kitting执行序列号 /// - [Display(Name = "描述")] - public string Description { get; set; } + [Display(Name = "kitting执行序列号")] + public string KittingNumber { get; set; } /// - /// 底盘生产时间 + /// kitting代码 /// - [Display(Name = "底盘生产时间")] - public DateTime ProduceDateTime { get; set; } + [Display(Name = "kitting代码")] + public string KittingCode { get; set; } /// - /// 接收接口时间 - /// - [Display(Name = "接收接口时间")] - public DateTime ReceiveInterfaceDateTime { get; set; } - - /// - /// 执行位置排序列 + /// 底盘号 /// - [Display(Name = "执行位置排序列")] - public long SortNumber { get; set; } + [Display(Name = "底盘号")] + public string ChassisNumber { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceEditInput.cs index 4876016ef..0aeb4a3ab 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceEditInput.cs @@ -4,45 +4,27 @@ using System.ComponentModel.DataAnnotations; namespace Win_in.Sfs.Wms.Store.Application.Contracts; /// -/// 底盘信息 +/// 底盘执行位置序列 /// -[Display(Name = "底盘信息")] +[Display(Name = "底盘执行位置序列")] public class ChassisOperationSequenceEditInput : SfsStoreCreateOrUpdateInputBase { /// - /// Wms编号 + /// kitting执行序列号 /// - [Display(Name = "Wms编号")] - public string Number { get; set; } + [Display(Name = "kitting执行序列号")] + public string KittingNumber { get; set; } /// - /// 底盘号 + /// kitting代码 /// - [Display(Name = "底盘号")] - public string ChassisOperationSequenceNumber { get; set; } + [Display(Name = "kitting代码")] + public string KittingCode { get; set; } /// - /// 描述 - /// - [Display(Name = "描述")] - public string Description { get; set; } - - /// - /// 底盘生产时间 - /// - [Display(Name = "底盘生产时间")] - public DateTime ProduceDateTime { get; set; } - - /// - /// 接收接口时间 - /// - [Display(Name = "接收接口时间")] - public DateTime ReceiveInterfaceDateTime { get; set; } - - /// - /// 执行位置排序列 + /// 底盘号 /// - [Display(Name = "执行位置排序列")] - public long SortNumber { get; set; } + [Display(Name = "底盘号")] + public string ChassisNumber { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceImportInput.cs index d2c4942b4..0289cce9d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceImportInput.cs @@ -8,44 +8,26 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Application.Contracts; /// -/// 底盘信息 +/// 底盘执行位置序列 /// -[Display(Name = "底盘信息")] +[Display(Name = "底盘执行位置序列")] public class ChassisOperationSequenceImportInput : SfsStoreImportInputBase { /// - /// Wms编号 + /// kitting执行序列号 /// - [Display(Name = "Wms编号")] - public string Number { get; set; } + [Display(Name = "kitting执行序列号")] + public string KittingNumber { get; set; } /// - /// 底盘号 + /// kitting代码 /// - [Display(Name = "底盘号")] - public string ChassisOperationSequenceNumber { get; set; } + [Display(Name = "kitting代码")] + public string KittingCode { get; set; } /// - /// 描述 - /// - [Display(Name = "描述")] - public string Description { get; set; } - - /// - /// 底盘生产时间 - /// - [Display(Name = "底盘生产时间")] - public DateTime ProduceDateTime { get; set; } - - /// - /// 接收接口时间 - /// - [Display(Name = "接收接口时间")] - public DateTime ReceiveInterfaceDateTime { get; set; } - - /// - /// 执行位置排序列 + /// 底盘号 /// - [Display(Name = "执行位置排序列")] - public long SortNumber { get; set; } + [Display(Name = "底盘号")] + public string ChassisNumber { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequence.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequence.cs index 72eba46d5..974c2cab3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequence.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequence.cs @@ -1,49 +1,29 @@ -using System; -using System.ComponentModel; using System.ComponentModel.DataAnnotations; using Win_in.Sfs.Shared.Domain; namespace Win_in.Sfs.Wms.Store.Domain; /// -/// 底盘信息 +/// 底盘执行位置序列 /// -[Display(Name = "底盘信息")] +[Display(Name = "底盘执行位置序列")] public class ChassisOperationSequence : SfsAggregateRootBase { /// - /// Wms编号 + /// kitting执行序列号 /// - [Display(Name = "Wms编号")] - public string Number { get; set; } + [Display(Name = "kitting执行序列号")] + public string KittingNumber { get; set; } /// - /// 底盘号 + /// kitting代码 /// - [Display(Name = "底盘号")] - public string ChassisOperationSequenceNumber { get; set; } + [Display(Name = "kitting代码")] + public string KittingCode { get; set; } /// - /// 描述 - /// - [Display(Name = "描述")] - public string Description { get; set; } - - /// - /// 底盘生产时间 - /// - [Display(Name = "底盘生产时间")] - public DateTime ProduceDateTime { get; set; } - - /// - /// 接收接口时间 - /// - [Display(Name = "接收接口时间")] - public DateTime ReceiveInterfaceDateTime { get; set; } - - /// - /// 执行位置排序列 + /// 底盘号 /// - [Display(Name = "执行位置排序列")] - public long SortNumber { get; set; } + [Display(Name = "底盘号")] + public string ChassisNumber { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceDbContextModelCreatingExtensions.cs index 1540e8f97..1c5d76ad6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceDbContextModelCreatingExtensions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceDbContextModelCreatingExtensions.cs @@ -18,14 +18,6 @@ public static class ChassisOperationSequenceDbContextModelCreatingExtensions b.ConfigureByConvention(); //Configure Sfs base properties b.ConfigureSfsStoreBase(); - - b.Property(q => q.SortNumber).IsRequired(); - b.Property(q => q.ChassisOperationSequenceNumber).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength).IsRequired(); - b.Property(q => q.Number).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength).IsRequired(); - - b.HasIndex(q => q.ChassisOperationSequenceNumber).IsUnique(); - b.HasIndex(q => q.SortNumber).IsUnique(); - b.HasIndex(q => q.Number).IsUnique(); }); } }