From d9f4124ba0b08cbb9583807189e0e3bc7712dc26 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Thu, 7 Mar 2024 10:46:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=A7=E5=93=81=E9=80=80?=
 =?UTF-8?q?=E6=8B=86EF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IStoreDbContext.cs                                         | 1 +
 .../ProductRecycleJobDbContextModelCreatingExtensions.cs       | 2 +-
 .../Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs | 1 +
 .../StoreDbContextModelCreatingExtensions.cs                   | 1 +
 .../StoreEntityFrameworkCoreModule.cs                          | 3 +++
 5 files changed, 7 insertions(+), 1 deletion(-)

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 dc0a7a333..a171f29dc 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
@@ -96,6 +96,7 @@ public interface IStoreDbContext : IEfCoreDbContext
     public DbSet<JisDeliverJob> JisDeliverJobs { get; }
     public DbSet<PurchaseReturnJob> PurchaseReturnJobs { get; }
     public DbSet<ProductReceiveJob> ProductReceiveJobs { get; }
+    public DbSet<ProductRecycleJob> ProductRecycleJobs { get; }
     public DbSet<CheckJob> CheckJobs { get; }
     public DbSet<CountJob> CountJobs { get; }
     public DbSet<UnplannedIssueJob> UnplannedIssueJobs { get; }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/ProductRecycleJobs/ProductRecycleJobDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/ProductRecycleJobs/ProductRecycleJobDbContextModelCreatingExtensions.cs
index 84ac2f4e3..de07c7b69 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/ProductRecycleJobs/ProductRecycleJobDbContextModelCreatingExtensions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/ProductRecycleJobs/ProductRecycleJobDbContextModelCreatingExtensions.cs
@@ -13,7 +13,7 @@ public static class ProductRecycleJobDbContextModelCreatingExtensions
         builder.Entity<ProductRecycleJob>(b =>
         {
             //Configure table & schema name
-            b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(ProductReceiveJob), options.Schema);
+            b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(ProductRecycleJob), options.Schema);
             //Configure ABP properties
             b.ConfigureByConvention();
             //Configure Sfs base properties
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 12527670d..f9ed7239c 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
@@ -96,6 +96,7 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
     public DbSet<JisDeliverJob> JisDeliverJobs { get; set; }
     public DbSet<PurchaseReturnJob> PurchaseReturnJobs { get; set; }
     public DbSet<ProductReceiveJob> ProductReceiveJobs { get; set; }
+    public DbSet<ProductRecycleJob> ProductRecycleJobs { get; set; }
     public DbSet<CheckJob> CheckJobs { get; set; }
     public DbSet<CountJob> CountJobs { get; set; }
     public DbSet<UnplannedIssueJob> UnplannedIssueJobs { 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 67eb52523..62d3e058d 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
@@ -115,6 +115,7 @@ public static class StoreDbContextModelCreatingExtensions
         builder.ConfigureJisDeliverJob(options);
         builder.ConfigurePurchaseReturnJob(options);
         builder.ConfigureProductReceiveJob(options);
+        builder.ConfigureProductRecycleJob(options);
         builder.ConfigureCheckJob(options);
         builder.ConfigureCountJob(options);
         builder.ConfigureUnplannedIssueJob(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 2b05879e9..504232437 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
@@ -116,6 +116,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule
         context.Services.AddTransient<IJisDeliverJobRepository, JisDeliverJobEfCoreRepository>();
         context.Services.AddTransient<IPurchaseReturnJobRepository, PurchaseReturnJobEfCoreRepository>();
         context.Services.AddTransient<IProductReceiveJobRepository, ProductReceiveJobEfCoreRepository>();
+        context.Services.AddTransient<IProductRecycleJobRepository, ProductRecycleJobEfCoreRepository>();
         context.Services.AddTransient<ICheckJobRepository, CheckJobEfCoreRepository>();
         context.Services.AddTransient<ICountJobRepository, CountJobEfCoreRepository>();
         context.Services.AddTransient<IUnplannedIssueJobRepository, UnplannedIssueJobEfCoreRepository>();
@@ -279,6 +280,8 @@ public class StoreEntityFrameworkCoreModule : AbpModule
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ProductReceiveJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+            options.Entity<ProductRecycleJob>(orderOptions =>
+               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<PurchaseReturnJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<IssueJob>(orderOptions =>