From 9cc823a2e9044c6e6d5acd4bec3bdd656aaef1fe Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Thu, 18 Apr 2024 09:38:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=96=B7=E6=B6=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IStoreDbContext.cs                           |  6 ++++++
 ...sueRequestDbContextModelCreatingExtensions.cs |  0
 .../CoatingIssueRequestEfCoreRepository.cs       |  0
 .../StoreDbContext.cs                            | 12 +++++++++---
 .../StoreDbContextModelCreatingExtensions.cs     | 16 ++++++++++------
 .../StoreEntityFrameworkCoreModule.cs            |  2 ++
 6 files changed, 27 insertions(+), 9 deletions(-)
 rename be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/{CoatingIssueRequest => CoatingIssueRequests}/CoatingIssueRequestDbContextModelCreatingExtensions.cs (100%)
 rename be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/{CoatingIssueRequest => CoatingIssueRequests}/CoatingIssueRequestEfCoreRepository.cs (100%)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs
index 87cc083da..ab86c5fa3 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs
@@ -2,6 +2,9 @@ using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
+using Win_in.Sfs.Wms.Store.Notes.IssueNotes;
+using Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 
@@ -23,6 +26,7 @@ public interface IStoreDbContext : IEfCoreDbContext
     public DbSet<MaterialRequest> MaterialRequests { get; }
     public DbSet<InjectionIssueRequest> InjectionIssueRequests { get; }
     public DbSet<KittingIssueRequest> KittingIssueRequests { get; }
+    public DbSet<CoatingIssueRequest> CoatingIssueRequests { get; }
     public DbSet<AssembleIssueRequest> AssembleIssueRequest { get; }
     public DbSet<ThirdLocationRequest> ThirdLocationRequests { get; }
     public DbSet<ContainerRequest> ContainerRequests { get; }
@@ -82,6 +86,7 @@ public interface IStoreDbContext : IEfCoreDbContext
     public DbSet<InjectionIssueNote> InjectionIssueNotes { get; }
     public DbSet<AssembleIssueNote> AssembleIssueNotes { get; }
     public DbSet<KittingIssueNote> KittingIssueNotes { get; }
+    public DbSet<CoatingIssueNote> CoatingIssueNotes { get; }
     public DbSet<ThirdLocationNote> ThirdLocationNotes { get; }
     public DbSet<ContainerNote> ContainerNotes { get; }
     public DbSet<UnplannedReceiptNote> UnplannedReceiptNotes { get; }
@@ -111,6 +116,7 @@ public interface IStoreDbContext : IEfCoreDbContext
     public DbSet<InjectionIssueJob> InjectionIssueJobs { get; }
     public DbSet<AssembleIssueJob> AssembleIssueJobs { get; }
     public DbSet<KittingIssueJob> KittingIssueJobs { get; }
+    public DbSet<CoatingIssueJob> CoatingIssueJobs { get; }
     public DbSet<ThirdLocationJob> ThirdLocationJobs { get; }
     public DbSet<ContainerJob> ContainerJobs { get; }
     public DbSet<DeliverJob> DeliverJobs { get; }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/CoatingIssueRequest/CoatingIssueRequestDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/CoatingIssueRequests/CoatingIssueRequestDbContextModelCreatingExtensions.cs
similarity index 100%
rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/CoatingIssueRequest/CoatingIssueRequestDbContextModelCreatingExtensions.cs
rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/CoatingIssueRequests/CoatingIssueRequestDbContextModelCreatingExtensions.cs
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/CoatingIssueRequest/CoatingIssueRequestEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/CoatingIssueRequests/CoatingIssueRequestEfCoreRepository.cs
similarity index 100%
rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/CoatingIssueRequest/CoatingIssueRequestEfCoreRepository.cs
rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/CoatingIssueRequests/CoatingIssueRequestEfCoreRepository.cs
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs
index 5dc49b81f..8a7c13953 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs
@@ -3,6 +3,9 @@ using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Equipments;
+using Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
+using Win_in.Sfs.Wms.Store.Notes.IssueNotes;
+using Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 
@@ -23,6 +26,7 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
     public DbSet<MaterialRequest> MaterialRequests { get; set; }
     public DbSet<InjectionIssueRequest> InjectionIssueRequests { get; set; }
     public DbSet<KittingIssueRequest> KittingIssueRequests { get; set; }
+    public DbSet<CoatingIssueRequest> CoatingIssueRequests { get; set; }
     public DbSet<AssembleIssueRequest> AssembleIssueRequest { get; set; }
     public DbSet<ThirdLocationRequest> ThirdLocationRequests { get; set; }
     public DbSet<ContainerRequest> ContainerRequests { get; set; }
@@ -82,6 +86,7 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
     public DbSet<InjectionIssueNote> InjectionIssueNotes { get; set; }
     public DbSet<AssembleIssueNote> AssembleIssueNotes { get; set; }
     public DbSet<KittingIssueNote> KittingIssueNotes { get; set; }
+    public DbSet<CoatingIssueNote> CoatingIssueNotes { get; set; }
     public DbSet<ThirdLocationNote> ThirdLocationNotes { get; set; }
     public DbSet<ContainerNote> ContainerNotes { get; set; }
     public DbSet<UnplannedReceiptNote> UnplannedReceiptNotes { get; set; }
@@ -109,9 +114,10 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
     public DbSet<PutawayJob> PutawayJobs { get; set; }
     public DbSet<IssueJob> IssueJobs { get; set; }
     public DbSet<InjectionIssueJob> InjectionIssueJobs { get; set; }
-    public DbSet<AssembleIssueJob> AssembleIssueJobs { get; set; }
-   
-    public DbSet<KittingIssueJob> KittingIssueJobs { get; set; }    public DbSet<ThirdLocationJob> ThirdLocationJobs { get; set; }
+    public DbSet<AssembleIssueJob> AssembleIssueJobs { get; set; }   
+    public DbSet<KittingIssueJob> KittingIssueJobs { get; set; }
+    public DbSet<CoatingIssueJob> CoatingIssueJobs { get; set; }
+    public DbSet<ThirdLocationJob> ThirdLocationJobs { get; set; }
     public DbSet<ContainerJob> ContainerJobs { get; set; }
     public DbSet<DeliverJob> DeliverJobs { get; set; }
     public DbSet<JisDeliverJob> JisDeliverJobs { get; set; }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs
index c722a0720..964924518 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs
@@ -49,6 +49,7 @@ public static class StoreDbContextModelCreatingExtensions
         builder.ConfigureMaterialRequest(options);
         builder.ConfigureInjectionIssueRequest(options);
         builder.ConfigureKittingIssueRequest(options);
+        builder.ConfigureCoatingIssueRequest(options);
         builder.ConfigureAssembleIssueRequest(options);
         builder.ConfigureThirdLocationRequest(options);
         builder.ConfigureDeliverRequest(options);
@@ -62,10 +63,9 @@ public static class StoreDbContextModelCreatingExtensions
         builder.ConfigurePutawayRequest(options);
         builder.ConfigureScrapRequest(options);
         builder.ConfigureCountAdjustRequest(options);
-        builder.ConfigureWipWarehouseAdjustRequest(options);
-        builder.ConfigureCoatingIssueNote(options);
-        builder.ConfigureCoatingIssueRequest(options);
-        builder.ConfigureCoatingIssueJob(options);
+        builder.ConfigureWipWarehouseAdjustRequest(options);        
+       
+       
         #endregion
 
         #region Notes
@@ -88,7 +88,9 @@ public static class StoreDbContextModelCreatingExtensions
         builder.ConfigureIssueNote(options);
         builder.ConfigureInjectionIssueNote(options);
         builder.ConfigureAssembleIssueNote(options);
-        builder.ConfigureKittingIssueNote(options);        builder.ConfigureThirdLocationNote(options);
+        builder.ConfigureKittingIssueNote(options);
+        builder.ConfigureCoatingIssueNote(options);
+        builder.ConfigureThirdLocationNote(options);
         builder.ConfigureContainerNote(options);
         builder.ConfigureUnplannedReceiptNote(options);
         builder.ConfigureUnplannedIssueNote(options);
@@ -120,7 +122,9 @@ public static class StoreDbContextModelCreatingExtensions
         builder.ConfigureIssueJob(options);
         builder.ConfigureInjectionIssueJob(options);
         builder.ConfigureAssembleIssueJob(options);
-        builder.ConfigureKittingIssueJob(options);        builder.ConfigureThirdLocationJob(options);
+        builder.ConfigureKittingIssueJob(options);
+        builder.ConfigureCoatingIssueJob(options);
+        builder.ConfigureThirdLocationJob(options);
         builder.ConfigureContainerJob(options);
         builder.ConfigureDeliverJob(options);
         builder.ConfigureJisDeliverJob(options);
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs
index 7c52760a3..04a55f18b 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs
@@ -215,6 +215,8 @@ public class StoreEntityFrameworkCoreModule : AbpModule
                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<KittingIssueRequest>(orderOptions =>
                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+            options.Entity<CoatingIssueRequest>(orderOptions =>
+               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<AssembleIssueRequest>(orderOptions =>
                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ThirdLocationRequest>(orderOptions =>