Merge remote-tracking branch 'origin/dev' into dev

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs

@@ -200,4 +200,9 @@ public class ModuleConsts
     /// </summary>
     public const string MODULE_BASREGIONMAT_ID = "26187428200229";
 
+    /// <summary>
+    /// 模块标识-盘点签收配置
+    /// </summary>
+    public const string MODULE_WMSCHECKSIGNCONFIG_ID = "30059737083669";
+
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckSignConfig.cs

@@ -29,10 +29,6 @@ public partial class WmsCheckSignConfig : BaseEntity<string>
     /// </summary>
     public string? location_id { get; set; }
 
-    /// <summary>
-    /// 是否启用
-    /// </summary>
-    public int? enabled { get; set; }
 
     /// <summary>
     /// 创建用户

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckSignConfig.part.cs

@@ -0,0 +1,18 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+using Tnb.WarehouseMgr.Entities.Entity.Constraints;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 盘点签收配置
+/// </summary>
+public partial class WmsCheckSignConfig : IUpdateEnabledEntity
+{
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public int enabled { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeH.cs

@@ -39,10 +39,6 @@ public partial class WmsCollocationSchemeH : BaseEntity<string>
     /// </summary>
     public int seq { get; set; }
 
-    /// <summary>
-    /// 状态
-    /// </summary>
-    public int status { get; set; }
 
     /// <summary>
     /// 产品ID

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeH.part.cs

@@ -0,0 +1,19 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+using Tnb.WarehouseMgr.Entities.Entity.Constraints;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 齐套搭配方案主表
+/// </summary>
+public partial class WmsCollocationSchemeH : IUpdateEnabledEntity
+{
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    [SugarColumn(ColumnName = "status")]
+    public int enabled { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr/WmsBasicConfBase`1.cs

@@ -17,10 +17,20 @@ namespace Tnb.WarehouseMgr
     /// Wms基础数据基类
     /// </summary>
     /// <typeparam name="TEntity"></typeparam>
-    public class WmsBasicDataBase<TEntity> : BaseWareHouseService where TEntity : BaseEntity<string>, IUpdateEnabledEntity, new()
+    public class WmsBasicConfBase<TEntity> : BaseWareHouseService where TEntity : BaseEntity<string>, IUpdateEnabledEntity, new()
     {
         protected ISqlSugarClient DbContext { get; set; }
-
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        /// <param name="input">
+        /// <br/>{
+        /// <br/>    strategyType：入库策略 1、入库 2我、出库(出入库策略参数，其它接口可忽略)
+        /// <br/>    ids:选中的主键pkId列表
+        /// <br/>    status:状态 0:禁用 1：启用
+        /// <br/>}
+        /// </param>
+        /// <returns></returns>
         [HttpPost]
         public async Task<bool> IsEnabledMark(ModifyEnabledInput input)
         {

WarehouseMgr/Tnb.WarehouseMgr/WmsCheckSignConfigService.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.VisualDev;
+using SqlSugar;
+using Tnb.WarehouseMgr.Entities;
+
+namespace Tnb.WarehouseMgr
+{
+    /// <summary>
+    /// 盘点签收配置
+    /// </summary>
+    [OverideVisualDev(ModuleConsts.MODULE_WMSCHECKSIGNCONFIG_ID)]
+    public class WmsCheckSignConfigService : WmsBasicConfBase<WmsCheckSignConfig>
+    {
+        public WmsCheckSignConfigService(ISqlSugarRepository<WmsCheckSignConfig> repo)
+        {
+            DbContext = repo.AsSugarClient();
+        }
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs

@@ -19,7 +19,7 @@ namespace Tnb.WarehouseMgr
     /// 齐套配套方案服务
     /// </summary>
     [OverideVisualDev(ModuleId)]
-    public class WmsCollocationSchemeSevice : BaseWareHouseService, IWmsCollocationSchemeSevice
+    public class WmsCollocationSchemeSevice : WmsBasicConfBase<WmsCollocationSchemeH>, IWmsCollocationSchemeSevice
     {
         private const string ModuleId = "26167204892965";
         private readonly ISqlSugarClient _db;
@@ -36,7 +36,7 @@ namespace Tnb.WarehouseMgr
             )
         {
             _repository = repository;
-            _db = repository.AsSugarClient();
+            DbContext = _db = repository.AsSugarClient();
             _runService = runService;
             _visualDevService = visualDevService;
             OverideFuncs.CreateAsync = Create;

WarehouseMgr/Tnb.WarehouseMgr/WmsElevatorService.cs

@@ -11,7 +11,7 @@ namespace Tnb.WarehouseMgr
     /// <summary>
     /// 电梯业务类
     /// </summary>
-    public class WmsElevatorService : WmsBasicDataBase<WmsElevatorH>
+    public class WmsElevatorService : WmsBasicConfBase<WmsElevatorH>
     {
         public WmsElevatorService(ISqlSugarRepository<WmsElevatorH> repo)
         {