Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

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;
-
 /// <summary>
-///     底盘信息
+///     底盘执行位置序列
 /// </summary>
-[Display(Name = "底盘信息")]
+[Display(Name = "底盘执行位置序列")]
 public class ChassisOperationSequenceDTO : SfsBasicDTOBase
 {
     /// <summary>
-    ///     Wms编号
+    ///     kitting执行序列号
-    /// </summary>
-    [Display(Name = "Wms编号")]
-    public string Number { get; set; }
-
-    /// <summary>
-    ///     底盘号
-    /// </summary>
-    [Display(Name = "底盘号")]
-    public string ChassisOperationSequenceNumber { get; set; }
-
-    /// <summary>
-    ///     描述
     /// </summary>
-    [Display(Name = "描述")]
+    [Display(Name = "kitting执行序列号")]
-    public string Description { get; set; }
+    public string KittingNumber { get; set; }
 
     /// <summary>
-    ///     底盘生产时间
+    ///     kitting代码
     /// </summary>
-    [Display(Name = "底盘生产时间")]
+    [Display(Name = "kitting代码")]
-    public DateTime ProduceDateTime { get; set; }
+    public string KittingCode { get; set; }
 
     /// <summary>
-    ///     接收接口时间
+    ///     底盘号
-    /// </summary>
-    [Display(Name = "接收接口时间")]
-    public DateTime ReceiveInterfaceDateTime { get; set; }
-
-    /// <summary>
-    ///     执行位置排序列
     /// </summary>
-    [Display(Name = "执行位置排序列")]
+    [Display(Name = "底盘号")]
-    public long SortNumber { get; set; }
+    public string ChassisNumber { get; set; }
 }

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;
 
 /// <summary>
-///     底盘信息
+///     底盘执行位置序列
 /// </summary>
-[Display(Name = "底盘信息")]
+[Display(Name = "底盘执行位置序列")]
 public class ChassisOperationSequenceEditInput
     : SfsStoreCreateOrUpdateInputBase
 {
     /// <summary>
-    ///     Wms编号
+    ///     kitting执行序列号
     /// </summary>
-    [Display(Name = "Wms编号")]
+    [Display(Name = "kitting执行序列号")]
-    public string Number { get; set; }
+    public string KittingNumber { get; set; }
 
     /// <summary>
-    ///     底盘号
+    ///     kitting代码
     /// </summary>
-    [Display(Name = "底盘号")]
+    [Display(Name = "kitting代码")]
-    public string ChassisOperationSequenceNumber { get; set; }
+    public string KittingCode { get; set; }
 
     /// <summary>
-    ///     描述
+    ///     底盘号
-    /// </summary>
-    [Display(Name = "描述")]
-    public string Description { get; set; }
-
-    /// <summary>
-    ///     底盘生产时间
-    /// </summary>
-    [Display(Name = "底盘生产时间")]
-    public DateTime ProduceDateTime { get; set; }
-
-    /// <summary>
-    ///     接收接口时间
-    /// </summary>
-    [Display(Name = "接收接口时间")]
-    public DateTime ReceiveInterfaceDateTime { get; set; }
-
-    /// <summary>
-    ///     执行位置排序列
     /// </summary>
-    [Display(Name = "执行位置排序列")]
+    [Display(Name = "底盘号")]
-    public long SortNumber { get; set; }
+    public string ChassisNumber { get; set; }
 }

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;
 
 /// <summary>
-///     底盘信息
+///     底盘执行位置序列
 /// </summary>
-[Display(Name = "底盘信息")]
+[Display(Name = "底盘执行位置序列")]
 public class ChassisOperationSequenceImportInput : SfsStoreImportInputBase
 {
     /// <summary>
-    ///     Wms编号
+    ///     kitting执行序列号
     /// </summary>
-    [Display(Name = "Wms编号")]
+    [Display(Name = "kitting执行序列号")]
-    public string Number { get; set; }
+    public string KittingNumber { get; set; }
 
     /// <summary>
-    ///     底盘号
+    ///     kitting代码
     /// </summary>
-    [Display(Name = "底盘号")]
+    [Display(Name = "kitting代码")]
-    public string ChassisOperationSequenceNumber { get; set; }
+    public string KittingCode { get; set; }
 
     /// <summary>
-    ///     描述
+    ///     底盘号
-    /// </summary>
-    [Display(Name = "描述")]
-    public string Description { get; set; }
-
-    /// <summary>
-    ///     底盘生产时间
-    /// </summary>
-    [Display(Name = "底盘生产时间")]
-    public DateTime ProduceDateTime { get; set; }
-
-    /// <summary>
-    ///     接收接口时间
-    /// </summary>
-    [Display(Name = "接收接口时间")]
-    public DateTime ReceiveInterfaceDateTime { get; set; }
-
-    /// <summary>
-    ///     执行位置排序列
     /// </summary>
-    [Display(Name = "执行位置排序列")]
+    [Display(Name = "底盘号")]
-    public long SortNumber { get; set; }
+    public string ChassisNumber { get; set; }
 }

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;
 
 /// <summary>
-///     底盘信息
+///     底盘执行位置序列
 /// </summary>
-[Display(Name = "底盘信息")]
+[Display(Name = "底盘执行位置序列")]
 public class ChassisOperationSequence : SfsAggregateRootBase
 {
     /// <summary>
-    ///     Wms编号
+    ///     kitting执行序列号
     /// </summary>
-    [Display(Name = "Wms编号")]
+    [Display(Name = "kitting执行序列号")]
-    public string Number { get; set; }
+    public string KittingNumber { get; set; }
 
     /// <summary>
-    ///     底盘号
+    ///     kitting代码
     /// </summary>
-    [Display(Name = "底盘号")]
+    [Display(Name = "kitting代码")]
-    public string ChassisOperationSequenceNumber { get; set; }
+    public string KittingCode { get; set; }
 
     /// <summary>
-    ///     描述
+    ///     底盘号
-    /// </summary>
-    [Display(Name = "描述")]
-    public string Description { get; set; }
-
-    /// <summary>
-    ///     底盘生产时间
-    /// </summary>
-    [Display(Name = "底盘生产时间")]
-    public DateTime ProduceDateTime { get; set; }
-
-    /// <summary>
-    ///     接收接口时间
-    /// </summary>
-    [Display(Name = "接收接口时间")]
-    public DateTime ReceiveInterfaceDateTime { get; set; }
-
-    /// <summary>
-    ///     执行位置排序列
     /// </summary>
-    [Display(Name = "执行位置排序列")]
+    [Display(Name = "底盘号")]
-    public long SortNumber { get; set; }
+    public string ChassisNumber { get; set; }
 }

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();
         });
     }
 }