Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

AuthServer/IdentityServer/AuthServer.Host/AuthServerDataSeeder.cs

@@ -159,7 +159,7 @@ namespace AuthServer.Host
                 name: "business-app",
                 scopes: new[] { "InternalGateway", "BaseService" },
                 grantTypes: new[] { "client_credentials" },
-                secret: "1q2w3e*".Sha256(),
+                secret: "1q2w3E*".Sha256(),
                 permissions: new[] { IdentityPermissions.Users.Default, IdentityPermissions.UserLookup.Default }
             );
         }

AuthServer/IdentityServer/AuthServer.Host/Migrations/20230131062132_inint.Designer.cs → AuthServer/IdentityServer/AuthServer.Host/Migrations/20230201062326_init.Designer.cs

@@ -12,8 +12,8 @@ using Volo.Abp.EntityFrameworkCore;
 namespace AuthServer.Host.Migrations
 {
     [DbContext(typeof(AuthServerDbContext))]
-    [Migration("20230131062132_inint")]
-    partial class inint
+    [Migration("20230201062326_init")]
+    partial class init
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {

AuthServer/IdentityServer/AuthServer.Host/Migrations/20230131062132_inint.cs → AuthServer/IdentityServer/AuthServer.Host/Migrations/20230201062326_init.cs

@@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace AuthServer.Host.Migrations
 {
-    public partial class inint : Migration
+    public partial class init : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {

AuthServer/OpenIddict/AuthServer.Host/AuthServer.csproj

@@ -59,8 +59,4 @@
 		<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="6.0.0" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Folder Include="Migrations\" />
-	</ItemGroup>
-
 </Project>

AuthServer/OpenIddict/AuthServer.Host/AuthServerDataSeeder.cs

@@ -154,7 +154,7 @@ namespace AuthServer
                     type: OpenIddictConstants.ClientTypes.Confidential,
                     consentType: OpenIddictConstants.ConsentTypes.Implicit,
                     displayName: "Business Application",
-                    secret: "1q2w3e*",
+                    secret: "1q2w3E*",
                     grantTypes: new List<string>
                     {
                         OpenIddictConstants.GrantTypes.ClientCredentials,

AuthServer/OpenIddict/AuthServer.Host/Migrations/20221225153937_init.Designer.cs → AuthServer/OpenIddict/AuthServer.Host/Migrations/20230201075632_init.Designer.cs

@@ -12,7 +12,7 @@ using Volo.Abp.EntityFrameworkCore;
 namespace AuthServer.Migrations
 {
     [DbContext(typeof(AuthServerDbContext))]
-    [Migration("20221225153937_init")]
+    [Migration("20230201075632_init")]
     partial class init
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)

AuthServer/OpenIddict/AuthServer.Host/appsettings.json

@@ -6,7 +6,7 @@
     "RedirectAllowedUrls": "http://localhost:9527,http://localhost:44307"
   },
   "ConnectionStrings": {
-    "Default": "Server=123.60.180.165;Database=DOPCore;Uid=root; Pwd=5heng=uN;Allow User Variables=True;sslMode=None;"
+    "Default": "Server=123.60.180.165;Database=dopbiz;Uid=root; Pwd=5heng=uN;Allow User Variables=True;sslMode=None;"
   },
   "Redis": {
     "Configuration": "127.0.0.1"
@@ -27,7 +27,7 @@
       "Business": {
         "ClientId": "business-app",
         "RootUrl": "http://localhost:51186",
-        "ClientSecret": "1q2w3e*"
+        "ClientSecret": "1q2w3E*"
       }
     }
   }

BaseService/BaseService.Host/BaseService.Host.csproj

@@ -29,8 +29,4 @@
     <ProjectReference Include="..\BaseService.HttpApi\BaseService.HttpApi.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Logs\" />
-  </ItemGroup>
-
 </Project>

BaseService/BaseService.Host/Migrations/20230131062409_init.Designer.cs → BaseService/BaseService.Host/Migrations/20230201070251_init.Designer.cs

@@ -12,7 +12,7 @@ using Volo.Abp.EntityFrameworkCore;
 namespace BaseService.Migrations
 {
     [DbContext(typeof(BaseServiceMigrationDbContext))]
-    [Migration("20230131062409_init")]
+    [Migration("20230201070251_init")]
     partial class init
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -69,7 +69,7 @@ namespace Business.ResourceExamineManagement
         /// 物料详情
         /// </summary>
         private readonly IMongoDB<ic_item> _ic_item;
-        private IRepository<ic_item, long> _mysql_ic_item;
+        //private IRepository<ic_item, long> _mysql_ic_item;
         /// <summary>
         /// 物料BOM
         /// </summary>
@@ -310,5 +310,20 @@ namespace Business.ResourceExamineManagement
             }
 
         }
+
+
+        public void BomSubstitute(List<BomChildExamineDto> returnlist)
+        {
+            returnlist = returnlist.OrderBy(s => s.num).ToList();
+            
+            List<long> idlist = new List<long>();
+            foreach (var item in returnlist)
+            {
+                if (item.num != "1")
+                {
+                    
+                }
+            }
+        }
     }
 }

MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs

@@ -25,36 +25,29 @@ namespace Business.EntityFrameworkCore
         {
             //TODO：这样太麻烦了，有时间研究一下批量
             Check.NotNull(builder, nameof(builder));
-            //builder.Entity<Book>(b =>
-            //{
-            //    b.ToTable("Book");
+            builder.Entity<Book>(b =>
+            {
+                b.ToTable("Book");
 
-            //    b.ConfigureByConvention();
+                b.ConfigureByConvention();
 
-            //    b.Property(x => x.Name).IsRequired();
+                b.Property(x => x.Name).IsRequired();
 
 
-            //});
+            });
 
-            //builder.Entity<PrintTemplate>(b =>
-            //{
-            //    b.ToTable("base_print_template");
+            builder.Entity<PrintTemplate>(b =>
+            {
+                b.ToTable("base_print_template");
 
-            //    b.ConfigureByConvention();
+                b.ConfigureByConvention();
 
-            //    b.Property(x => x.Name).IsRequired();
-            //});
+                b.Property(x => x.Name).IsRequired();
+            });
 
             builder.Entity<ic_bom>(b =>
             {
                 b.ToTable("ic_bom").HasComment("物料BOM");
-                b.Property(x => x.Id).HasComment("主键");
-                b.Property(x => x.bom_number).HasComment("bom编号");
-                b.Property(x => x.bom_num).HasComment("bom序号");
-                b.Property(x => x.fse_status).HasComment("使用状态");
-                b.Property(x => x.begin_day).HasComment("生效日期");
-                b.Property(x => x.end_day).HasComment("失效日期");
-                b.Property(x => x.tech_id).HasComment("工艺主键");
                 b.ConfigureByConvention();
             });
 

MicroServices/Business/Business.Host/BusinessHostModule.cs

@@ -22,6 +22,7 @@ using System.IO;
 using System.Linq;
 using System.Security.Cryptography.Pkcs;
 using Volo.Abp;
+using Volo.Abp.AspNetCore.ExceptionHandling;
 using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Serilog;
@@ -67,6 +68,13 @@ namespace Business
             ConfigureHangfire(context, configuration);
             //MongoDB依赖注入
             ConfigureMongoDB(configuration);
+            if(hostingEnvironment.IsDevelopment())
+            {
+                Configure<AbpExceptionHandlingOptions>(options =>
+                {
+                    options.SendExceptionsDetailsToClients = true;
+                });
+            }
         }
 
         private void ConfigureConventionalControllers()

MicroServices/Business/Bussiness.Model/SIM/sim_base.cs

@@ -11,12 +11,12 @@ namespace Bussiness.Model.SystemData
     [Description("sim基本表")]
     public class sim_base:BaseEntity
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("主键id")]
-        public long sim_id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("主键id")]
+        //public long sim_id { get; set; }
 
         /// <summary>
         /// sim等级

MicroServices/Business/Bussiness.Model/SIM/sim_issue_type.cs

@@ -10,12 +10,12 @@ namespace Bussiness.Model.SystemData
     [Description("上升时间")]
     public class sim_issue_type: BaseEntity
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("上升时间")]
-        public long issue_type_id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("上升时间")]
+        //public long issue_type_id { get; set; }
 
         /// <summary>
         /// 类别代码

MicroServices/Business/Bussiness.Model/SIM/sim_plant.cs

@@ -10,12 +10,12 @@ namespace Bussiness.Model.SystemData
     [Description("sim事项表")]
     public class sim_plant:BaseEntity
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("主键id")]
-        public long plant_id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("主键id")]
+        //public long plant_id { get; set; }
 
         /// <summary>
         /// 事项名称

MicroServices/Business/Bussiness.Model/SIM/sim_user_relation.cs

@@ -10,12 +10,12 @@ namespace Bussiness.Model.SystemData
     [Description("sim用户关联表")]
     public class sim_user_relation: BaseEntity
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("主键id")]
-        public long id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("主键id")]
+        //public long id { get; set; }
 
         /// <summary>
         /// base_sim表ID

MicroServices/Business/Bussiness.Model/SystemData/crm_customer.cs

@@ -11,12 +11,12 @@ namespace Bussiness.Model.SystemData
     [Description("客户")]
     public class crm_customer:BaseEntity
     {
-        /// <summary>
-        /// 客户主键id
-        /// </summary>
-        [Key]
-        [Description("客户主键id")]
-        public long customer_id { get; set; }
+        ///// <summary>
+        ///// 客户主键id
+        ///// </summary>
+        //[Key]
+        //[Description("客户主键id")]
+        //public long customer_id { get; set; }
 
         /// <summary>
         /// 客户编号

MicroServices/Business/Bussiness.Model/SystemData/srm_supplier.cs

@@ -11,12 +11,12 @@ namespace Bussiness.Model.SystemData
     [Description("供应商")]
     public class srm_supplier: BaseEntity
     {
-        /// <summary>
-        /// 供应商主键id
-        /// </summary>
-        [Key]
-        [Description("供应商主键id")]
-        public long supplier_id { get; set; }
+        ///// <summary>
+        ///// 供应商主键id
+        ///// </summary>
+        //[Key]
+        //[Description("供应商主键id")]
+        //public long supplier_id { get; set; }
 
         /// <summary>
         /// 供应商编号

MicroServices/Business/Bussiness.Model/SystemData/sys_code.cs

@@ -1,6 +1,8 @@
-using System.ComponentModel;
+using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Volo.Abp.Domain.Entities;
 
 namespace Bussiness.Model.SystemData
 {
@@ -8,14 +10,14 @@ namespace Bussiness.Model.SystemData
     /// 系统编码表
     /// </summary>
     [Description("系统编码表")]
-    public class sys_code
+    public class sys_code:Entity<long>
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("主键id")]
-        public long sys_code_id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("主键id")]
+        //public long sys_code_id { get; set; }
 
         /// <summary>
         /// 编码生成名称

MicroServices/Business/Bussiness.Model/SystemData/sys_code_pre.cs

@@ -1,5 +1,7 @@
-using System.ComponentModel;
+using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities;
 
 namespace Bussiness.Model.SystemData
 {
@@ -7,14 +9,14 @@ namespace Bussiness.Model.SystemData
     /// 系统编码前置表
     /// </summary>
     [Description("系统编码前置表")]
-    public class sys_code_pre
+    public class sys_code_pre:Entity<long>
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("主键id")]
-        public long id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("主键id")]
+        //public long id { get; set; }
 
         /// <summary>
         /// 编码生成名称

MicroServices/Business/Bussiness.Model/SystemData/sys_config.cs

@@ -1,5 +1,7 @@
-using System.ComponentModel;
+using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities;
 
 namespace Bussiness.Model.SystemData
 {
@@ -7,14 +9,14 @@ namespace Bussiness.Model.SystemData
     /// 系统配置表
     /// </summary>
     [Description("系统配置表")]
-    public class sys_config
+    public class sys_config:Entity<long>
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("主键id")]
-        public long config_id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("主键id")]
+        //public long config_id { get; set; }
 
         /// <summary>
         /// 配置类型

MicroServices/Business/Bussiness.Model/SystemData/sys_measure_unit.cs

@@ -1,5 +1,7 @@
-using System.ComponentModel;
+using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities;
 
 namespace Bussiness.Model.SystemData
 {
@@ -7,14 +9,14 @@ namespace Bussiness.Model.SystemData
     /// 计量单位信息表
     /// </summary>
     [Description("计量单位信息表")]
-    public class sys_measure_unit
+    public class sys_measure_unit:Entity<long>
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("主键id")]
-        public long unit_id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("主键id")]
+        //public long unit_id { get; set; }
 
         /// <summary>
         /// 单位名称

MicroServices/Business/Bussiness.Model/SystemData/sys_post.cs

@@ -10,12 +10,12 @@ namespace Bussiness.Model.SystemData
     [Description("岗位表")]
     public class sys_post: BaseEntity
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("主键id")]
-        public long post_id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("主键id")]
+        //public long post_id { get; set; }
 
         /// <summary>
         /// 岗位编码

MicroServices/Business/Bussiness.Model/SystemData/sys_post_staff.cs

@@ -10,12 +10,12 @@ namespace Bussiness.Model.SystemData
     [Description("员工岗位关联表")]
     public class sys_post_staff: BaseEntity
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("主键id")]
-        public long id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("主键id")]
+        //public long id { get; set; }
 
         /// <summary>
         /// 员工id

MicroServices/Business/Bussiness.Model/SystemData/sys_schedule.cs

@@ -10,12 +10,12 @@ namespace Bussiness.Model.SystemData
     [Description("班次表")]
     public class sys_schedule: BaseEntity
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("班次主键id")]
-        public long schedule_id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("班次主键id")]
+        //public long schedule_id { get; set; }
 
         /// <summary>
         /// 班次编码

MicroServices/Business/Bussiness.Model/SystemData/sys_shift.cs

@@ -10,12 +10,12 @@ namespace Bussiness.Model.SystemData
     [Description("班制表")]
     public class sys_shift: BaseEntity
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("主键id")]
-        public long shift_id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("主键id")]
+        //public long shift_id { get; set; }
 
         /// <summary>
         /// 班制编码

MicroServices/Business/Bussiness.Model/SystemData/sys_shift_invalid_time.cs

@@ -7,15 +7,15 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// 班次无效时间表
     /// </summary>
-    [Description("数据状态标识 1启用 0停用")]
+    [Description("班次无效时间表")]
     public class sys_shift_invalid_time:BaseEntity
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("数据状态标识 1启用 0停用")]
-        public long invalid_time_id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("数据状态标识 1启用 0停用")]
+        //public long invalid_time_id { get; set; }
 
         /// <summary>
         /// 班次id

MicroServices/Business/Bussiness.Model/SystemData/sys_shift_schedule.cs

@@ -10,12 +10,12 @@ namespace Bussiness.Model.SystemData
     [Description("班制班次关联表")]
     public class sys_shift_schedule:BaseEntity
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("主键id")]
-        public long id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("主键id")]
+        //public long id { get; set; }
 
         /// <summary>
         /// 班制id

MicroServices/Business/Bussiness.Model/SystemData/sys_staff.cs

@@ -7,15 +7,15 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// 员工表
     /// </summary>
-    [Description("是否跨天 1是 0否")]
+    [Description("员工表")]
     public class sys_staff:BaseEntity
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("主键id")]
-        public long staff_id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("主键id")]
+        //public long staff_id { get; set; }
 
         /// <summary>
         /// 员工编码

MicroServices/Business/Bussiness.Model/SystemData/sys_upload.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities;
 
 namespace Bussiness.Model.SystemData
 {
@@ -7,14 +8,14 @@ namespace Bussiness.Model.SystemData
     /// 文件上传表
     /// </summary>
     [Description("文件上传表")]
-    public class sys_upload
+    public class sys_upload:Entity<long>
     {
-        /// <summary>
-        /// 主键id
-        /// </summary>
-        [Key]
-        [Description("主键id")]
-        public long upload_id { get; set; }
+        ///// <summary>
+        ///// 主键id
+        ///// </summary>
+        //[Key]
+        //[Description("主键id")]
+        //public long upload_id { get; set; }
 
         /// <summary>
         /// 文件存储路径

MicroServices/FileStorage/FileStorage.EntityFrameworkCore/EntityFrameworkCore/FileStorageDbContext.cs

@@ -8,7 +8,7 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace FileStorage.EntityFrameworkCore
 {
-    [ConnectionStringName("FileStorage")]
+    [ConnectionStringName("Default")]
     public class FileStorageDbContext : AbpDbContext<FileStorageDbContext>
     {
         public DbSet<FileInfo> FileInfos { get; set; }

MicroServices/FileStorage/FileStorage.Host/EntityFrameworkCore/FileStorageMigrationDbContextFactory.cs

@@ -16,7 +16,7 @@ namespace FileStorage.EntityFrameworkCore
             var configuration = BuildConfiguration();
 
             var builder = new DbContextOptionsBuilder<FileStorageMigrationDbContext>()
-                .UseMySql(configuration.GetConnectionString("FileStorage"),new MySqlServerVersion(new Version()));
+                .UseMySql(configuration.GetConnectionString("Default"),new MySqlServerVersion(new Version()));
 
             return new FileStorageMigrationDbContext(builder.Options);
         }

MicroServices/FileStorage/FileStorage.Host/Migrations/20230131063128_init.Designer.cs → MicroServices/FileStorage/FileStorage.Host/Migrations/20230201071937_init.Designer.cs

@@ -12,7 +12,7 @@ using Volo.Abp.EntityFrameworkCore;
 namespace FileStorage.Migrations
 {
     [DbContext(typeof(FileStorageMigrationDbContext))]
-    [Migration("20230131063128_init")]
+    [Migration("20230201071937_init")]
     partial class init
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)

MicroServices/FileStorage/FileStorage.Host/appsettings.json

@@ -3,8 +3,7 @@
     "CorsOrigins": "http://localhost:9527"
   },
   "ConnectionStrings": {
-    "Default": "Server=123.60.180.165;Database=dopbiz;Uid=root; Pwd=5heng=uN;Allow User Variables=True;sslMode=None;",
-    "FileStorage": "Server=123.60.180.165;Database=FileStorage;Uid=root; Pwd=5heng=uN;Allow User Variables=True;sslMode=None;"
+    "Default": "Server=123.60.180.165;Database=dopbiz;Uid=root; Pwd=5heng=uN;Allow User Variables=True;sslMode=None;"
   },
   "Redis": {
     "Configuration": "192.168.1.191"