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

bug

Browse Source
This commit is contained in:
周科达
2024-06-06 15:25:51 +08:00
parent 46023f56c1
commit 9e177b69f7
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1062,7 +1062,7 @@ namespace Tnb.ProductionMgr
throw new ArgumentNullException(nameof(input.TaskIds)); throw new ArgumentNullException(nameof(input.TaskIds));
} }
// if (input.Behavior.IsNullOrWhiteSpace()) // if (input.Behavior.IsNullOrWhiteSpace())
if (input.Behavior!=null && !input.Behavior.IsEmpty()) if (input.Behavior==null || input.Behavior.IsEmpty())
{ {
throw new ArgumentException($"{nameof(input.Behavior)} not be null or empty"); throw new ArgumentException($"{nameof(input.Behavior)} not be null or empty");
} }

6
ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
View File

@@ -216,8 +216,8 @@ namespace Tnb.ProductionMgr
public async Task<string> FixedPointDelivery() public async Task<string> FixedPointDelivery()
{ {
string msg = ""; string msg = "";
bool? value = await _redisData.TryGetValueByKeyField<bool?>("hxjC", "DB100.132.3"); bool? value = await _redisData.TryGetValueByKeyField<bool?>("hxjC", "A2允许入空箱");
bool valueFlag = _redisData.Get<bool>("hxjC_DB100.132.3_flag"); bool valueFlag = _redisData.Get<bool>("hxjC_A2允许入空箱_flag");
if (value==true && !valueFlag) if (value==true && !valueFlag)
{ {
bool? cs01 = await _redisData.TryGetValueByKeyField<bool?>("YTCS", "CallCtuEmptyIn_CS01"); bool? cs01 = await _redisData.TryGetValueByKeyField<bool?>("YTCS", "CallCtuEmptyIn_CS01");
@@ -252,7 +252,7 @@ namespace Tnb.ProductionMgr
{ {
msg = "注塑定点配送成功"; msg = "注塑定点配送成功";
Log.Information("【FixedPointDelivery】注塑定点配送成功"); Log.Information("【FixedPointDelivery】注塑定点配送成功");
_redisData.Set("hxjC_DB100.132.3_flag", true, TimeSpan.FromMinutes(20)); _redisData.Set("hxjC_A2允许入空箱_flag", true, TimeSpan.FromMinutes(20));
} }
else else
{ {

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

@@ -518,7 +518,7 @@ public class DepartmentService : IDepartmentService, IDynamicApiController, ITra
{ {
var jsonObj = input.propertyJson; var jsonObj = input.propertyJson;
var eqpVal = jsonObj.GetValue("roweqp"); var eqpVal = jsonObj.GetValue("roweqp");
if (eqpVal is not null) if (eqpVal is not null && eqpVal.Count()>0)
{ {
var eqpList = (jsonObj.Value<JArray>("roweqp")); var eqpList = (jsonObj.Value<JArray>("roweqp"));
var eqpIds = eqpList.Select(x => x.Value<string>("id")).ToList(); var eqpIds = eqpList.Select(x => x.Value<string>("id")).ToList();
@@ -550,7 +550,7 @@ public class DepartmentService : IDepartmentService, IDynamicApiController, ITra
await _repository.AsSugarClient().Insertable(OrganizeRelationEntitys).ExecuteCommandAsync(); await _repository.AsSugarClient().Insertable(OrganizeRelationEntitys).ExecuteCommandAsync();
} }
var processVal = jsonObj.GetValue("rowprocess"); var processVal = jsonObj.GetValue("rowprocess");
if (processVal is not null) if (processVal is not null && processVal.Count()>0)
{ {
//modifyby zhoukeda 2023.06.25 //modifyby zhoukeda 2023.06.25
var dic = _repository.GetList(x => x.DeleteMark == null).ToDictionary(x => x.FullName, x => x.Id); var dic = _repository.GetList(x => x.DeleteMark == null).ToDictionary(x => x.FullName, x => x.Id);
@@ -583,7 +583,7 @@ public class DepartmentService : IDepartmentService, IDynamicApiController, ITra
} }
} }
var correlation = jsonObj.GetValue("correlation"); var correlation = jsonObj.GetValue("correlation");
if (correlation is not null) if (correlation is not null && correlation.Count()>0)
{ {
await _repository.AsSugarClient().Deleteable<OrganizeRelationEntity>(p => p.OrganizeId == id && p.ObjectType == "User").ExecuteCommandAsync(); await _repository.AsSugarClient().Deleteable<OrganizeRelationEntity>(p => p.OrganizeId == id && p.ObjectType == "User").ExecuteCommandAsync();
var OrganizeRelationEntitys = new List<OrganizeRelationEntity>(); var OrganizeRelationEntitys = new List<OrganizeRelationEntity>();