Sfoglia il codice sorgente

命名空间调整

Murphy 2 anni fa
parent
commit
e7d68b7674
100 ha cambiato i file con 176 aggiunte e 225 eliminazioni
  1. 1 0
      .gitignore
  2. 1 1
      MicroServices/Business/Buissness.UnitTest/Business.TestBase.csproj
  3. 2 2
      MicroServices/Business/Business.Application.Contracts/Business.Application.Contracts.csproj
  4. 2 2
      MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/BomChildExamineDto.cs
  5. 3 3
      MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/GenerateMorderDto.cs
  6. 2 2
      MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/Mes_MorderDto.cs
  7. 4 4
      MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/PschedDto.cs
  8. 2 2
      MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/SRMPRDto.cs
  9. 2 2
      MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/TechProcDto.cs
  10. 2 2
      MicroServices/Business/Business.Application/Business.Application.csproj
  11. 9 9
      MicroServices/Business/Business.Application/BusinessApplicationAutoMapperProfile.cs
  12. 3 3
      MicroServices/Business/Business.Application/PriorityManagement/PriorityAppService.cs
  13. 3 10
      MicroServices/Business/Business.Application/Quartz/ExtJobService.cs
  14. 3 14
      MicroServices/Business/Business.Application/Quartz/ProductionScheduleAppService.cs
  15. 6 15
      MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs
  16. 4 4
      MicroServices/Business/Business.Application/ResourceExamineManagement/MorderAppService.cs
  17. 2 10
      MicroServices/Business/Business.Application/ResourceExamineManagement/PretreatmentAppService.cs
  18. 4 4
      MicroServices/Business/Business.Application/ResourceExamineManagement/ProductExamineAppService.cs
  19. 6 6
      MicroServices/Business/Business.Application/ResourceExamineManagement/PurchaseOrderAppService.cs
  20. 11 11
      MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs
  21. 6 6
      MicroServices/Business/Business.Application/SyncDataManagement/SyncMySQLDataAppService.cs
  22. 2 5
      MicroServices/Business/Business.Application/WMS/SyncKingdeeAppService.cs
  23. 1 1
      MicroServices/Business/Business.Domain/Business.Domain.csproj
  24. 1 1
      MicroServices/Business/Business.EntityFrameworkCore/Business.EntityFrameworkCore.csproj
  25. 1 1
      MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/Bang/BusinessBangDbContext.cs
  26. 7 7
      MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs
  27. 6 6
      MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/DOP/BusinessDbContext.cs
  28. 2 2
      MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/Ext/BusinessExtDbContext.cs
  29. 1 1
      MicroServices/Business/Business.EntityFrameworkCore/Repository/SqlRepositories/ISqlRepository.cs
  30. 1 1
      MicroServices/Business/Business.EntityFrameworkCore/Repository/SqlRepositories/SqlRepository.cs
  31. 1 1
      MicroServices/Business/Business.Host/Startup.cs
  32. 2 2
      MicroServices/Business/Business.Test/ProductExamineTest.cs
  33. 6 6
      MicroServices/Business/Business.sln
  34. 2 2
      MicroServices/Business/Bussiness.ApplicationTest/Business.ApplicationTest.csproj
  35. 1 1
      MicroServices/Business/Bussiness.Domain.Test/Business.Domain.Test.csproj
  36. 1 1
      MicroServices/Business/Bussiness.Domain.Test/MES/IC/ic_substitute_Tests.cs
  37. 1 1
      MicroServices/Business/Bussiness.EntityFrameworkCore.Test/Business.EntityFrameworkCore.Test.csproj
  38. 1 1
      MicroServices/Business/Bussiness.Model/Bang/b_bom_child_examine.cs
  39. 1 1
      MicroServices/Business/Bussiness.Model/Bang/b_bom_pretreatment.cs
  40. 1 1
      MicroServices/Business/Bussiness.Model/Bang/b_day_bulletin_board.cs
  41. 1 1
      MicroServices/Business/Bussiness.Model/Bang/b_examine_result.cs
  42. 1 1
      MicroServices/Business/Bussiness.Model/Bang/b_mo_occupy.cs
  43. 1 1
      MicroServices/Business/Bussiness.Model/Bang/b_mo_order.cs
  44. 1 1
      MicroServices/Business/Bussiness.Model/Bang/b_ooder.cs
  45. 1 1
      MicroServices/Business/Bussiness.Model/Bang/b_order_detail.cs
  46. 1 1
      MicroServices/Business/Bussiness.Model/Bang/b_order_examine_result.cs
  47. 1 1
      MicroServices/Business/Bussiness.Model/Bang/b_purchase.cs
  48. 1 1
      MicroServices/Business/Bussiness.Model/Bang/b_purchase_occupy.cs
  49. 0 0
      MicroServices/Business/Bussiness.Model/Business.Model.csproj
  50. 1 4
      MicroServices/Business/Bussiness.Model/Ext/ext_xref.cs
  51. 1 3
      MicroServices/Business/Bussiness.Model/Ext/in_kd_bom.cs
  52. 1 4
      MicroServices/Business/Bussiness.Model/Ext/in_kd_material.cs
  53. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/InvMaster.cs
  54. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/ItemMaster.cs
  55. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/NbrDetail.cs
  56. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/NbrMaster.cs
  57. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/bom.cs
  58. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/ic_bom.cs
  59. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/ic_bom_child.cs
  60. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/ic_check.cs
  61. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/ic_factory_details.cs
  62. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/ic_item.cs
  63. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/ic_item_inventory.cs
  64. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/ic_item_stock.cs
  65. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/ic_item_stockoccupy.cs
  66. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/ic_metering_unit.cs
  67. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/ic_plan.cs
  68. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute.cs
  69. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute_group.cs
  70. 1 1
      MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute_group_detail.cs
  71. 1 1
      MicroServices/Business/Bussiness.Model/Production/HolidayMaster.cs
  72. 1 1
      MicroServices/Business/Bussiness.Model/Production/PeriodSequenceDet.cs
  73. 1 1
      MicroServices/Business/Bussiness.Model/Production/ProdLineDetail.cs
  74. 1 1
      MicroServices/Business/Bussiness.Model/Production/QualityLineWorkDetail.cs
  75. 1 1
      MicroServices/Business/Bussiness.Model/Production/ScheduleExceptionMaster.cs
  76. 1 1
      MicroServices/Business/Bussiness.Model/Production/ScheduleResultOpMaster.cs
  77. 1 1
      MicroServices/Business/Bussiness.Model/Production/ShopCalendarWorkCtr.cs
  78. 1 1
      MicroServices/Business/Bussiness.Model/Production/WorkOrdDetail.cs
  79. 1 1
      MicroServices/Business/Bussiness.Model/Production/WorkOrdMaster.cs
  80. 1 1
      MicroServices/Business/Bussiness.Model/Production/WorkOrdRouting.cs
  81. 1 1
      MicroServices/Business/Bussiness.Model/Production/mes_moentry.cs
  82. 1 1
      MicroServices/Business/Bussiness.Model/Production/mes_mooccupy.cs
  83. 1 1
      MicroServices/Business/Bussiness.Model/Production/mes_morder.cs
  84. 1 1
      MicroServices/Business/Bussiness.Model/Production/mes_oorder.cs
  85. 1 1
      MicroServices/Business/Bussiness.Model/Production/mes_stockoccupy.cs
  86. 1 3
      MicroServices/Business/Bussiness.Model/SRM/srm_po_list.cs
  87. 1 3
      MicroServices/Business/Bussiness.Model/SRM/srm_po_main.cs
  88. 1 1
      MicroServices/Business/Bussiness.Model/SRM/srm_po_occupy.cs
  89. 1 1
      MicroServices/Business/Bussiness.Model/SRM/srm_pr_main.cs
  90. 1 1
      MicroServices/Business/Bussiness.Model/SRM/srm_purchase.cs
  91. 1 1
      MicroServices/Business/Bussiness.Model/SRM/srm_supplier.cs
  92. 1 1
      MicroServices/Business/Bussiness.Model/Sale/TagMaster.cs
  93. 1 1
      MicroServices/Business/Bussiness.Model/Sale/crm_customer.cs
  94. 1 1
      MicroServices/Business/Bussiness.Model/Sale/crm_seorder.cs
  95. 1 1
      MicroServices/Business/Bussiness.Model/Sale/crm_seorderentry.cs
  96. 1 1
      MicroServices/Business/Bussiness.Model/Tech/mes_process.cs
  97. 1 1
      MicroServices/Business/Bussiness.Model/Tech/mes_tech_process.cs
  98. 1 1
      MicroServices/Business/Bussiness.Model/Tech/mes_technique.cs
  99. 1 1
      MicroServices/Business/Bussiness.Model/Tech/mes_workshop.cs
  100. 1 1
      MicroServices/Business/Bussiness.MongoModel/Base/MoBaseEntity.cs

+ 1 - 0
.gitignore

@@ -2028,3 +2028,4 @@ MicroServices/Business/Bussiness.MongoModel/bin/Debug/net6.0/Bussiness.MongoMode
 /MicroServices/Procurement/.vs/ProjectEvaluation/procurement.metadata.v6.1
 /MicroServices/Procurement/.vs/ProjectEvaluation/procurement.metadata.v6.1
 /MicroServices/Procurement/.vs/ProjectEvaluation/procurement.projects.v6.1
 /MicroServices/Procurement/.vs/ProjectEvaluation/procurement.projects.v6.1
 /MicroServices/Procurement/Procurement.Host/obj/Debug/net6.0/Procurement.Host.csproj.AssemblyReference.cache
 /MicroServices/Procurement/Procurement.Host/obj/Debug/net6.0/Procurement.Host.csproj.AssemblyReference.cache
+/MicroServices/Business/Bussiness.MongoModel/obj

+ 1 - 1
MicroServices/Business/Buissness.UnitTest/Buissness.TestBase.csproj → MicroServices/Business/Buissness.UnitTest/Business.TestBase.csproj

@@ -21,7 +21,7 @@
 
 
   <ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Business.Domain\Business.Domain.csproj" />
     <ProjectReference Include="..\Business.Domain\Business.Domain.csproj" />
-    <ProjectReference Include="..\Bussiness.Model\Bussiness.Model.csproj" />
+    <ProjectReference Include="..\Bussiness.Model\Business.Model.csproj" />
   </ItemGroup>
   </ItemGroup>
 
 
 </Project>
 </Project>

+ 2 - 2
MicroServices/Business/Business.Application.Contracts/Business.Application.Contracts.csproj

@@ -38,8 +38,8 @@
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Bussiness.Model\Bussiness.Model.csproj" />
-    <ProjectReference Include="..\Bussiness.MongoModel\Bussiness.MongoModel.csproj" />
+    <ProjectReference Include="..\Bussiness.Model\Business.Model.csproj" />
+    <ProjectReference Include="..\Bussiness.MongoModel\Business.MongoModel.csproj" />
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>

+ 2 - 2
MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/BomChildExamineDto.cs

@@ -1,5 +1,5 @@
-using Bussiness.MongoModel.Production;
-using Bussiness.MongoModel.SRM;
+using Business.MongoModel.Production;
+using Business.MongoModel.SRM;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;

+ 3 - 3
MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/GenerateMorderDto.cs

@@ -1,6 +1,6 @@
-using Bussiness.Model.MES.IC;
-using Bussiness.Model.Sale;
-using Bussiness.MongoModel.MES.IC;
+using Business.Model.MES.IC;
+using Business.Model.Sale;
+using Business.MongoModel.MES.IC;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;

+ 2 - 2
MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/Mes_MorderDto.cs

@@ -1,5 +1,5 @@
-using Bussiness.Model.Production;
-using Bussiness.MongoModel.Production;
+using Business.Model.Production;
+using Business.MongoModel.Production;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;

+ 4 - 4
MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/PschedDto.cs

@@ -2,10 +2,10 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Dtos;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
-using Bussiness.Model.MES.IC;
-using Bussiness.Model.Production;
-using Bussiness.MongoModel.MES.IC;
-using Bussiness.MongoModel.Production;
+using Business.Model.MES.IC;
+using Business.Model.Production;
+using Business.MongoModel.MES.IC;
+using Business.MongoModel.Production;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
 
 namespace Business.ResourceExamineManagement.Dto
 namespace Business.ResourceExamineManagement.Dto

+ 2 - 2
MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/SRMPRDto.cs

@@ -1,5 +1,5 @@
-using Bussiness.Model.SRM;
-using Bussiness.MongoModel.SRM;
+using Business.Model.SRM;
+using Business.MongoModel.SRM;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;

+ 2 - 2
MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/TechProcDto.cs

@@ -1,5 +1,5 @@
-using Bussiness.Model.Tech;
-using Bussiness.MongoModel.Tech;
+using Business.Model.Tech;
+using Business.MongoModel.Tech;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;

+ 2 - 2
MicroServices/Business/Business.Application/Business.Application.csproj

@@ -25,8 +25,8 @@
     <ProjectReference Include="..\Business.Application.Contracts\Business.Application.Contracts.csproj" />
     <ProjectReference Include="..\Business.Application.Contracts\Business.Application.Contracts.csproj" />
     <ProjectReference Include="..\Business.Domain\Business.Domain.csproj" />
     <ProjectReference Include="..\Business.Domain\Business.Domain.csproj" />
     <ProjectReference Include="..\Business.EntityFrameworkCore\Business.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\Business.EntityFrameworkCore\Business.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\Bussiness.Model\Bussiness.Model.csproj" />
-    <ProjectReference Include="..\Bussiness.MongoModel\Bussiness.MongoModel.csproj" />
+    <ProjectReference Include="..\Bussiness.Model\Business.Model.csproj" />
+    <ProjectReference Include="..\Bussiness.MongoModel\Business.MongoModel.csproj" />
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>

+ 9 - 9
MicroServices/Business/Business.Application/BusinessApplicationAutoMapperProfile.cs

@@ -1,14 +1,14 @@
 using AutoMapper;
 using AutoMapper;
 using Business.ResourceExamineManagement.Dto;
 using Business.ResourceExamineManagement.Dto;
-using Bussiness.Model.Bang;
-using Bussiness.Model.MES.IC;
-using Bussiness.Model.Production;
-using Bussiness.Model.SRM;
-using Bussiness.Model.Tech;
-using Bussiness.MongoModel.MES.IC;
-using Bussiness.MongoModel.Production;
-using Bussiness.MongoModel.SRM;
-using Bussiness.MongoModel.Tech;
+using Business.Model.Bang;
+using Business.Model.MES.IC;
+using Business.Model.Production;
+using Business.Model.SRM;
+using Business.Model.Tech;
+using Business.MongoModel.MES.IC;
+using Business.MongoModel.Production;
+using Business.MongoModel.SRM;
+using Business.MongoModel.Tech;
 
 
 namespace Business
 namespace Business
 {
 {

+ 3 - 3
MicroServices/Business/Business.Application/PriorityManagement/PriorityAppService.cs

@@ -1,7 +1,7 @@
 using Business.ResourceExamineManagement.Dto;
 using Business.ResourceExamineManagement.Dto;
-using Bussiness.Model.MES.IC;
-using Bussiness.Model.Sale;
-using Bussiness.MongoModel.MES.IC;
+using Business.Model.MES.IC;
+using Business.Model.Sale;
+using Business.MongoModel.MES.IC;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;

+ 3 - 10
MicroServices/Business/Business.Application/Quartz/ExtJobService.cs

@@ -1,19 +1,12 @@
 using Business.Core.Utilities;
 using Business.Core.Utilities;
 using Business.EntityFrameworkCore;
 using Business.EntityFrameworkCore;
-using Bussiness.Model.Ext;
-using Bussiness.Model.MES.IC;
-using Bussiness.Model.SRM;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Hosting;
+using Business.Model.Ext;
+using Business.Model.MES.IC;
+using Business.Model.SRM;
 using NLog;
 using NLog;
-using SixLabors.ImageSharp;
-using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;
-using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
-using System.Xml.Linq;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Domain.Repositories;
 
 

+ 3 - 14
MicroServices/Business/Business.Application/Quartz/ProductionScheduleAppService.cs

@@ -1,28 +1,17 @@
 using Business.Business.Dto;
 using Business.Business.Dto;
 using Business.Core.Utilities;
 using Business.Core.Utilities;
 using Business.Dto;
 using Business.Dto;
-using Business.ResourceExamineManagement.Dto;
-using Bussiness.EntityFrameworkCore.SqlRepositories;
-using Bussiness.Model.MES.IC;
-using Bussiness.Model.Production;
-using Bussiness.Model.SRM;
+using Business.EntityFrameworkCore.SqlRepositories;
+using Business.Model.MES.IC;
+using Business.Model.Production;
 using MongoDB.Driver;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
 using MongoDB.Driver.Linq;
-using Quartz;
-using Spire.Pdf.Exporting.XPS.Schema;
-using Spire.Pdf.General.Paper.Font.Rendering.Path;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
-using ThoughtWorks.QRCode.Codec.Util;
-using ThoughtWorks.QRCode.Geom;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Application.Services;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Validation.Localization;
 
 
 namespace Business.Quartz
 namespace Business.Quartz
 {
 {

+ 6 - 15
MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -1,24 +1,15 @@
 using Business.Core.Enum;
 using Business.Core.Enum;
-using Business.Core.MongoDBHelper;
 using Business.Core.Utilities;
 using Business.Core.Utilities;
+using Business.Model.Sale;
+using Business.Model.SRM;
+using Business.MongoModel.MES.IC;
+using Business.MongoModel.Production;
+using Business.MongoModel.SRM;
+using Business.MongoModel.Tech;
 using Business.ResourceExamineManagement.Dto;
 using Business.ResourceExamineManagement.Dto;
-using Bussiness.Model.MES.IC;
-using Bussiness.Model.Production;
-using Bussiness.Model.Sale;
-using Bussiness.Model.SRM;
-using Bussiness.MongoModel.MES.IC;
-using Bussiness.MongoModel.Production;
-using Bussiness.MongoModel.SRM;
-using Bussiness.MongoModel.Tech;
-using NUglify.Helpers;
-using Spire.Pdf.Exporting.XPS.Schema;
-using Spire.Pdf.General.Render.Decode.Jpeg2000.j2k.wavelet.synthesis;
 using System;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Application.Services;
 
 
 namespace Business.ResourceExamineManagement
 namespace Business.ResourceExamineManagement

+ 4 - 4
MicroServices/Business/Business.Application/ResourceExamineManagement/MorderAppService.cs

@@ -1,10 +1,10 @@
 using Business.Core.Enum;
 using Business.Core.Enum;
 using Business.Core.Utilities;
 using Business.Core.Utilities;
+using Business.Model.Sale;
+using Business.MongoModel.MES.IC;
+using Business.MongoModel.Production;
+using Business.MongoModel.Tech;
 using Business.ResourceExamineManagement.Dto;
 using Business.ResourceExamineManagement.Dto;
-using Bussiness.Model.Sale;
-using Bussiness.MongoModel.MES.IC;
-using Bussiness.MongoModel.Production;
-using Bussiness.MongoModel.Tech;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;

+ 2 - 10
MicroServices/Business/Business.Application/ResourceExamineManagement/PretreatmentAppService.cs

@@ -1,16 +1,8 @@
-using Business.Core.MongoDBHelper;
-using Business.Core.Utilities;
+using Business.Core.Utilities;
+using Business.MongoModel.MES.IC;
 using Business.ResourceExamineManagement.Dto;
 using Business.ResourceExamineManagement.Dto;
-using Bussiness.Model.MES.IC;
-using Bussiness.Model.Production;
-using Bussiness.MongoModel.MES.IC;
-using SixLabors.ImageSharp;
-using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Application.Services;
 
 
 namespace Business.ResourceExamineManagement
 namespace Business.ResourceExamineManagement

+ 4 - 4
MicroServices/Business/Business.Application/ResourceExamineManagement/ProductExamineAppService.cs

@@ -1,9 +1,9 @@
 using Business.Core.MongoDBHelper;
 using Business.Core.MongoDBHelper;
 using Business.ResourceExamineManagement.Dto;
 using Business.ResourceExamineManagement.Dto;
-using Bussiness.Model.Production;
-using Bussiness.Model.Tech;
-using Bussiness.MongoModel.Production;
-using Bussiness.MongoModel.Tech;
+using Business.Model.Production;
+using Business.Model.Tech;
+using Business.MongoModel.Production;
+using Business.MongoModel.Tech;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;

+ 6 - 6
MicroServices/Business/Business.Application/ResourceExamineManagement/PurchaseOrderAppService.cs

@@ -2,12 +2,12 @@
 using Business.Core.MongoDBHelper;
 using Business.Core.MongoDBHelper;
 using Business.Core.Utilities;
 using Business.Core.Utilities;
 using Business.ResourceExamineManagement.Dto;
 using Business.ResourceExamineManagement.Dto;
-using Bussiness.Model.MES.IC;
-using Bussiness.Model.Sale;
-using Bussiness.Model.SRM;
-using Bussiness.MongoModel.MES.IC;
-using Bussiness.MongoModel.Production;
-using Bussiness.MongoModel.SRM;
+using Business.Model.MES.IC;
+using Business.Model.Sale;
+using Business.Model.SRM;
+using Business.MongoModel.MES.IC;
+using Business.MongoModel.Production;
+using Business.MongoModel.SRM;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;

+ 11 - 11
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -3,17 +3,17 @@ using Business.Core.MongoDBHelper;
 using Business.Core.Utilities;
 using Business.Core.Utilities;
 using Business.EntityFrameworkCore;
 using Business.EntityFrameworkCore;
 using Business.ResourceExamineManagement.Dto;
 using Business.ResourceExamineManagement.Dto;
-using Bussiness.EntityFrameworkCore.SqlRepositories;
-using Bussiness.Model.Bang;
-using Bussiness.Model.MES.IC;
-using Bussiness.Model.Production;
-using Bussiness.Model.Sale;
-using Bussiness.Model.SRM;
-using Bussiness.Model.Tech;
-using Bussiness.MongoModel.MES.IC;
-using Bussiness.MongoModel.Production;
-using Bussiness.MongoModel.SRM;
-using Bussiness.MongoModel.Tech;
+using Business.EntityFrameworkCore.SqlRepositories;
+using Business.Model.Bang;
+using Business.Model.MES.IC;
+using Business.Model.Production;
+using Business.Model.Sale;
+using Business.Model.SRM;
+using Business.Model.Tech;
+using Business.MongoModel.MES.IC;
+using Business.MongoModel.Production;
+using Business.MongoModel.SRM;
+using Business.MongoModel.Tech;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using MongoDB.Driver;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
 using MongoDB.Driver.Linq;

+ 6 - 6
MicroServices/Business/Business.Application/SyncDataManagement/SyncMySQLDataAppService.cs

@@ -1,11 +1,11 @@
 using Business.Core.MongoDBHelper;
 using Business.Core.MongoDBHelper;
 using Business.Core.Utilities;
 using Business.Core.Utilities;
-using Bussiness.Model.MES.IC;
-using Bussiness.Model.SRM;
-using Bussiness.Model.Tech;
-using Bussiness.MongoModel.MES.IC;
-using Bussiness.MongoModel.SRM;
-using Bussiness.MongoModel.Tech;
+using Business.Model.MES.IC;
+using Business.Model.SRM;
+using Business.Model.Tech;
+using Business.MongoModel.MES.IC;
+using Business.MongoModel.SRM;
+using Business.MongoModel.Tech;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Application.Services;

+ 2 - 5
MicroServices/Business/Business.Application/WMS/SyncKingdeeAppService.cs

@@ -1,11 +1,8 @@
-using Business.ResourceExamineManagement.Dto;
-using Bussiness.Model.Ext;
-using Bussiness.Model.Tech;
+using Business.Model.Ext;
+using Business.Model.Tech;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration;
-using Newtonsoft.Json;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Application.Services;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Domain.Repositories;

+ 1 - 1
MicroServices/Business/Business.Domain/Business.Domain.csproj

@@ -29,7 +29,7 @@
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Bussiness.Model\Bussiness.Model.csproj" />
+    <ProjectReference Include="..\Bussiness.Model\Business.Model.csproj" />
   </ItemGroup>
   </ItemGroup>
 
 
 </Project>
 </Project>

+ 1 - 1
MicroServices/Business/Business.EntityFrameworkCore/Business.EntityFrameworkCore.csproj

@@ -29,7 +29,7 @@
 
 
   <ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Business.Domain\Business.Domain.csproj" />
     <ProjectReference Include="..\Business.Domain\Business.Domain.csproj" />
-    <ProjectReference Include="..\Bussiness.Model\Bussiness.Model.csproj" />
+    <ProjectReference Include="..\Bussiness.Model\Business.Model.csproj" />
   </ItemGroup>
   </ItemGroup>
 
 
 </Project>
 </Project>

+ 1 - 1
MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/Bang/BusinessBangDbContext.cs

@@ -1,4 +1,4 @@
-using Bussiness.Model.Bang;
+using Business.Model.Bang;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Data;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;

+ 7 - 7
MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs

@@ -1,10 +1,10 @@
-using Bussiness.Model.Bang;
-using Bussiness.Model.Ext;
-using Bussiness.Model.MES.IC;
-using Bussiness.Model.Production;
-using Bussiness.Model.Sale;
-using Bussiness.Model.SRM;
-using Bussiness.Model.Tech;
+using Business.Model.Bang;
+using Business.Model.Ext;
+using Business.Model.MES.IC;
+using Business.Model.Production;
+using Business.Model.Sale;
+using Business.Model.SRM;
+using Business.Model.Tech;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp;
 using Volo.Abp;
 using Volo.Abp.EntityFrameworkCore.Modeling;
 using Volo.Abp.EntityFrameworkCore.Modeling;

+ 6 - 6
MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/DOP/BusinessDbContext.cs

@@ -1,9 +1,9 @@
-using Bussiness.Model.Bang;
-using Bussiness.Model.MES.IC;
-using Bussiness.Model.Production;
-using Bussiness.Model.Sale;
-using Bussiness.Model.SRM;
-using Bussiness.Model.Tech;
+using Business.Model.Bang;
+using Business.Model.MES.IC;
+using Business.Model.Production;
+using Business.Model.Sale;
+using Business.Model.SRM;
+using Business.Model.Tech;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Data;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;

+ 2 - 2
MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/Ext/BusinessExtDbContext.cs

@@ -1,5 +1,5 @@
-using Bussiness.Model.Ext;
-using Bussiness.Model.MES.IC;
+using Business.Model.Ext;
+using Business.Model.MES.IC;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Data;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;

+ 1 - 1
MicroServices/Business/Business.EntityFrameworkCore/Repository/SqlRepositories/ISqlRepository.cs

@@ -6,7 +6,7 @@ using System.Data.SqlClient;
 using System.Linq.Expressions;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.EntityFrameworkCore.SqlRepositories
+namespace Business.EntityFrameworkCore.SqlRepositories
 {
 {
     public interface ISqlRepository<T> where T : class, new()
     public interface ISqlRepository<T> where T : class, new()
     {
     {

+ 1 - 1
MicroServices/Business/Business.EntityFrameworkCore/Repository/SqlRepositories/SqlRepository.cs

@@ -14,7 +14,7 @@ using System.Linq.Expressions;
 using Z.EntityFramework.Plus;
 using Z.EntityFramework.Plus;
 using System.Data.SqlClient;
 using System.Data.SqlClient;
 
 
-namespace Bussiness.EntityFrameworkCore.SqlRepositories
+namespace Business.EntityFrameworkCore.SqlRepositories
 {
 {
     public class SqlRepository<T>:ISqlRepository<T> where T : class, new()
     public class SqlRepository<T>:ISqlRepository<T> where T : class, new()
     {
     {

+ 1 - 1
MicroServices/Business/Business.Host/Startup.cs

@@ -1,5 +1,5 @@
 using Business.Core.MongoDBHelper;
 using Business.Core.MongoDBHelper;
-using Bussiness.EntityFrameworkCore.SqlRepositories;
+using Business.EntityFrameworkCore.SqlRepositories;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;

+ 2 - 2
MicroServices/Business/Business.Test/ProductExamineTest.cs

@@ -1,8 +1,8 @@
 using Business.Core.MongoDBHelper;
 using Business.Core.MongoDBHelper;
 using Business.ResourceExamineManagement;
 using Business.ResourceExamineManagement;
 using Business.ResourceExamineManagement.Dto;
 using Business.ResourceExamineManagement.Dto;
-using Bussiness.Model.Tech;
-using Bussiness.MongoModel.Tech;
+using Business.Model.Tech;
+using Business.MongoModel.Tech;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;

+ 6 - 6
MicroServices/Business/Business.sln

@@ -17,23 +17,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.HttpApi", "Busines
 EndProject
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.HttpApi.Client", "Business.HttpApi.Client\Business.HttpApi.Client.csproj", "{06A26D1B-65D0-44BE-AECD-FF498CB1436D}"
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.HttpApi.Client", "Business.HttpApi.Client\Business.HttpApi.Client.csproj", "{06A26D1B-65D0-44BE-AECD-FF498CB1436D}"
 EndProject
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bussiness.Model", "Bussiness.Model\Bussiness.Model.csproj", "{D9A37E35-A3BD-4A11-A3D8-571586EB2007}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.Model", "Bussiness.Model\Business.Model.csproj", "{D9A37E35-A3BD-4A11-A3D8-571586EB2007}"
 EndProject
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.Core", "Business.Core\Business.Core.csproj", "{EFA46C37-CF8B-425D-8DE3-85FE11116980}"
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.Core", "Business.Core\Business.Core.csproj", "{EFA46C37-CF8B-425D-8DE3-85FE11116980}"
 EndProject
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bussiness.MongoModel", "Bussiness.MongoModel\Bussiness.MongoModel.csproj", "{604EACA4-3A26-425C-91B3-4516BA5282BB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.MongoModel", "Bussiness.MongoModel\Business.MongoModel.csproj", "{604EACA4-3A26-425C-91B3-4516BA5282BB}"
 EndProject
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{4523E5A9-9492-49A2-8A1A-46080749D966}"
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{4523E5A9-9492-49A2-8A1A-46080749D966}"
 EndProject
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.Test", "Business.Test\Business.Test.csproj", "{66017D12-2115-4DC9-B400-E5E57EE2D16E}"
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.Test", "Business.Test\Business.Test.csproj", "{66017D12-2115-4DC9-B400-E5E57EE2D16E}"
 EndProject
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Buissness.TestBase", "Buissness.UnitTest\Buissness.TestBase.csproj", "{DFAA3146-7008-4F54-B48B-013E80208376}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.TestBase", "Buissness.UnitTest\Business.TestBase.csproj", "{DFAA3146-7008-4F54-B48B-013E80208376}"
 EndProject
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bussiness.ApplicationTest", "Bussiness.ApplicationTest\Bussiness.ApplicationTest.csproj", "{9BDE4DA1-1F56-410D-A1A7-53EB3E8848B2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.ApplicationTest", "Bussiness.ApplicationTest\Business.ApplicationTest.csproj", "{9BDE4DA1-1F56-410D-A1A7-53EB3E8848B2}"
 EndProject
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bussiness.Domain.Test", "Bussiness.Domain.Test\Bussiness.Domain.Test.csproj", "{A723B3B5-6C40-495D-88A7-8ADBBAB76710}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.Domain.Test", "Bussiness.Domain.Test\Business.Domain.Test.csproj", "{A723B3B5-6C40-495D-88A7-8ADBBAB76710}"
 EndProject
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bussiness.EntityFrameworkCore.Test", "Bussiness.EntityFrameworkCore.Test\Bussiness.EntityFrameworkCore.Test.csproj", "{F55D18B1-65B3-4417-9EA1-032630A2201A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.EntityFrameworkCore.Test", "Bussiness.EntityFrameworkCore.Test\Business.EntityFrameworkCore.Test.csproj", "{F55D18B1-65B3-4417-9EA1-032630A2201A}"
 EndProject
 EndProject
 Global
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+ 2 - 2
MicroServices/Business/Bussiness.ApplicationTest/Bussiness.ApplicationTest.csproj → MicroServices/Business/Bussiness.ApplicationTest/Business.ApplicationTest.csproj

@@ -17,9 +17,9 @@
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Buissness.UnitTest\Buissness.TestBase.csproj" />
+    <ProjectReference Include="..\Buissness.UnitTest\Business.TestBase.csproj" />
     <ProjectReference Include="..\Business.Application\Business.Application.csproj" />
     <ProjectReference Include="..\Business.Application\Business.Application.csproj" />
-    <ProjectReference Include="..\Bussiness.Domain.Test\Bussiness.Domain.Test.csproj" />
+    <ProjectReference Include="..\Bussiness.Domain.Test\Business.Domain.Test.csproj" />
   </ItemGroup>
   </ItemGroup>
 
 
 </Project>
 </Project>

+ 1 - 1
MicroServices/Business/Bussiness.Domain.Test/Bussiness.Domain.Test.csproj → MicroServices/Business/Bussiness.Domain.Test/Business.Domain.Test.csproj

@@ -22,7 +22,7 @@
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Bussiness.EntityFrameworkCore.Test\Bussiness.EntityFrameworkCore.Test.csproj" />
+    <ProjectReference Include="..\Bussiness.EntityFrameworkCore.Test\Business.EntityFrameworkCore.Test.csproj" />
   </ItemGroup>
   </ItemGroup>
 
 
 </Project>
 </Project>

+ 1 - 1
MicroServices/Business/Bussiness.Domain.Test/MES/IC/ic_substitute_Tests.cs

@@ -1,4 +1,4 @@
-using Bussiness.Model.MES.IC;
+using Business.Model.MES.IC;
 using Shouldly;
 using Shouldly;
 using Xunit;
 using Xunit;
 
 

+ 1 - 1
MicroServices/Business/Bussiness.EntityFrameworkCore.Test/Bussiness.EntityFrameworkCore.Test.csproj → MicroServices/Business/Bussiness.EntityFrameworkCore.Test/Business.EntityFrameworkCore.Test.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Buissness.UnitTest\Buissness.TestBase.csproj" />
+    <ProjectReference Include="..\Buissness.UnitTest\Business.TestBase.csproj" />
     <ProjectReference Include="..\Business.EntityFrameworkCore\Business.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\Business.EntityFrameworkCore\Business.EntityFrameworkCore.csproj" />
   </ItemGroup>
   </ItemGroup>
 
 

+ 1 - 1
MicroServices/Business/Bussiness.Model/Bang/b_bom_child_examine.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Bang
+namespace Business.Model.Bang
 {
 {
     /// <summary>
     /// <summary>
     /// Bom明细检查结果
     /// Bom明细检查结果

+ 1 - 1
MicroServices/Business/Bussiness.Model/Bang/b_bom_pretreatment.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Bang
+namespace Business.Model.Bang
 {
 {
     /// <summary>
     /// <summary>
     /// Bom预处理
     /// Bom预处理

+ 1 - 1
MicroServices/Business/Bussiness.Model/Bang/b_day_bulletin_board.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Bang
+namespace Business.Model.Bang
 {
 {
     /// <summary>
     /// <summary>
     /// 每天消耗物料明细
     /// 每天消耗物料明细

+ 1 - 1
MicroServices/Business/Bussiness.Model/Bang/b_examine_result.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Bang
+namespace Business.Model.Bang
 {
 {
     /// <summary>
     /// <summary>
     /// 资源检查
     /// 资源检查

+ 1 - 1
MicroServices/Business/Bussiness.Model/Bang/b_mo_occupy.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Bang
+namespace Business.Model.Bang
 {
 {
     /// <summary>
     /// <summary>
     /// 在制占用明细
     /// 在制占用明细

+ 1 - 1
MicroServices/Business/Bussiness.Model/Bang/b_mo_order.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Bang
+namespace Business.Model.Bang
 {
 {
     /// <summary>
     /// <summary>
     /// 生产工单信息
     /// 生产工单信息

+ 1 - 1
MicroServices/Business/Bussiness.Model/Bang/b_ooder.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Bang
+namespace Business.Model.Bang
 {
 {
     /// <summary>
     /// <summary>
     /// 委外工单明细
     /// 委外工单明细

+ 1 - 1
MicroServices/Business/Bussiness.Model/Bang/b_order_detail.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Bang
+namespace Business.Model.Bang
 {
 {
     /// <summary>
     /// <summary>
     /// 物料齐套明细
     /// 物料齐套明细

+ 1 - 1
MicroServices/Business/Bussiness.Model/Bang/b_order_examine_result.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Bang
+namespace Business.Model.Bang
 {
 {
     /// <summary>
     /// <summary>
     /// 工单齐套检查
     /// 工单齐套检查

+ 1 - 1
MicroServices/Business/Bussiness.Model/Bang/b_purchase.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Bang
+namespace Business.Model.Bang
 {
 {
     /// <summary>
     /// <summary>
     /// 采购明细信息
     /// 采购明细信息

+ 1 - 1
MicroServices/Business/Bussiness.Model/Bang/b_purchase_occupy.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Bang
+namespace Business.Model.Bang
 {
 {
     /// <summary>
     /// <summary>
     /// 采购占用明细
     /// 采购占用明细

+ 0 - 0
MicroServices/Business/Bussiness.Model/Bussiness.Model.csproj → MicroServices/Business/Bussiness.Model/Business.Model.csproj


+ 1 - 4
MicroServices/Business/Bussiness.Model/Ext/ext_xref.cs

@@ -1,12 +1,9 @@
 using Business.Core.Attributes;
 using Business.Core.Attributes;
-using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using Spire.Pdf.General.Paper.Font.Rendering.Hinting;
-using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Entities;
 
 
-namespace Bussiness.Model.Ext
+namespace Business.Model.Ext
 {
 {
     /// <summary>
     /// <summary>
     /// ext_xref
     /// ext_xref

+ 1 - 3
MicroServices/Business/Bussiness.Model/Ext/in_kd_bom.cs

@@ -1,12 +1,10 @@
 using Business.Core.Attributes;
 using Business.Core.Attributes;
 using Business.Core.Utilities;
 using Business.Core.Utilities;
-using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Entities;
 
 
-namespace Bussiness.Model.Ext
+namespace Business.Model.Ext
 {
 {
     /// <summary>
     /// <summary>
     /// 物料清单
     /// 物料清单

+ 1 - 4
MicroServices/Business/Bussiness.Model/Ext/in_kd_material.cs

@@ -1,12 +1,9 @@
 using Business.Core.Attributes;
 using Business.Core.Attributes;
-using Business.Core.Utilities;
-using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Entities;
 
 
-namespace Bussiness.Model.Ext
+namespace Business.Model.Ext
 {
 {
     /// <summary>
     /// <summary>
     /// 物料
     /// 物料

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/InvMaster.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 库存主数据表
     /// 库存主数据表

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ItemMaster.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 物料主表
     /// 物料主表

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/NbrDetail.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 物料单据明细表
     /// 物料单据明细表

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/NbrMaster.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 物料单据表
     /// 物料单据表

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/bom.cs

@@ -11,7 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using Volo.Abp;
 using Volo.Abp;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 物料BOM
     /// 物料BOM

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_bom.cs

@@ -11,7 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using Volo.Abp;
 using Volo.Abp;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 物料BOM
     /// 物料BOM

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_bom_child.cs

@@ -6,7 +6,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations.Schema;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 物料BOM明细
     /// 物料BOM明细

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_check.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 物料检验表
     /// 物料检验表

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_factory_details.cs

@@ -5,7 +5,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations.Schema;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 工厂物料明细表
     /// 工厂物料明细表

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_item.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 物料详情
     /// 物料详情

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_item_inventory.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 物料库存明细表
     /// 物料库存明细表

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_item_stock.cs

@@ -6,7 +6,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations.Schema;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 物料库存表
     /// 物料库存表

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_item_stockoccupy.cs

@@ -10,7 +10,7 @@ using Business.Core.Attributes;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations.Schema;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 资源检查物料占用明细表
     /// 资源检查物料占用明细表

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_metering_unit.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 物料计量表
     /// 物料计量表

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_plan.cs

@@ -5,7 +5,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations.Schema;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 物料采购计划表
     /// 物料采购计划表

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute.cs

@@ -10,7 +10,7 @@ using System.Security.AccessControl;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 替代群组
     /// 替代群组

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute_group.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 物料替代多群组
     /// 物料替代多群组

+ 1 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute_group_detail.cs

@@ -10,7 +10,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.MES.IC
+namespace Business.Model.MES.IC
 {
 {
     /// <summary>
     /// <summary>
     /// 物料替代多群组明细
     /// 物料替代多群组明细

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/HolidayMaster.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 节假日记录表
     /// 节假日记录表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/PeriodSequenceDet.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 生产周期表
     /// 生产周期表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/ProdLineDetail.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 生产线明细表
     /// 生产线明细表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/QualityLineWorkDetail.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 产线休息时间记录表
     /// 产线休息时间记录表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/ScheduleExceptionMaster.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 排产异常记录表
     /// 排产异常记录表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/ScheduleResultOpMaster.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 工单排产记录表
     /// 工单排产记录表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/ShopCalendarWorkCtr.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 工作日历表
     /// 工作日历表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/WorkOrdDetail.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 工单物料明细表
     /// 工单物料明细表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/WorkOrdMaster.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 工单主表
     /// 工单主表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/WorkOrdRouting.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 工单工艺流程表
     /// 工单工艺流程表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/mes_moentry.cs

@@ -10,7 +10,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 生成工单子表
     /// 生成工单子表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/mes_mooccupy.cs

@@ -10,7 +10,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 在制工单占用记录表
     /// 在制工单占用记录表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/mes_morder.cs

@@ -11,7 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using Volo.Abp;
 using Volo.Abp;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 工单主表
     /// 工单主表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/mes_oorder.cs

@@ -10,7 +10,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 委外订单表
     /// 委外订单表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Production/mes_stockoccupy.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace Bussiness.Model.Production
+namespace Business.Model.Production
 {
 {
     /// <summary>
     /// <summary>
     /// 成品库存占用表
     /// 成品库存占用表

+ 1 - 3
MicroServices/Business/Bussiness.Model/SRM/srm_po_list.cs

@@ -1,11 +1,9 @@
 using Business.Core.Attributes;
 using Business.Core.Attributes;
-using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations.Schema;
 
 
-namespace Bussiness.Model.SRM
+namespace Business.Model.SRM
 {
 {
     /// <summary>
     /// <summary>
     /// 采购订单明细详情
     /// 采购订单明细详情

+ 1 - 3
MicroServices/Business/Bussiness.Model/SRM/srm_po_main.cs

@@ -1,11 +1,9 @@
 using Business.Core.Attributes;
 using Business.Core.Attributes;
-using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations.Schema;
 
 
-namespace Bussiness.Model.SRM
+namespace Business.Model.SRM
 {
 {
     /// <summary>
     /// <summary>
     /// 采购订单
     /// 采购订单

+ 1 - 1
MicroServices/Business/Bussiness.Model/SRM/srm_po_occupy.cs

@@ -5,7 +5,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations.Schema;
 
 
-namespace Bussiness.Model.SRM
+namespace Business.Model.SRM
 {
 {
     /// <summary>
     /// <summary>
     /// 采购订单占用详情
     /// 采购订单占用详情

+ 1 - 1
MicroServices/Business/Bussiness.Model/SRM/srm_pr_main.cs

@@ -5,7 +5,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations.Schema;
 
 
-namespace Bussiness.Model.SRM
+namespace Business.Model.SRM
 {
 {
     /// <summary>
     /// <summary>
     /// 采购申请单
     /// 采购申请单

+ 1 - 1
MicroServices/Business/Bussiness.Model/SRM/srm_purchase.cs

@@ -5,7 +5,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations.Schema;
 
 
-namespace Bussiness.Model.SRM
+namespace Business.Model.SRM
 {
 {
     /// <summary>
     /// <summary>
     /// 物料采购报价单
     /// 物料采购报价单

+ 1 - 1
MicroServices/Business/Bussiness.Model/SRM/srm_supplier.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 
 
-namespace Bussiness.Model.SRM
+namespace Business.Model.SRM
 {
 {
     /// <summary>
     /// <summary>
     /// 供应商
     /// 供应商

+ 1 - 1
MicroServices/Business/Bussiness.Model/Sale/TagMaster.cs

@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Entities;
 
 
-namespace Bussiness.Model.Sale
+namespace Business.Model.Sale
 {
 {
     /// <summary>
     /// <summary>
     /// 盘点单主表
     /// 盘点单主表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Sale/crm_customer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 
 
-namespace Bussiness.Model.Sale
+namespace Business.Model.Sale
 {
 {
     /// <summary>
     /// <summary>
     /// 客户
     /// 客户

+ 1 - 1
MicroServices/Business/Bussiness.Model/Sale/crm_seorder.cs

@@ -5,7 +5,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations.Schema;
 
 
-namespace Bussiness.Model.Sale
+namespace Business.Model.Sale
 {
 {
     /// <summary>
     /// <summary>
     ///销售订单表
     ///销售订单表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Sale/crm_seorderentry.cs

@@ -5,7 +5,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations.Schema;
 
 
-namespace Bussiness.Model.Sale
+namespace Business.Model.Sale
 {
 {
     /// <summary>
     /// <summary>
     ///销售订单明细表
     ///销售订单明细表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Tech/mes_process.cs

@@ -12,7 +12,7 @@ using Business.Core.Attributes;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Attributes;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
 
-namespace Bussiness.Model.Tech
+namespace Business.Model.Tech
 {
 {
     /// <summary>
     /// <summary>
     /// 工序表
     /// 工序表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Tech/mes_tech_process.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 
 
-namespace Bussiness.Model.Tech
+namespace Business.Model.Tech
 {
 {
     /// <summary>
     /// <summary>
     /// 工艺关联工序表
     /// 工艺关联工序表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Tech/mes_technique.cs

@@ -5,7 +5,7 @@ using MongoDB.Bson.Serialization.Attributes;
 using System.ComponentModel;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 
 
-namespace Bussiness.Model.Tech
+namespace Business.Model.Tech
 {
 {
     /// <summary>
     /// <summary>
     /// 工艺路径表
     /// 工艺路径表

+ 1 - 1
MicroServices/Business/Bussiness.Model/Tech/mes_workshop.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 
 
-namespace Bussiness.Model.Tech
+namespace Business.Model.Tech
 {
 {
     /// <summary>
     /// <summary>
     /// 工位表(工作中心)
     /// 工位表(工作中心)

+ 1 - 1
MicroServices/Business/Bussiness.MongoModel/Base/MoBaseEntity.cs

@@ -13,7 +13,7 @@ using Microsoft.EntityFrameworkCore;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Attributes;
 using Business.Core.Utilities;
 using Business.Core.Utilities;
 
 
-namespace Bussiness.MongoModel
+namespace Business.MongoModel
 {
 {
     public abstract class MoBaseEntity 
     public abstract class MoBaseEntity 
     {
     {

Some files were not shown because too many files changed in this diff