diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/ModifyPoliciesStatusInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/ModifyPoliciesStatusInput.cs
new file mode 100644
index 00000000..7f4098f8
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/ModifyPoliciesStatusInput.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tnb.WarehouseMgr.Entities.Enums;
+
+namespace Tnb.WarehouseMgr.Entities.Dto
+{
+ ///
+ /// 进出库策略状态修改输入参数s
+ ///
+ public class ModifyPoliciesStatusInput
+ {
+ ///
+ /// 1、入库 2我、出库
+ ///
+ public EnumInOutStockType strategyType { get; set; }
+ ///
+ /// 选中的策略ID列表
+ ///
+ public List ids { get; set; }
+ ///
+ /// 状态 0:禁用 1:启用
+ ///
+ public int status { get; set; }
+ }
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/IUpdatePoliciesStatus.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/IUpdatePoliciesStatus.cs
new file mode 100644
index 00000000..1757984b
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/IUpdatePoliciesStatus.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Entity
+{
+ ///
+ /// 出入库策略状态契约接口
+ ///
+ public interface IUpdatePoliciesStatus
+ {
+ int status { get; set; }
+ }
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockPolicies.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockPolicies.cs
new file mode 100644
index 00000000..ac358fa6
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockPolicies.cs
@@ -0,0 +1,77 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+///
+/// WMS入库策略
+///
+[SugarTable("wms_instock_policies")]
+public partial class WmsInstockPolicies : BaseEntity
+{
+ public WmsInstockPolicies()
+ {
+ id = SnowflakeIdHelper.NextId();
+ }
+ ///
+ /// 所属组织
+ ///
+ public string? org_id { get; set; }
+
+ ///
+ /// 策略编号
+ ///
+ public string bill_code { get; set; } = string.Empty;
+
+ ///
+ /// 策略名称
+ ///
+ public string bill_name { get; set; } = string.Empty;
+
+ ///
+ /// 是否启用
+ ///
+ public int status { get; set; }
+
+ ///
+ /// 策略内容
+ ///
+ public string policy { get; set; } = string.Empty;
+
+ ///
+ /// 创建用户
+ ///
+ public string create_id { get; set; } = string.Empty;
+
+ ///
+ /// 创建时间
+ ///
+ public DateTime create_time { get; set; } = DateTime.Now;
+
+ ///
+ /// 最后修改人员
+ ///
+ public string? modify_id { get; set; }
+
+ ///
+ /// 最后修改时间
+ ///
+ public DateTime? modify_time { get; set; }
+
+ ///
+ /// 扩展字段
+ ///
+ public string? extras { get; set; }
+
+ ///
+ /// 流程任务Id
+ ///
+ public string? f_flowtaskid { get; set; }
+
+ ///
+ /// 流程引擎Id
+ ///
+ public string? f_flowid { get; set; }
+
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockPolicies.part.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockPolicies.part.cs
new file mode 100644
index 00000000..e51c8ca8
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockPolicies.part.cs
@@ -0,0 +1,13 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+using Tnb.WarehouseMgr.Entities.Entity;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+///
+/// WMS入库策略
+///
+public partial class WmsInstockPolicies : IUpdatePoliciesStatus
+{
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockPolicies.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockPolicies.cs
new file mode 100644
index 00000000..6d8f2f28
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockPolicies.cs
@@ -0,0 +1,77 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+///
+/// WMS出库策略
+///
+[SugarTable("wms_outstock_policies")]
+public partial class WmsOutstockPolicies : BaseEntity
+{
+ public WmsOutstockPolicies()
+ {
+ id = SnowflakeIdHelper.NextId();
+ }
+ ///
+ /// 所属组织
+ ///
+ public string? org_id { get; set; }
+
+ ///
+ /// 策略编号
+ ///
+ public string bill_code { get; set; } = string.Empty;
+
+ ///
+ /// 策略名称
+ ///
+ public string bill_name { get; set; } = string.Empty;
+
+ ///
+ /// 是否启用
+ ///
+ public int status { get; set; }
+
+ ///
+ /// 策略内容
+ ///
+ public string policy { get; set; } = string.Empty;
+
+ ///
+ /// 创建用户
+ ///
+ public string create_id { get; set; } = string.Empty;
+
+ ///
+ /// 创建时间
+ ///
+ public DateTime create_time { get; set; } = DateTime.Now;
+
+ ///
+ /// 最后修改人员
+ ///
+ public string? modify_id { get; set; }
+
+ ///
+ /// 最后修改时间
+ ///
+ public DateTime? modify_time { get; set; }
+
+ ///
+ /// 扩展字段
+ ///
+ public string? extras { get; set; }
+
+ ///
+ /// 流程任务Id
+ ///
+ public string? f_flowtaskid { get; set; }
+
+ ///
+ /// 流程引擎Id
+ ///
+ public string? f_flowid { get; set; }
+
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockPolicies.part.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockPolicies.part.cs
new file mode 100644
index 00000000..63088f9c
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockPolicies.part.cs
@@ -0,0 +1,13 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+using Tnb.WarehouseMgr.Entities.Entity;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+///
+/// WMS出库策略
+///
+public partial class WmsOutstockPolicies : IUpdatePoliciesStatus
+{
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
index 0a8b4a4c..99795a9c 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
@@ -1,11 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Linq.Expressions;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using Aspose.Cells.Drawing;
using JNPF;
+using JNPF.Common.Contracts;
using JNPF.Common.Extension;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
@@ -13,6 +15,7 @@ using JNPF.VisualDev;
using Microsoft.AspNetCore.Mvc;
using Tnb.WarehouseMgr.Entities.Attributes;
using Tnb.WarehouseMgr.Entities.Dto;
+using Tnb.WarehouseMgr.Entities.Entity;
using Tnb.WarehouseMgr.Interfaces;
namespace Tnb.WarehouseMgr
@@ -49,5 +52,6 @@ namespace Tnb.WarehouseMgr
{
return Task.CompletedTask;
}
+
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 4bbfb724..d7e84ca2 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -37,6 +37,7 @@ using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Dto.Inputs;
+using Tnb.WarehouseMgr.Entities.Entity;
using Tnb.WarehouseMgr.Entities.Enums;
using Tnb.WarehouseMgr.Interfaces;
@@ -58,6 +59,7 @@ namespace Tnb.WarehouseMgr
_billRullService = billRullService;
_userManager = userManager;
}
+
///
/// 根据载具Id带出库位、仓库信息
///
@@ -493,8 +495,32 @@ namespace Tnb.WarehouseMgr
await _db.Ado.RollbackTranAsync();
}
}
-
-
+ ///
+ /// 出入库策略启用、禁用状态修改
+ ///
+ ///
+ ///
+ [HttpPost]
+ public async Task ModifyPoliciesStatus(ModifyPoliciesStatusInput input)
+ {
+ async Task _updateStatus(ModifyPoliciesStatusInput input) where T : BaseEntity, IUpdatePoliciesStatus, new()
+ {
+ T obj = new()
+ {
+ status = input.status
+ };
+ await _db.Updateable(obj).UpdateColumns(it => it.status).Where(it => input.ids.Contains(it.id)).ExecuteCommandAsync();
+ }
+ switch (input.strategyType)
+ {
+ case EnumInOutStockType.In:
+ await _updateStatus(input);
+ break;
+ case EnumInOutStockType.Out:
+ await _updateStatus(input);
+ break;
+ }
+ }
///
/// 生成预任务
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockPoliciesService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockPoliciesService.cs
new file mode 100644
index 00000000..c347eff6
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockPoliciesService.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr
+{
+ ///
+ /// 入库策略服务类
+ ///
+ public class WmsInStockPoliciesService : BaseWareHouseService
+ {
+ private readonly ISqlSugarClient _db;
+ }
+}