合并问题解决

MicroServices/Business/Business.Application/DOP/SyncDOPAppService.cs

@@ -1,12 +1,13 @@
-using Abp.Application.Services;
-using Abp.Dependency;
-using Business.Core.Utilities;
+using Business.Core.Utilities;
 using Business.Dto;
-using Business.Model.WMS;
+using Business.StructuredDB.WMS;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Uow;
 using IUnitOfWorkManager = Volo.Abp.Uow.IUnitOfWorkManager;
@@ -20,11 +21,11 @@ namespace Business.DOP
         /// <summary>
         /// 平台规格型号对照表
         /// </summary>
-        private readonly Volo.Abp.Domain.Repositories.IRepository<PlatformSpecificationComparison, long> _PlatformSpecificationComparison;
+        private readonly IRepository<PlatformSpecificationComparison, long> _PlatformSpecificationComparison;
         /// <summary>
         /// 平台库存表
         /// </summary>
-        private readonly Volo.Abp.Domain.Repositories.IRepository<PlatformInventory, long> _PlatformInventory;
+        private readonly IRepository<PlatformInventory, long> _PlatformInventory;
         /// <summary>
         ///  雪花算法
         /// </summary>
@@ -39,8 +40,8 @@ namespace Business.DOP
         /// 构造函数
         /// </summary>
         public SyncDOPAppService(
-            Volo.Abp.Domain.Repositories.IRepository<PlatformSpecificationComparison, long> PlatformSpecificationComparison,
-            Volo.Abp.Domain.Repositories.IRepository<PlatformInventory, long> PlatformInventory,
+            IRepository<PlatformSpecificationComparison, long> PlatformSpecificationComparison,
+            IRepository<PlatformInventory, long> PlatformInventory,
              IUnitOfWorkManager unitOfWorkManager,
         ICurrentTenant currentTenant
             )

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

@@ -2598,7 +2598,7 @@ namespace Business.ResourceExamineManagement
                         if (_CalcBomViewAppService.srm_Po_OccupiesInsert.Any())
                         {
                             _CalcBomViewAppService.srm_Po_OccupiesInsert.ForEach(s => { s.tenant_id = param.tenantId; s.factory_id = param.factoryId; });
-                            await _srm_po_occupy.InsertMany(_CalcBomViewAppService.srm_Po_OccupiesInsert);
+                            await _srm_po_occupy.InsertManyAsync(_CalcBomViewAppService.srm_Po_OccupiesInsert);
                         }
                         await unitOfWork.CompleteAsync();
                     }

MicroServices/Business/Business.Domain/StructuredDB/WMS/PlatformInventory.cs

@@ -0,0 +1,48 @@
+using Business.Domain;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Business.StructuredDB.WMS
+{
+    /// <summary>
+    /// 平台规格库存对照
+    /// </summary>
+    [Comment("平台规格库存对照")]
+    public class PlatformInventory : BaseEntity
+    {
+        /// <summary>
+        /// 仓库
+        /// </summary>
+        [Comment("仓库")]
+        public string? Location { get; set; }
+        /// <summary>
+        /// 规格或货品编码
+        /// </summary>
+        [Comment("规格或货品编码")]
+        public string? SpecificationModel { get; set; }
+        /// <summary>
+        /// 批号
+        /// </summary>
+        [Comment("批号")]
+        public string? BatchNumber { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [Comment("数量")]
+        public decimal? InventoryQuantity { get; set; }
+        /// <summary>
+        /// 有效期
+        /// </summary>
+        [Comment("有效期")]
+        public decimal? PeriodOfValidity { get; set; }
+        /// <summary>
+        /// 编码
+        /// </summary>
+        [Comment("编码")]
+        public string? Code { get; set; }
+    }
+}

MicroServices/Business/Business.Domain/StructuredDB/WMS/PlatformSpecificationComparison.cs

@@ -0,0 +1,44 @@
+using Business.Domain;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Business.StructuredDB.WMS
+{
+    /// <summary>
+    /// 平台规格库存对照
+    /// </summary>
+    [Comment("平台规格库存对照")]
+    public class PlatformSpecificationComparison : BaseEntity
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        /// <param name="Id"></param>
+        public PlatformSpecificationComparison(long Id) : base(Id)
+        {
+        }
+        /// <summary>
+        /// 标准规格型号
+        /// </summary>
+        [Comment("标准规格型号")]
+        public string? StandardSpecifications { get; set; }
+        /// <summary>
+        /// 海王规格型号
+        /// </summary>
+        [Comment("海王规格型号")]
+        public string? HWSpecificationModel { get; set; }
+        /// <summary>
+        /// 国科规格型号
+        /// </summary>
+        [Comment("国科规格型号")]
+        public string? GKSpecificationModel { get; set; }
+        /// <summary>
+        /// 库存型号
+        /// </summary>
+        public string? Type { get; set; }
+    }
+}