From 264f03bb151c4f9018e7a02223c412aa2b834d05 Mon Sep 17 00:00:00 2001 From: "DEVICE8\\12494" Date: Thu, 27 Apr 2023 18:40:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A1=86=E6=9E=B6=E5=A4=9A?= =?UTF-8?q?=E7=BB=84=E5=90=88=E4=BB=A3=E7=A0=81=EF=BC=8C=E7=BB=84=E5=90=88?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.BasicData.Entitys/Consts/DictConst.cs | 4 ++ .../Tnb.ProductionMgr.Entitys/Entity/PrdMo.cs | 4 ++ .../Tnb.ProductionMgr/PrdMoService.cs | 17 +++-- .../Configurations/AppSetting.json | 2 +- .../Tnb.API.Entry/Configurations/Cors.json | 2 +- visualdev/Tnb.VisualDev/RunService.cs | 63 +++++++++---------- 6 files changed, 51 insertions(+), 41 deletions(-) diff --git a/BasicData/Tnb.BasicData.Entitys/Consts/DictConst.cs b/BasicData/Tnb.BasicData.Entitys/Consts/DictConst.cs index ff942440..4bf0ef7c 100644 --- a/BasicData/Tnb.BasicData.Entitys/Consts/DictConst.cs +++ b/BasicData/Tnb.BasicData.Entitys/Consts/DictConst.cs @@ -35,6 +35,10 @@ public static class DictConst /// 任务单状态-待开工编码 /// public const string ToBeStartedEnCode = "ToBeStarted"; + /// + /// 任务单状态-待排产 + /// + public const string ToBeScheduledEncode = "ToBeScheduled"; #endregion diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdMo.cs b/ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdMo.cs index ec642a1d..30defb57 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdMo.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdMo.cs @@ -324,6 +324,10 @@ namespace Tnb.ProductionMgr.Entities /// Nullable:True /// public string mo_task_no { get; set; } + /// + /// 生产任务状态 + /// + public string icmo_status { get; set; } } } diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs index 52714c7f..0aba2700 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs @@ -5,6 +5,7 @@ using JNPF.DynamicApiController; using JNPF.FriendlyException; using JNPF.Logging; using JNPF.Systems.Interfaces.System; +using JNPF.VisualDev; using Mapster; using Microsoft.AspNetCore.Mvc; using SqlSugar; @@ -22,13 +23,15 @@ namespace Tnb.ProductionMgr /// [ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 700)] [Route("api/[area]/[controller]/[action]")] - public class PrdMoService : IPrdMoService, IDynamicApiController, ITransient + public class PrdMoService : IOverideVisualDevService, IPrdMoService, IDynamicApiController, ITransient { private readonly ISqlSugarRepository _repository; private readonly IDataBaseManager _dataBaseManager; private readonly IUserManager _userManager; private readonly IDictionaryDataService _dictionaryDataService; + public OverideVisualDevFunc OverideFuncs => new OverideVisualDevFunc(); + public PrdMoService( ISqlSugarRepository repository, IDataBaseManager dataBaseManager, @@ -197,7 +200,7 @@ namespace Tnb.ProductionMgr } var row = await db.Updateable() - .SetColumns(it => new PrdMo { mo_status = DictConst.IssueId }) + .SetColumns(it => new PrdMo { mo_status = DictConst.IssueId, icmo_status = DictConst.ToBeScheduledEncode }) .Where(it => input.WorkOrderIds.Contains(it.id)) .ExecuteCommandAsync(); return (row > 0); @@ -360,7 +363,7 @@ namespace Tnb.ProductionMgr if (row > 0) { - if (combineMoCodes?.Count > 0) + if (combineMoCodes?.Count > 0 && combineMoCodes?.FirstOrDefault() is not null) { var moList = await db.Queryable().Where(it => combineMoCodes.Contains(it.combine_mo_code)).ToListAsync(); var icmoList = moList.Adapt>(); @@ -401,20 +404,26 @@ namespace Tnb.ProductionMgr { var obj = (await db.Queryable().FirstAsync(it => it.id == input.mo_id)); obj.input_qty += entity.scheduled_qty; - var moStatus = ""; + string moStatus = "",icmoStatus=""; + //判断，已排产数量>=计划数量时将状态改为 已排产 if (obj.input_qty >= obj.plan_qty) { moStatus = DictConst.AlreadyId; + icmoStatus = DictConst.ToBeStartedEnCode; } else { //修改工单状态为待排产，同事修改已排产数量 moStatus = DictConst.WaitProductId; + icmoStatus = DictConst.ToBeScheduledEncode; + + } row = await db.Updateable().SetColumns(it => new PrdMo { mo_status = moStatus, + icmo_status = icmoStatus, input_qty = obj.input_qty }) .Where(it => it.id == entity.mo_id).ExecuteCommandAsync(); diff --git a/apihost/Tnb.API.Entry/Configurations/AppSetting.json b/apihost/Tnb.API.Entry/Configurations/AppSetting.json index 64561d8a..283832df 100644 --- a/apihost/Tnb.API.Entry/Configurations/AppSetting.json +++ b/apihost/Tnb.API.Entry/Configurations/AppSetting.json @@ -6,7 +6,7 @@ "Kestrel": { "Endpoints": { "Http": { - "Url": "http://*:9231" + "Url": "http://0.0.0.0:9231" } } }, diff --git a/apihost/Tnb.API.Entry/Configurations/Cors.json b/apihost/Tnb.API.Entry/Configurations/Cors.json index 0378afda..7e6a366e 100644 --- a/apihost/Tnb.API.Entry/Configurations/Cors.json +++ b/apihost/Tnb.API.Entry/Configurations/Cors.json @@ -1,7 +1,7 @@ { "CorsAccessorSettings": { "PolicyName": "JNPFCorsAccessor", - "WithOrigins": [ "http://192.168.10.12:9230", "http://localhost:8080" ], + "WithOrigins": [ "http://192.168.10.12:9230", "http://192.168.10.18:9230", "http://localhost:8080", "http://localhost:9230" ], "WithExposedHeaders": [ "access-token", "x-access-token", "Content-Disposition" ] } } \ No newline at end of file diff --git a/visualdev/Tnb.VisualDev/RunService.cs b/visualdev/Tnb.VisualDev/RunService.cs index 45a4b0a5..2e54bcbd 100644 --- a/visualdev/Tnb.VisualDev/RunService.cs +++ b/visualdev/Tnb.VisualDev/RunService.cs @@ -176,12 +176,25 @@ public class RunService : IRunService, ITransient input.superQueryJson = GetSuperQueryJson(input.superQueryJson).ToJsonString(); //modified by ly on 20230426 - if (!input.station_code.IsNullOrWhiteSpace()) + var jArr = JArray.Parse(entity.Tables); + if (!input.station_code.IsNullOrWhiteSpace()) { - sql += $" where station_code='{input.station_code}' or station_code=''"; + + if (jArr?.FirstOrDefault()?.Value("table") == "eqp_equipment") + { + sql += $" where station_code='{input.station_code}' or station_code=''"; + } + } + if (!input.process_code.IsNullOrWhiteSpace()) + { + if (jArr?.FirstOrDefault()?.Value("table") == "bas_process") + { + //sql += $" where station_code='{input.station_code}' or station_code=''"; + } } - realList = _databaseService.GetInterFaceData(link, sql, input, templateInfo.ColumnData.Adapt(), new List(), tableFieldKeyValue); + realList = _databaseService.GetInterFaceData(link, sql, input, templateInfo.ColumnData.Adapt(), new List(), tableFieldKeyValue); + // 显示列有子表字段 @@ -1565,7 +1578,7 @@ public class RunService : IRunService, ITransient { List childFieldsModelList = model.__config__.children; object? objectData = allDataMap[strKey[i]]; - + List> childAllDataMapList = objectData.ToJsonString().ToObject>>(); if (childAllDataMapList != null && childAllDataMapList.Count > 0) { @@ -2889,27 +2902,17 @@ public class RunService : IRunService, ITransient { jarr = JArray.Parse(itemValue); } - + // 多选时为模糊查询 if (model.multiple) { if (jarr?.Children() != null && jarr?.Children().ToList().Count > 1) { - var values = jarr.ToList().Select(t => t.Value()).ToList(); - var condition = new ConditionalCollections(); - condition.ConditionalList = new List>(values.Count); - values.ForEach(x => - { - condition.ConditionalList.Add(new KeyValuePair(WhereType.Or, new ConditionalModel - { - FieldName = item.Key, - ConditionalType = ConditionalType.Like, - FieldValue = x, - })); - }); - conModels.Add(condition); + var values = string.Join(",", jarr.ToList().Select(t => t.Value())); + conModels.Add(new ConditionalModel { FieldName= item.Key, ConditionalType= ConditionalType.In, FieldValue=values }); + } - else + else { conModels.Add(new ConditionalCollections() { @@ -2924,34 +2927,24 @@ public class RunService : IRunService, ITransient } }); } - + } //modified by ly on 20230407 else if (jarr?.Children() != null && jarr?.Children().ToList().Count > 1) { - var values = jarr.ToList().Select(t => t.Value()).ToList(); - var condition = new ConditionalCollections(); - condition.ConditionalList = new List>(values.Count); - values.ForEach(x => - { - condition.ConditionalList.Add(new KeyValuePair(WhereType.Or, new ConditionalModel - { - FieldName = item.Key, - ConditionalType = ConditionalType.Equal, - FieldValue = x, - })); - }); - conModels.Add(condition); + var values = string.Join(",", jarr.ToList().Select(t => t.Value())); + conModels.Add(new ConditionalModel { FieldName = item.Key, ConditionalType = ConditionalType.In, FieldValue = values }); + } else { //modified by ly on 20230407 - if (itemValue.IsMatch(@"\[(.+)\]")) + if (itemValue.IsMatch(@"\[(.+)\]")) { itemValue = Regex.Match(itemValue, @"\[(.+)\]").Groups[1].Value; itemValue = itemValue.Trim('"'); } - + conModels.Add(new ConditionalCollections() { ConditionalList = new List>()