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

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/InjectionIssueJobsController.cs

@@ -14,7 +14,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts;
 namespace Win_in.Sfs.Wms.Pda.Controllers.Jobs.IssueJobs;
 
 /// <summary>
-/// kitting叫料PDA任务
+/// 注塑叫料PDA任务
 /// </summary>
 [ApiController]
 [Route($"{PdaHostConst.ROOT_ROUTE}job/injection-issue")]

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/IInjectionIssueRequestAppService.cs

@@ -13,4 +13,5 @@ public interface IInjectionIssueRequestAppService
     Task<InjectionIssueRequestDTO> CreateAndHandleAsync(InjectionIssueRequestEditInput input);
     Task UpdateStatusCompletedAsync(string number);
     Task<string> IsHasNewJobAsync(string requestNumber, List<string> jobNumber);
+    Task<List<UnCompletedRequestDto>> GetUnCompletedRequestAsync(List<UnCompletedRequestDto> p_list);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs

@@ -9,6 +9,7 @@ using NUglify.Helpers;
 using Volo.Abp;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
@@ -397,5 +398,40 @@ public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase<Inj
         }
     }
 
+    /// <summary>
+    ///     获取已完成的叫料单数量
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("get-uncompleted-request")]
+    public async Task<List<UnCompletedRequestDto>> GetUnCompletedRequestAsync(List<UnCompletedRequestDto> p_list)
+    {
+        var returnList = new List<UnCompletedRequestDto>();
+        //枚举类型查不到改成SQL查询
+        var list = await _repository.GetListAsync(p =>
+                p.RequestStatus != EnumRequestStatus.Completed && p.IssueRequestType == EnumIssueRequestType.Vision)
+            .ConfigureAwait(false);
+        foreach (var itm in list)
+        {
+            var query = from detail in itm.Details
+                        join citm in p_list on new
+                        {
+                            detail.ItemCode,
+                            locCode = detail.ToLocationCode,
+                            areaCode = detail.PositionCode
+                        } equals
+                            new { citm.ItemCode, locCode = citm.LocCode, areaCode = citm.PositionCode }
+                        select new UnCompletedRequestDto
+                        {
+                            ItemCode = detail.ItemCode,
+                            LocCode = detail.ToLocationCode,
+                            PositionCode = detail.PositionCode
+                        };
+
+            returnList.AddRange(query.ToList());
+        }
+
+        return returnList;
+    }
+
     #endregion
 }

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

@@ -0,0 +1,504 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Win_in.Sfs.Wms.Store.Migrations
+{
+    public partial class Update_InjectionIssue0516 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "InjectionIssueRequestNumber",
+                table: "Job_InjectionIssueJob",
+                newName: "InjectionRequestNumber");
+
+            migrationBuilder.AddColumn<int>(
+                name: "EnumIssueSendType",
+                table: "Store_InjectionIssueNote",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "EnumIssueSendType",
+                table: "Job_InjectionIssueJob",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.CreateTable(
+                name: "Job_InjectionPlanJob",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    IssueRequestType = table.Column<int>(type: "int", nullable: false),
+                    ProdLine = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    InjectionPlanRequestNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    UseOnTheWayLocation = table.Column<bool>(type: "bit", nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Remark = table.Column<string>(type: "nvarchar(3072)", maxLength: 3072, nullable: true),
+                    Worker = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Number = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    UpStreamJobNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    JobDescription = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true),
+                    JobType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    JobStatus = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Priority = table.Column<int>(type: "int", nullable: false, defaultValue: 0),
+                    PriorityIncrement = table.Column<int>(type: "int", nullable: false, defaultValue: 0),
+                    WorkGroupCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    IsAutoComplete = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    AcceptUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    AcceptUserName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    AcceptTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    CompleteUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    CompleteUserName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    CompleteTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    WarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Job_InjectionPlanJob", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Store_InjectionPlanNote",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    JobNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    RequestNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    IssueRequestType = table.Column<int>(type: "int", nullable: false),
+                    UseOnTheWayLocation = table.Column<bool>(type: "bit", nullable: false),
+                    ConfirmTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    Confirmed = table.Column<bool>(type: "bit", nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Remark = table.Column<string>(type: "nvarchar(3072)", maxLength: 3072, nullable: true),
+                    Worker = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Number = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ActiveDate = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Store_InjectionPlanNote", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Store_InjectionPlanRequest",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    IssueRequestType = table.Column<int>(type: "int", nullable: false),
+                    UseOnTheWayLocation = table.Column<bool>(type: "bit", nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Remark = table.Column<string>(type: "nvarchar(3072)", maxLength: 3072, nullable: true),
+                    Worker = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Number = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ActiveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    AutoSubmit = table.Column<bool>(type: "bit", nullable: false),
+                    AutoAgree = table.Column<bool>(type: "bit", nullable: false),
+                    AutoHandle = table.Column<bool>(type: "bit", nullable: false),
+                    AutoCompleteJob = table.Column<bool>(type: "bit", nullable: false),
+                    DirectCreateNote = table.Column<bool>(type: "bit", nullable: false),
+                    RequestStatus = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Store_InjectionPlanRequest", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Job_InjectionPlanJobDetail",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ItemCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ItemName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ItemDesc1 = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ItemDesc2 = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    StdPackQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    Status = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Uom = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RequestLocationCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    RequestLocationArea = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RequestLocationGroup = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RequestLocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RequestWarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    OnTheWayLocationCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ProdLine = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    PositionCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    RecommendType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    RequestQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    RecommendFromContainerCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromPackingCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromSupplierBatch = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendFromProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendFromExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendFromLot = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromLocationArea = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromLocationGroup = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromLocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromWarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    RecommendToContainerCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToPackingCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToSupplierBatch = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendToProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendToExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendToLot = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToLocationArea = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToLocationGroup = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToLocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToWarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    TransferLibFromContainerCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromPackingCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromSupplierBatch = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    TransferLibFromProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    TransferLibFromExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    TransferLibFromLot = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromLocationArea = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromLocationGroup = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromLocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromWarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    TransferLibToContainerCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToPackingCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToSupplierBatch = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    TransferLibToProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    TransferLibToExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    TransferLibToLot = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToLocationArea = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToLocationGroup = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToLocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToWarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    HandledFromContainerCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromPackingCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromSupplierBatch = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledFromProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledFromExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledFromLot = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromLocationArea = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromLocationGroup = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromLocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromWarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    HandledToContainerCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToPackingCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToSupplierBatch = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledToProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledToExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledToLot = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToLocationArea = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToLocationGroup = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToLocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToWarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    MasterID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Number = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Remark = table.Column<string>(type: "nvarchar(3072)", maxLength: 3072, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Job_InjectionPlanJobDetail", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Job_InjectionPlanJobDetail_Job_InjectionPlanJob_MasterID",
+                        column: x => x.MasterID,
+                        principalTable: "Job_InjectionPlanJob",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Store_InjectionPlanNoteDetail",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ItemCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ItemName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ItemDesc1 = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ItemDesc2 = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    StdPackQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    Status = table.Column<int>(type: "int", nullable: false),
+                    Uom = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RequestLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RequestLocationArea = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RequestLocationGroup = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RequestLocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RequestWarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    OnTheWayLocationCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ProdLine = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    PositionCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    RecommendType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    RequestQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    RecommendFromContainerCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromPackingCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromSupplierBatch = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendFromProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendFromExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendFromLot = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromLocationArea = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromLocationGroup = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromLocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromWarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendFromQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    RecommendToContainerCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToPackingCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToSupplierBatch = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendToProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendToExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendToLot = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToLocationArea = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToLocationGroup = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToLocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToWarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendToQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    TransferLibFromContainerCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromPackingCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromSupplierBatch = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    TransferLibFromProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    TransferLibFromExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    TransferLibFromLot = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromLocationArea = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromLocationGroup = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromLocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromWarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibFromQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    TransferLibToContainerCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToPackingCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToSupplierBatch = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    TransferLibToProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    TransferLibToExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    TransferLibToLot = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToLocationArea = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToLocationGroup = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToLocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToWarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TransferLibToQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    HandledFromContainerCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromPackingCode = table.Column<string>(type: "nvarchar(450)", nullable: true),
+                    HandledFromSupplierBatch = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledFromProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledFromExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledFromLot = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromLocationCode = table.Column<string>(type: "nvarchar(450)", nullable: true),
+                    HandledFromLocationArea = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromLocationGroup = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromLocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromWarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledFromQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    HandledToContainerCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToPackingCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToSupplierBatch = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledToProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledToExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledToLot = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToLocationCode = table.Column<string>(type: "nvarchar(450)", nullable: true),
+                    HandledToLocationArea = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToLocationGroup = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToLocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToWarehouseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HandledToQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    MasterID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Number = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Remark = table.Column<string>(type: "nvarchar(3072)", maxLength: 3072, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Store_InjectionPlanNoteDetail", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Store_InjectionPlanNoteDetail_Store_InjectionPlanNote_MasterID",
+                        column: x => x.MasterID,
+                        principalTable: "Store_InjectionPlanNote",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Store_InjectionPlanRequestDetail",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ToLocationCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ToLocationArea = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ToLocationGroup = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ToLocationErpCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ToWarehouseCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ProdLine = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    IssuedQty = table.Column<decimal>(type: "decimal(18,6)", precision: 18, scale: 6, nullable: false),
+                    ReceivedQty = table.Column<decimal>(type: "decimal(18,6)", precision: 18, scale: 6, nullable: false),
+                    Status = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    PositionCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    RecommendType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    BoxQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    MasterID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Number = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Remark = table.Column<string>(type: "nvarchar(3072)", maxLength: 3072, nullable: true),
+                    ItemName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ItemDesc1 = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ItemDesc2 = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ItemCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Uom = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Qty = table.Column<decimal>(type: "decimal(18,6)", precision: 18, scale: 6, nullable: false),
+                    StdPackQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Store_InjectionPlanRequestDetail", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Store_InjectionPlanRequestDetail_Store_InjectionPlanRequest_MasterID",
+                        column: x => x.MasterID,
+                        principalTable: "Store_InjectionPlanRequest",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Job_InjectionPlanJob_Number",
+                table: "Job_InjectionPlanJob",
+                column: "Number",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Job_InjectionPlanJobDetail_MasterID",
+                table: "Job_InjectionPlanJobDetail",
+                column: "MasterID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Store_InjectionPlanNote_Number",
+                table: "Store_InjectionPlanNote",
+                column: "Number",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Store_InjectionPlanNoteDetail_HandledFromPackingCode",
+                table: "Store_InjectionPlanNoteDetail",
+                column: "HandledFromPackingCode");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Store_InjectionPlanNoteDetail_MasterID",
+                table: "Store_InjectionPlanNoteDetail",
+                column: "MasterID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Store_InjectionPlanNoteDetail_Number_HandledFromPackingCode_HandledFromLocationCode_HandledToLocationCode",
+                table: "Store_InjectionPlanNoteDetail",
+                columns: new[] { "Number", "HandledFromPackingCode", "HandledFromLocationCode", "HandledToLocationCode" },
+                unique: true,
+                filter: "[HandledFromPackingCode] IS NOT NULL AND [HandledFromLocationCode] IS NOT NULL AND [HandledToLocationCode] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Store_InjectionPlanRequest_Number",
+                table: "Store_InjectionPlanRequest",
+                column: "Number",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Store_InjectionPlanRequestDetail_ItemCode",
+                table: "Store_InjectionPlanRequestDetail",
+                column: "ItemCode");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Store_InjectionPlanRequestDetail_MasterID",
+                table: "Store_InjectionPlanRequestDetail",
+                column: "MasterID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Store_InjectionPlanRequestDetail_Number_ItemCode_ToLocationCode",
+                table: "Store_InjectionPlanRequestDetail",
+                columns: new[] { "Number", "ItemCode", "ToLocationCode" },
+                unique: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Job_InjectionPlanJobDetail");
+
+            migrationBuilder.DropTable(
+                name: "Store_InjectionPlanNoteDetail");
+
+            migrationBuilder.DropTable(
+                name: "Store_InjectionPlanRequestDetail");
+
+            migrationBuilder.DropTable(
+                name: "Job_InjectionPlanJob");
+
+            migrationBuilder.DropTable(
+                name: "Store_InjectionPlanNote");
+
+            migrationBuilder.DropTable(
+                name: "Store_InjectionPlanRequest");
+
+            migrationBuilder.DropColumn(
+                name: "EnumIssueSendType",
+                table: "Store_InjectionIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "EnumIssueSendType",
+                table: "Job_InjectionIssueJob");
+
+            migrationBuilder.RenameColumn(
+                name: "InjectionRequestNumber",
+                table: "Job_InjectionIssueJob",
+                newName: "InjectionIssueRequestNumber");
+        }
+    }
+}