diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs index b4bd74b9..0851a960 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs @@ -200,4 +200,9 @@ public class ModuleConsts /// public const string MODULE_BASREGIONMAT_ID = "26187428200229"; + /// + /// 模块标识-盘点签收配置 + /// + public const string MODULE_WMSCHECKSIGNCONFIG_ID = "30059737083669"; + } \ No newline at end of file diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckSignConfig.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckSignConfig.cs index 3cd97e5b..a1a616ed 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckSignConfig.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckSignConfig.cs @@ -29,10 +29,6 @@ public partial class WmsCheckSignConfig : BaseEntity /// public string? location_id { get; set; } - /// - /// 是否启用 - /// - public int? enabled { get; set; } /// /// 创建用户 diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckSignConfig.part.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckSignConfig.part.cs new file mode 100644 index 00000000..7893d588 --- /dev/null +++ b/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; + +/// +/// 盘点签收配置 +/// +public partial class WmsCheckSignConfig : IUpdateEnabledEntity +{ + /// + /// 是否启用 + /// + public int enabled { get; set; } + +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeH.cs index 0e729023..c8d5f914 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeH.cs @@ -39,10 +39,6 @@ public partial class WmsCollocationSchemeH : BaseEntity /// public int seq { get; set; } - /// - /// 状态 - /// - public int status { get; set; } /// /// 产品ID diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeH.part.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeH.part.cs new file mode 100644 index 00000000..e66e9ecb --- /dev/null +++ b/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; + +/// +/// 齐套搭配方案主表 +/// +public partial class WmsCollocationSchemeH : IUpdateEnabledEntity +{ + /// + /// 是否启用 + /// + [SugarColumn(ColumnName = "status")] + public int enabled { get; set; } + +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsBasicDataBase`1.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsBasicConfBase`1.cs similarity index 65% rename from WarehouseMgr/Tnb.WarehouseMgr/WmsBasicDataBase`1.cs rename to WarehouseMgr/Tnb.WarehouseMgr/WmsBasicConfBase`1.cs index 8a4d792e..0c0e5747 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsBasicDataBase`1.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsBasicConfBase`1.cs @@ -17,10 +17,20 @@ namespace Tnb.WarehouseMgr /// Wms基础数据基类 /// /// - public class WmsBasicDataBase : BaseWareHouseService where TEntity : BaseEntity, IUpdateEnabledEntity, new() + public class WmsBasicConfBase : BaseWareHouseService where TEntity : BaseEntity, IUpdateEnabledEntity, new() { protected ISqlSugarClient DbContext { get; set; } - + /// + /// 是否启用 + /// + /// + ///
{ + ///
strategyType:入库策略 1、入库 2我、出库(出入库策略参数,其它接口可忽略) + ///
ids:选中的主键pkId列表 + ///
status:状态 0:禁用 1:启用 + ///
} + /// + /// [HttpPost] public async Task IsEnabledMark(ModifyEnabledInput input) { diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckSignConfigService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckSignConfigService.cs new file mode 100644 index 00000000..1bca2114 --- /dev/null +++ b/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 +{ + /// + /// 盘点签收配置 + /// + [OverideVisualDev(ModuleConsts.MODULE_WMSCHECKSIGNCONFIG_ID)] + public class WmsCheckSignConfigService : WmsBasicConfBase + { + public WmsCheckSignConfigService(ISqlSugarRepository repo) + { + DbContext = repo.AsSugarClient(); + } + } +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs index ac892e0b..ee7d029e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs @@ -19,7 +19,7 @@ namespace Tnb.WarehouseMgr /// 齐套配套方案服务 /// [OverideVisualDev(ModuleId)] - public class WmsCollocationSchemeSevice : BaseWareHouseService, IWmsCollocationSchemeSevice + public class WmsCollocationSchemeSevice : WmsBasicConfBase, 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; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsElevatorService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsElevatorService.cs index 0231fd80..7d2850ce 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsElevatorService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsElevatorService.cs @@ -11,7 +11,7 @@ namespace Tnb.WarehouseMgr /// /// 电梯业务类 /// - public class WmsElevatorService : WmsBasicDataBase + public class WmsElevatorService : WmsBasicConfBase { public WmsElevatorService(ISqlSugarRepository repo) {