diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/ModifyPoliciesStatusInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/ModifyEnabledInput.cs
similarity index 93%
rename from WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/ModifyPoliciesStatusInput.cs
rename to WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/ModifyEnabledInput.cs
index 4e5b9d31..e5096ea5 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/ModifyPoliciesStatusInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/ModifyEnabledInput.cs
@@ -5,7 +5,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto
///
/// 进出库策略状态修改输入参数s
///
- public class ModifyPoliciesStatusInput
+ public class ModifyEnabledInput
{
///
/// 1、入库 2我、出库
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/CheckDetailQuery.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/CheckDetailQuery.cs
index 62cb8db6..1819396a 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/CheckDetailQuery.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/CheckDetailQuery.cs
@@ -4,6 +4,7 @@ using System.DirectoryServices.Protocols;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Newtonsoft.Json;
using Tnb.WarehouseMgr.Entities.Enums;
namespace Tnb.WarehouseMgr.Entities.Dto.Queries
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index a3598ce1..ac503fc1 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -849,9 +849,9 @@ namespace Tnb.WarehouseMgr
///
///
[HttpPost]
- public async Task ModifyPoliciesStatus(ModifyPoliciesStatusInput input)
+ public async Task ModifyPoliciesStatus(ModifyEnabledInput input)
{
- async Task _updateStatus(ModifyPoliciesStatusInput input) where T : BaseEntity, IUpdatePoliciesStatus, new()
+ async Task _updateStatus(ModifyEnabledInput 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();
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsBasicDataBase`1.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsBasicDataBase`1.cs
index 8a959749..8a4d792e 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsBasicDataBase`1.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsBasicDataBase`1.cs
@@ -7,6 +7,7 @@ using Aop.Api.Domain;
using JNPF.Common.Contracts;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
+using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Entity.Constraints;
using Tnb.WarehouseMgr.Interfaces;
@@ -19,10 +20,11 @@ namespace Tnb.WarehouseMgr
public class WmsBasicDataBase : BaseWareHouseService where TEntity : BaseEntity, IUpdateEnabledEntity, new()
{
protected ISqlSugarClient DbContext { get; set; }
+
[HttpPost]
- public async Task IsEnabledMark(IEnumerable ids, int status)
+ public async Task IsEnabledMark(ModifyEnabledInput input)
{
- return await DbContext.Updateable().SetColumns(it => it.enabled == status).ExecuteCommandHasChangeAsync();
+ return await DbContext.Updateable().SetColumns(it => it.enabled == input.status).Where(it => input.ids.Contains(it.id)).ExecuteCommandHasChangeAsync();
}
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
index 3ed41882..796aa716 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
@@ -332,8 +332,8 @@ namespace Tnb.WarehouseMgr
///
}
///
///
- [HttpGet]
- public async Task GetTaskDetailByCheckType([FromQuery] CheckDetailQuery input)
+ [HttpPost]
+ public async Task GetTaskDetailByCheckType(CheckDetailQuery input)
{
if (_carryMap.Count == 0)
{
@@ -342,24 +342,25 @@ namespace Tnb.WarehouseMgr
Expression> filterExp = (a, b, c) => false;
- Expression> defaultFilterExp = (a, b, c) => a.wh_id == input.warehouse_id
- && a.is_type == ((int)EnumLocationType.存储库位).ToString()
- && c.is_lock == 0;
+
+ var filerExpable = Expressionable.Create()
+ .And((a, b, c) => a.wh_id == input.warehouse_id)
+ .And((a, b, c) => a.is_type == ((int)EnumLocationType.存储库位).ToString())
+ .And((a, b, c) => c.is_lock == 0);
+
switch (input.CheckType)
{
case EnumCheckType.全库盘点:
{
- filterExp = (a, b, c) => a.wh_id == input.warehouse_id
- && a.is_type == ((int)EnumLocationType.存储库位).ToString()
- && c.is_lock == 0;
+ filterExp = filerExpable.ToExpression();
}
break;
case EnumCheckType.物料盘点:
{
if (!input.material_id.IsNullOrWhiteSpace())
{
- filterExp = defaultFilterExp.And((a, b, c) => b.material_id == input.material_id);
+ filterExp = filerExpable.And((a, b, c) => b.material_id == input.material_id).ToExpression();
}
}
break;
@@ -367,7 +368,7 @@ namespace Tnb.WarehouseMgr
{
if (input.regionIds?.Count > 0)
{
- filterExp = defaultFilterExp.And((a, b, c) => input.regionIds.Contains(a.region_id));
+ filterExp = filerExpable.And((a, b, c) => input.regionIds.Contains(a.region_id)).ToExpression();
}
}
break;