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/Requests/IssueRequest/CoatingIssueRequests/CoatingIssueRequestDetailDTO.cs

@@ -1,58 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Win_in.Sfs.Shared.Domain;
-using Win_in.Sfs.Shared.Domain.Shared;
-using Win_in.Sfs.Wms.Store.Application.Contracts;
-
-namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
-
-public class CoatingIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
-
-{
-    /// <summary>
-    /// 已发数量
-    /// </summary>
-    [Display(Name = "已发数量")]
-    public decimal IssuedQty { get; set; }
-
-    /// <summary>
-    /// 已收数量
-    /// </summary>
-    [Display(Name = "已收数量")]
-    public decimal ReceivedQty { get; set; }
-
-    /// <summary>
-    /// 明细状态
-    /// </summary>
-    [Display(Name = "明细状态")]
-    public EnumStatus Status { get; set; }
-
-    /// <summary>
-    /// 请求未发
-    /// </summary>
-    [Display(Name = "请求未发")]
-    [NotMapped]
-    public decimal ToBeIssuedQty => Qty - IssuedQty;
-
-    /// <summary>
-    /// 已发未收
-    /// </summary>
-    [Display(Name = "已发未收")]
-    [NotMapped]
-    public decimal ToBeReceivedQty => IssuedQty - ReceivedQty;
-
-    /// <summary>
-    /// 请求未收
-    /// </summary>
-    [Display(Name = "请求未收")]
-    [NotMapped]
-    public decimal NotFinishQty => Qty - ReceivedQty;
-
-    /// <summary>
-    /// 需求箱数量
-    /// </summary>
-    [Display(Name = "需求箱数量")]
-    public decimal BoxQty { get; set; }
-
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/CoatingIssueRequestDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/DTOS/CoatingIssueRequestDTO.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
@@ -9,8 +10,7 @@ public class CoatingIssueRequestDTO : SfsStoreRequestDTOBase<CoatingIssueRequest
     ///     叫料类型
     /// </summary>
     [Display(Name = "叫料类型")]
-    public string Type { get; set; }
+    public EnumIssueRequestType IssueRequestType { get; set; }
-
     /// <summary>
     ///     是否使用在途库
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/DTOS/CoatingIssueRequestDetailDTO.cs

@@ -0,0 +1,100 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
+
+public class CoatingIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
+{
+    #region 目标库位信息
+
+    /// <summary>
+    ///     目标库位
+    /// </summary>
+    [Display(Name = "目标库位")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string ToLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标库区
+    /// </summary>
+    [Display(Name = "目标库区")]
+    public string ToLocationArea { get; set; }
+
+    /// <summary>
+    ///     目标库位组
+    /// </summary>
+    [Display(Name = "目标库位组")]
+    public string ToLocationGroup { get; set; }
+
+    /// <summary>
+    ///     目标ERP储位
+    /// </summary>
+    [Display(Name = "目标ERP储位")]
+    public string ToLocationErpCode { get; set; }
+
+    /// <summary>
+    ///     目标仓库
+    /// </summary>
+    [Display(Name = "目标仓库")]
+    public string ToWarehouseCode { get; set; }
+
+    #endregion
+
+    /// <summary>
+    ///     生产线
+    /// </summary>
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    ///     已发数量
+    /// </summary>
+    public decimal IssuedQty { get; set; }
+
+    /// <summary>
+    ///     已收数量
+    /// </summary>
+    public decimal ReceivedQty { get; set; }
+
+    /// <summary>
+    ///     明细状态
+    /// </summary>
+    public EnumStatus Status { get; set; }
+
+    /// <summary>
+    ///     请求未发 还未发送的数量
+    /// </summary>
+    [NotMapped]
+    public decimal ToBeIssuedQty => Qty - IssuedQty;
+
+    /// <summary>
+    ///     已发未收
+    /// </summary>
+    [NotMapped]
+    public decimal ToBeReceivedQty => IssuedQty - ReceivedQty;
+
+    /// <summary>
+    ///     请求未收
+    /// </summary>
+    [NotMapped]
+    public decimal NotFinishQty => Qty - ReceivedQty;
+
+    /// <summary>
+    ///     位置码
+    /// </summary>
+    public string PositionCode { get; set; }
+
+    /// <summary>
+    ///     推荐类型
+    /// </summary>
+    public EnumRecommendType RecommendType { get; set; }
+
+    /// <summary>
+    ///     需求箱数量
+    /// </summary>
+    [Display(Name = "需求箱数量")]
+    public decimal BoxQty { get; set; }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequest.cs

@@ -21,11 +21,4 @@ public class CoatingIssueRequest : SfsStoreRequestAggregateRootBase<CoatingIssue
     /// 使用在途库
     /// </summary>
     public bool UseOnTheWayLocation { get; set; }
-
-    /// <summary>
-    /// 明细列表 
-    /// </summary>
-    [IgnoreUpdate]
-    public override List<CoatingIssueRequestDetail> Details { get; set; } = new List<CoatingIssueRequestDetail>();
-
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequestDetail.cs

@@ -9,7 +9,6 @@ namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 public class CoatingIssueRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation
 {
-
     #region 目标库位信息
 
     /// <summary>
@@ -45,6 +44,7 @@ public class CoatingIssueRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasTo
 
     #endregion
 
+
     /// <summary>
     /// 生产线
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequestManager.cs

@@ -17,24 +17,23 @@ public class CoatingIssueRequestManager
 {
     private readonly ICoatingIssueRequestRepository _repository;
 
-
     public CoatingIssueRequestManager(
         ICoatingIssueRequestRepository repository
-        , ICoatingIssueJobRepository issueJobRepository
+    ) : base(repository)
-        ) : base(repository)
     {
         _repository = repository;
-        
     }
 
     /// <summary>
-    /// 创建
+    ///     创建 同时 直接赋值Number 为了返回Number
     /// </summary>
     /// <param name="entity"></param>
     /// <returns></returns>
     public virtual async Task<CoatingIssueRequest> CreateByNumberAsync(CoatingIssueRequest entity)
     {
-        var number = string.IsNullOrEmpty(entity.Number) ? await GenerateNumberAsync(nameof(CoatingIssueRequest), entity.ActiveDate).ConfigureAwait(false) : entity.Number;
+        var number = string.IsNullOrEmpty(entity.Number)
+            ? await GenerateNumberAsync(nameof(CoatingIssueRequest), entity.ActiveDate).ConfigureAwait(false)
+            : entity.Number;
         entity.SetIdAndNumberWithDetails(GuidGenerator, number);
         entity.Submit();
         entity.Agree();
@@ -54,22 +53,8 @@ public class CoatingIssueRequestManager
         }
     }
 
-    #region Import
+    public Task ImportDataAsync(List<CoatingIssueRequest> entities, List<CoatingIssueRequest> deleteEntities = null)
-
-    /// <summary>
-    /// 执行导入
-    /// </summary>
-    public virtual async Task ImportDataAsync(List<CoatingIssueRequest> mergeEntities, List<CoatingIssueRequest> deleteEntities = null)
     {
-        if (deleteEntities != null && deleteEntities.Count > 0)
+        throw new System.NotImplementedException();
-        {
-            await _repository.BulkDeleteAsync(deleteEntities).ConfigureAwait(false);
-        }
-
-        await CreateManyAsync(mergeEntities).ConfigureAwait(false);
     }
-
-    #endregion
-      
 }
-

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240514023713_20240514.cs

@@ -0,0 +1,319 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Win_in.Sfs.Wms.Store.Migrations
+{
+    public partial class _20240514 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "RequestType",
+                table: "Store_KittingIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "RequestType",
+                table: "Store_CoatingIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "RequestType",
+                table: "Store_AssembleIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "RequestType",
+                table: "Job_KittingIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "RequestType",
+                table: "Job_CoatingIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "RequestType",
+                table: "Job_AssembleIssueJob");
+
+            migrationBuilder.AddColumn<string>(
+                name: "MesBarCode",
+                table: "Store_ProductReceiptNoteDetail",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "MesQuality",
+                table: "Store_ProductReceiptNoteDetail",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "EnumIssueSendType",
+                table: "Store_KittingIssueNote",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IssueRequestType",
+                table: "Store_KittingIssueNote",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "IdentityNo",
+                table: "Store_DeliverRequestDetail",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "MesDeliveryNo",
+                table: "Store_DeliverRequestDetail",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "MesDeliveryPlan",
+                table: "Store_DeliverRequestDetail",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "IdentityNo",
+                table: "Store_DeliverNoteDetail",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "MesDeliveryNo",
+                table: "Store_DeliverNoteDetail",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "MesDeliveryPlan",
+                table: "Store_DeliverNoteDetail",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IssueRequestType",
+                table: "Store_CoatingIssueNote",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemCode",
+                table: "Store_Chassis",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemDesc1",
+                table: "Store_Chassis",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemDesc2",
+                table: "Store_Chassis",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemName",
+                table: "Store_Chassis",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "EnumIssueSendType",
+                table: "Store_AssembleIssueNote",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IssueRequestType",
+                table: "Store_AssembleIssueNote",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "EnumIssueSendType",
+                table: "Job_KittingIssueJob",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IssueRequestType",
+                table: "Job_KittingIssueJob",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IssueRequestType",
+                table: "Job_CoatingIssueJob",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "EnumIssueSendType",
+                table: "Job_AssembleIssueJob",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IssueRequestType",
+                table: "Job_AssembleIssueJob",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "MesBarCode",
+                table: "Store_ProductReceiptNoteDetail");
+
+            migrationBuilder.DropColumn(
+                name: "MesQuality",
+                table: "Store_ProductReceiptNoteDetail");
+
+            migrationBuilder.DropColumn(
+                name: "EnumIssueSendType",
+                table: "Store_KittingIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "IssueRequestType",
+                table: "Store_KittingIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "IdentityNo",
+                table: "Store_DeliverRequestDetail");
+
+            migrationBuilder.DropColumn(
+                name: "MesDeliveryNo",
+                table: "Store_DeliverRequestDetail");
+
+            migrationBuilder.DropColumn(
+                name: "MesDeliveryPlan",
+                table: "Store_DeliverRequestDetail");
+
+            migrationBuilder.DropColumn(
+                name: "IdentityNo",
+                table: "Store_DeliverNoteDetail");
+
+            migrationBuilder.DropColumn(
+                name: "MesDeliveryNo",
+                table: "Store_DeliverNoteDetail");
+
+            migrationBuilder.DropColumn(
+                name: "MesDeliveryPlan",
+                table: "Store_DeliverNoteDetail");
+
+            migrationBuilder.DropColumn(
+                name: "IssueRequestType",
+                table: "Store_CoatingIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "ItemCode",
+                table: "Store_Chassis");
+
+            migrationBuilder.DropColumn(
+                name: "ItemDesc1",
+                table: "Store_Chassis");
+
+            migrationBuilder.DropColumn(
+                name: "ItemDesc2",
+                table: "Store_Chassis");
+
+            migrationBuilder.DropColumn(
+                name: "ItemName",
+                table: "Store_Chassis");
+
+            migrationBuilder.DropColumn(
+                name: "EnumIssueSendType",
+                table: "Store_AssembleIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "IssueRequestType",
+                table: "Store_AssembleIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "EnumIssueSendType",
+                table: "Job_KittingIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "IssueRequestType",
+                table: "Job_KittingIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "IssueRequestType",
+                table: "Job_CoatingIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "EnumIssueSendType",
+                table: "Job_AssembleIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "IssueRequestType",
+                table: "Job_AssembleIssueJob");
+
+            migrationBuilder.AddColumn<string>(
+                name: "RequestType",
+                table: "Store_KittingIssueNote",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RequestType",
+                table: "Store_CoatingIssueNote",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RequestType",
+                table: "Store_AssembleIssueNote",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RequestType",
+                table: "Job_KittingIssueJob",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RequestType",
+                table: "Job_CoatingIssueJob",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RequestType",
+                table: "Job_AssembleIssueJob",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+        }
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs

@@ -67,6 +67,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("CreatorId");
 
+                    b.Property<int>("EnumIssueSendType")
+                        .HasColumnType("int");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
@@ -76,6 +79,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("bit")
                         .HasDefaultValue(false);
 
+                    b.Property<int>("IssueRequestType")
+                        .HasColumnType("int");
+
                     b.Property<string>("JobDescription")
                         .HasMaxLength(1024)
                         .HasColumnType("nvarchar(1024)");
@@ -122,10 +128,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(3072)")
                         .HasColumnName("Remark");
 
-                    b.Property<string>("RequestType")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
@@ -519,10 +521,16 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("CreatorId");
 
+                    b.Property<int>("EnumIssueSendType")
+                        .HasColumnType("int");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<int>("IssueRequestType")
+                        .HasColumnType("int");
+
                     b.Property<string>("JobNumber")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)")
@@ -551,10 +559,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("RequestType")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
@@ -1515,6 +1519,18 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<string>("ItemCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ItemDesc1")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ItemDesc2")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ItemName")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<DateTime?>("LastModificationTime")
                         .HasColumnType("datetime2")
                         .HasColumnName("LastModificationTime");
@@ -6771,6 +6787,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(64)")
                         .HasColumnName("HandledSupplierBatch");
 
+                    b.Property<string>("IdentityNo")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<string>("ItemCode")
                         .IsRequired()
                         .HasMaxLength(64)
@@ -6803,6 +6823,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                     b.Property<Guid>("MasterID")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<string>("MesDeliveryNo")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("MesDeliveryPlan")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<string>("Number")
                         .IsRequired()
                         .HasMaxLength(64)
@@ -7273,6 +7301,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<string>("IdentityNo")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<string>("ItemCode")
                         .IsRequired()
                         .HasMaxLength(64)
@@ -7305,6 +7337,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                     b.Property<Guid>("MasterID")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<string>("MesDeliveryNo")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("MesDeliveryPlan")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<string>("Number")
                         .IsRequired()
                         .HasMaxLength(64)
@@ -13347,6 +13387,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("CreatorId");
 
+                    b.Property<int>("EnumIssueSendType")
+                        .HasColumnType("int");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
@@ -13356,6 +13399,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("bit")
                         .HasDefaultValue(false);
 
+                    b.Property<int>("IssueRequestType")
+                        .HasColumnType("int");
+
                     b.Property<string>("JobDescription")
                         .HasMaxLength(1024)
                         .HasColumnType("nvarchar(1024)");
@@ -13406,10 +13452,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(3072)")
                         .HasColumnName("Remark");
 
-                    b.Property<string>("RequestType")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
@@ -13803,10 +13845,16 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("CreatorId");
 
+                    b.Property<int>("EnumIssueSendType")
+                        .HasColumnType("int");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<int>("IssueRequestType")
+                        .HasColumnType("int");
+
                     b.Property<string>("JobNumber")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)")
@@ -13835,10 +13883,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("RequestType")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
@@ -17709,6 +17753,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                     b.Property<Guid>("MasterID")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<string>("MesBarCode")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("MesQuality")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<string>("Number")
                         .IsRequired()
                         .HasMaxLength(64)
@@ -30282,6 +30334,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("bit")
                         .HasDefaultValue(false);
 
+                    b.Property<int>("IssueRequestType")
+                        .HasColumnType("int");
+
                     b.Property<string>("JobDescription")
                         .HasMaxLength(1024)
                         .HasColumnType("nvarchar(1024)");
@@ -30332,10 +30387,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(3072)")
                         .HasColumnName("Remark");
 
-                    b.Property<string>("RequestType")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
@@ -30397,6 +30448,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<int>("IssueRequestType")
+                        .HasColumnType("int");
+
                     b.Property<string>("JobNumber")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)")
@@ -30425,10 +30479,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("RequestType")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");