wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据id获取组织扩展属性接口

Browse Source
This commit is contained in:
周科达
2023-08-01 17:04:23 +08:00
parent de2ad9b2d0
commit 1e21885da5
2 changed files with 75 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -1041,23 +1041,23 @@ namespace Tnb.ProductionMgr
var list = await db.Queryable<PrdMoTask>().Where(it => input.TaskIds.Contains(it.id)).Select(it => it).ToListAsync(); var list = await db.Queryable<PrdMoTask>().Where(it => input.TaskIds.Contains(it.id)).Select(it => it).ToListAsync();
if (behavior == PrdTaskBehavior.Compled) if (behavior == PrdTaskBehavior.Compled)
{ {
if (list?.Count > 0) // if (list?.Count > 0)
{ // {
// var schedQtySum = list.Sum(x => x.scheduled_qty); // // var schedQtySum = list.Sum(x => x.scheduled_qty);
// var planQtySum = list.Sum(x => x.plan_qty); // // var planQtySum = list.Sum(x => x.plan_qty);
// if (schedQtySum < planQtySum) // // if (schedQtySum < planQtySum)
// { // // {
// throw new AppFriendlyException("任务数量必须大于等于生产计划数量,才可完成", 500); // // throw new AppFriendlyException("任务数量必须大于等于生产计划数量,才可完成", 500);
// } // // }
//
int reportedWorkQty = list.Sum(x => x.reported_work_qty) ?? 0; // int reportedWorkQty = list.Sum(x => x.last_process_complete_qty) ?? 0;
int scrapQty = list.Sum(x => x.scrap_qty) ?? 0; // int scrapQty = list.Sum(x => x.scrap_qty) ?? 0;
int scheduledQty = list.Sum(x => x.scheduled_qty) ?? 0; // int scheduledQty = list.Sum(x => x.scheduled_qty) ?? 0;
if (scheduledQty >= reportedWorkQty+scrapQty) // if (scheduledQty >= reportedWorkQty+scrapQty)
{ // {
throw new AppFriendlyException("已完成数量大于等于任务单数量,才可完成", 500); // throw new AppFriendlyException("已完成数量大于等于任务单数量,才可完成", 500);
} // }
} // }
} }
var taskReportLogs = new List<PrdMoTask>(); var taskReportLogs = new List<PrdMoTask>();

59
system/Tnb.Systems/Permission/DepartmentService.cs
View File

@@ -1,10 +1,12 @@
using Aop.Api.Domain; using System.Collections;
using Aop.Api.Domain;
using JNPF.Common.Core.Manager; using JNPF.Common.Core.Manager;
using JNPF.Common.Enums; using JNPF.Common.Enums;
using JNPF.Common.Filter; using JNPF.Common.Filter;
using JNPF.Common.Security; using JNPF.Common.Security;
using JNPF.DependencyInjection; using JNPF.DependencyInjection;
using JNPF.DynamicApiController; using JNPF.DynamicApiController;
using JNPF.Extras.CollectiveOAuth.Models;
using JNPF.FriendlyException; using JNPF.FriendlyException;
using JNPF.Logging; using JNPF.Logging;
using JNPF.Systems.Entitys.Dto.Department; using JNPF.Systems.Entitys.Dto.Department;
@@ -609,6 +611,61 @@ public class DepartmentService : IDepartmentService, IDynamicApiController, ITra
if (!(isOk > 0)) throw Oops.Oh(ErrorCode.D2016); if (!(isOk > 0)) throw Oops.Oh(ErrorCode.D2016);
} }
/// <summary>
/// 根据id获取组织扩展属性
/// </summary>
/// <param name="id"></param>
/// <param name="type"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> GetFpropertyjsonById(Dictionary<string,string> dic)
{
string id = dic["id"];
string type = dic["type"];
var organizeEntity = await _repository.GetSingleAsync(x => x.Id == id);
if (organizeEntity != null && !string.IsNullOrEmpty(organizeEntity.PropertyJson))
{
Dictionary<string, object> dictionary =
JsonConvert.DeserializeObject<Dictionary<string, object>>(organizeEntity.PropertyJson);
if (type == "1")
{
if (dictionary.TryGetValue("roweqp", out var value))
{
List<EqpEquipment> eqpEquipments = JsonConvert.DeserializeObject<List<EqpEquipment>>(JsonConvert.SerializeObject(value));
return new AuthResponse(200, "", new Dictionary<string,object>()
{
["list"] = eqpEquipments.Select(x=>new
{
id = x.id,
code = x.code,
name = x.name
}).ToList(),
});
}
}
else
{
if (dictionary.TryGetValue("rowprocess", out var value))
{
List<BasProcess> eqpEquipments = JsonConvert.DeserializeObject<List<BasProcess>>(JsonConvert.SerializeObject(value));
return new AuthResponse(200, "", new Dictionary<string,object>()
{
["list"] = eqpEquipments.Select(x=>new
{
id = x.id,
code = x.process_code,
name = x.process_name
}).ToList(),
});
}
}
}
return new AuthResponse(200, "", new Dictionary<string,object>()
{
["list"] = Enumerable.Empty<int>()
});
}
#endregion #endregion
#region PublicMethod #region PublicMethod