From c98236d10a8812b981adf075fa2ad2d09ff20d4d Mon Sep 17 00:00:00 2001 From: "DEVICE8\\12494" Date: Thu, 4 May 2023 15:08:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8C=E7=BB=84=E7=BB=87=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B7=A5=E5=BA=8F=E5=88=97=E8=A1=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/BasProcessStation.cs | 10 +++ BasicData/Tnb.BasicData/BasProcessService.cs | 53 +++++++------- EquipMgr/Tnb.EquipMgr.Entities/Class1.cs | 7 -- .../Consts/ModuleConsts.cs | 9 +++ .../Dto/EquipmentListOutput.cs | 25 +++++++ .../{Class1.cs => IEquipmentService.cs} | 2 +- EquipMgr/Tnb.EquipMgr/Class1.cs | 7 -- EquipMgr/Tnb.EquipMgr/EquipmentService.cs | 69 +++++++++++++++++++ .../Permission/DepartmentService.cs | 63 ++++++++++++----- system/Tnb.Systems/Tnb.Systems.csproj | 1 + visualdev/Tnb.VisualDev/RunService.cs | 16 ----- 11 files changed, 192 insertions(+), 70 deletions(-) delete mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Class1.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Consts/ModuleConsts.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipmentListOutput.cs rename EquipMgr/Tnb.EquipMgr.Interfaces/{Class1.cs => IEquipmentService.cs} (57%) delete mode 100644 EquipMgr/Tnb.EquipMgr/Class1.cs create mode 100644 EquipMgr/Tnb.EquipMgr/EquipmentService.cs diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasProcessStation.cs b/BasicData/Tnb.BasicData.Entitys/Entity/BasProcessStation.cs index f283e661..25d95067 100644 --- a/BasicData/Tnb.BasicData.Entitys/Entity/BasProcessStation.cs +++ b/BasicData/Tnb.BasicData.Entitys/Entity/BasProcessStation.cs @@ -28,6 +28,12 @@ namespace Tnb.BasicData.Entities /// Nullable:False /// public string process_id { get; set; } + /// + /// 工序编码 + /// + public string process_code { get; set; } + + // /// // /// Desc:工序代码 @@ -42,6 +48,10 @@ namespace Tnb.BasicData.Entities /// Nullable:False /// public string station_id { get; set; } + /// + /// 工位编码 + /// + public string station_code { get; set; } // /// // /// Desc:工位代码 diff --git a/BasicData/Tnb.BasicData/BasProcessService.cs b/BasicData/Tnb.BasicData/BasProcessService.cs index 5a9bb953..725de247 100644 --- a/BasicData/Tnb.BasicData/BasProcessService.cs +++ b/BasicData/Tnb.BasicData/BasProcessService.cs @@ -62,35 +62,42 @@ namespace Tnb.BasicData /// private async Task GetList(VisualDevModelListQueryInput input) { - var result = new List(); + var result = new SqlSugarPagedList(); var db = _repository.AsSugarClient(); var organize = await db.Queryable().FirstAsync(it => it.EnCode == input.station_code && it.Category == DictConst.RegionCategoryStationCode); if (organize != null) { - var processIds = await db.Queryable().Where(it => it.station_id == organize.Id).Select(it => it.process_id).ToListAsync(); - if (processIds?.Count > 0) + var whereExpr = Expressionable.Create(); + var curProcessIds = await db.Queryable().Where(it => it.station_id == organize.Id).Select(it => it.process_id).ToListAsync(); + if (curProcessIds?.Count > 0) { - result = await db.Queryable().Where(it => processIds.Contains(it.id)).Select(it => new ProcessListOutput - { - id = it.id, - process_code = it.process_code, - process_name = it.process_name, - process_collection = it.process_collection, - status = it.status, - station = it.station, - must_pass = it.must_pass, - defective_products_put_into_production = it.defective_products_put_into_production, - single_scan_type = it.single_scan_type, - only_scan_type = it.only_scan_type, - material_traced_back_relationship = it.material_traced_back_relationship, - report_template = it.report_template, - descrip = it.descrip, - org_id = it.org_id, - create_id = it.create_id, - modify_id = it.modify_id, - modify_time = it.modify_time, - }).ToListAsync(); + whereExpr = whereExpr.And((a, b) => curProcessIds.Contains(a.id)).Or((a, b) => string.IsNullOrEmpty(b.process_id)); } + else + { + whereExpr = whereExpr.And((a, b) => string.IsNullOrEmpty(b.process_id)); + } + result = await db.Queryable().LeftJoin((a, b) => a.id == b.process_id).Where(whereExpr.ToExpression()).Select(a => new ProcessListOutput + { + id = a.id, + process_code = a.process_code, + process_name = a.process_name, + process_collection = a.process_collection, + status = a.status, + station = a.station, + must_pass = a.must_pass, + defective_products_put_into_production = a.defective_products_put_into_production, + single_scan_type = a.single_scan_type, + only_scan_type = a.only_scan_type, + material_traced_back_relationship = a.material_traced_back_relationship, + report_template = a.report_template, + descrip = a.descrip, + org_id = a.org_id, + create_id = a.create_id, + modify_id = a.modify_id, + modify_time = a.modify_time, + }).ToPagedListAsync(input.currentPage, input.pageSize); + } return result; } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Class1.cs b/EquipMgr/Tnb.EquipMgr.Entities/Class1.cs deleted file mode 100644 index 16f05104..00000000 --- a/EquipMgr/Tnb.EquipMgr.Entities/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Tnb.EquipMgr.Entities -{ - public class Class1 - { - - } -} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Consts/ModuleConsts.cs b/EquipMgr/Tnb.EquipMgr.Entities/Consts/ModuleConsts.cs new file mode 100644 index 00000000..7b6efd37 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Consts/ModuleConsts.cs @@ -0,0 +1,9 @@ +namespace Tnb.EquipMgr.Entities.Consts +{ + public class ModuleConsts + { + public const string Tag = "EquimentManager"; + public const string Area = "equiment"; + + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipmentListOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipmentListOutput.cs new file mode 100644 index 00000000..402f06b7 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipmentListOutput.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tnb.EquipMgr.Entities.Dto +{ + /// + /// 设备列表输出类 + /// + public class EquipmentListOutput + { + public string id { get; set; } + public string eqp_code { get; set; } + public string eqp_name { get; set; } + public string eqp_type_code { get; set; } + public string accept_status { get; set; } + public string supplier_code { get; set; } + public string accept_date { get; set; } + public string install_date { get; set; } + public string use_department_code { get; set; } + public string remark { get; set; } + } +} diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/Class1.cs b/EquipMgr/Tnb.EquipMgr.Interfaces/IEquipmentService.cs similarity index 57% rename from EquipMgr/Tnb.EquipMgr.Interfaces/Class1.cs rename to EquipMgr/Tnb.EquipMgr.Interfaces/IEquipmentService.cs index a33e8469..26d6b24e 100644 --- a/EquipMgr/Tnb.EquipMgr.Interfaces/Class1.cs +++ b/EquipMgr/Tnb.EquipMgr.Interfaces/IEquipmentService.cs @@ -1,6 +1,6 @@ namespace Tnb.EquipMgr.Interfaces { - public class Class1 + public interface IEquipmentService { } diff --git a/EquipMgr/Tnb.EquipMgr/Class1.cs b/EquipMgr/Tnb.EquipMgr/Class1.cs deleted file mode 100644 index 6acce3f0..00000000 --- a/EquipMgr/Tnb.EquipMgr/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Tnb.EquipMgr -{ - public class Class1 - { - - } -} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr/EquipmentService.cs b/EquipMgr/Tnb.EquipMgr/EquipmentService.cs new file mode 100644 index 00000000..db5b3b74 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr/EquipmentService.cs @@ -0,0 +1,69 @@ +using Aop.Api.Domain; +using Aspose.Cells.Drawing; +using JNPF.Common.Filter; +using JNPF.DependencyInjection; +using JNPF.DynamicApiController; +using JNPF.VisualDev; +using JNPF.VisualDev.Entitys.Dto.VisualDevModelData; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using SqlSugar; +using Tnb.EquipMgr.Entities; +using Tnb.EquipMgr.Entities.Consts; +using Tnb.EquipMgr.Entities.Dto; +using Tnb.EquipMgr.Interfaces; + +namespace Tnb.EquipMgr +{ + /// + /// 设备管理 + /// + [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)] + [Route("api/[area]/[controller]/[action]")] + [OverideVisualDev(ModuleId)] + + public class EquipmentService : IOverideVisualDevService, IEquipmentService, IDynamicApiController, ITransient + { + public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); + private const string ModuleId = "25064865727509"; + private readonly ISqlSugarRepository _repository; + + public EquipmentService(ISqlSugarRepository repository) + { + _repository = repository; + OverideFuncs.GetListAsync = GetList; + } + /// + /// 在线开发-获取设备列表 + /// + /// + /// + private async Task GetList(VisualDevModelListQueryInput input) + { + var dic = new Dictionary + { + { "Qualified","合格"}, + { "Unqualified","不合格"}, + }; + + var pagedList = await _repository.AsQueryable() + .Where(it => it.station_code == input.station_code || string.IsNullOrEmpty(input.station_code)) + .Select(it => new EquipmentListOutput + { + id = it.id, + eqp_code = it.eqp_code, + eqp_name = it.eqp_name, + eqp_type_code = it.eqp_type_code, + accept_status = it.accept_status, + supplier_code = it.supplier_code, + accept_date = it.accept_date, + install_date = it.install_date, + use_department_code = it.use_department_code, + remark = it.remark, + }) + .Mapper(it => it.accept_status = dic.ContainsKey(it.accept_status) ? dic[it.accept_status] : "") + .ToPagedListAsync(input.currentPage, input.pageSize); + return pagedList; + } + } +} \ No newline at end of file diff --git a/system/Tnb.Systems/Permission/DepartmentService.cs b/system/Tnb.Systems/Permission/DepartmentService.cs index 31c27765..5d45b5a7 100644 --- a/system/Tnb.Systems/Permission/DepartmentService.cs +++ b/system/Tnb.Systems/Permission/DepartmentService.cs @@ -1,4 +1,5 @@ -using JNPF.Common.Core.Manager; +using Aop.Api.Domain; +using JNPF.Common.Core.Manager; using JNPF.Common.Enums; using JNPF.Common.Filter; using JNPF.Common.Security; @@ -16,7 +17,10 @@ using Mapster; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using Senparc.Weixin.MP.AdvancedAPIs.Comment.CommentJson; using SqlSugar; +using Tnb.BasicData; +using Tnb.BasicData.Entities; using Tnb.EquipMgr.Entities; namespace JNPF.Systems; @@ -442,27 +446,54 @@ public class DepartmentService : IDepartmentService, IDynamicApiController, ITra int isOK = await _repository.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).CallEntityMethod(m => m.LastModify()).ExecuteCommandAsync(); if (!(isOK > 0)) throw Oops.Oh(ErrorCode.D2018); //modified by ly on 20230426 处理工位信息，将工位插入到设备表 - if (input.category == "workstation") + if (input.category == DictConst.RegionCategoryStationCode) { - var eqpObj = input.propertyJson; - var eqpList = (eqpObj.Value("roweqp")); - var eqpIds = eqpList.Select(x => x.Value("id")).ToList(); - - isOK = await _repository.AsSugarClient().Updateable().SetColumns(it => new EqpEquipment { station_code = input.enCode }).Where(it => eqpIds.Contains(it.id)).ExecuteCommandAsync(); - //工位与设备解绑操作 - var eqpEntities = await _repository.AsSugarClient().Queryable().Where(it => it.station_code == input.enCode).ToListAsync(); - if (eqpEntities?.Count > 0) + var jsonObj = input.propertyJson; + var eqpVal = jsonObj.GetValue("roweqp"); + if (eqpVal is not null) { - var unbindEqpIds = eqpEntities.Select(x => x.id).Except(eqpIds).ToList(); - if (unbindEqpIds?.Count > 0) + var eqpList = (jsonObj.Value("roweqp")); + var eqpIds = eqpList.Select(x => x.Value("id")).ToList(); + + isOK = await _repository.AsSugarClient().Updateable().SetColumns(it => new EqpEquipment { station_code = input.enCode }).Where(it => eqpIds.Contains(it.id)).ExecuteCommandAsync(); + //工位与设备解绑操作 + var eqpEntities = await _repository.AsSugarClient().Queryable().Where(it => it.station_code == input.enCode).ToListAsync(); + if (eqpEntities?.Count > 0) { - isOK = await _repository.AsSugarClient().Updateable().SetColumns(it => new EqpEquipment { station_code = "" }).Where(it => unbindEqpIds.Contains(it.id)).ExecuteCommandAsync(); + var unbindEqpIds = eqpEntities.Select(x => x.id).Except(eqpIds).ToList(); + if (unbindEqpIds?.Count > 0) + { + isOK = await _repository.AsSugarClient().Updateable().SetColumns(it => new EqpEquipment { station_code = "" }).Where(it => unbindEqpIds.Contains(it.id)).ExecuteCommandAsync(); + } + } + } + var processVal = jsonObj.GetValue("rowprocess"); + if (processVal is not null) + { + var dic = _repository.GetList().ToDictionary(x => x.FullName, x => x.Id); + var procList = jsonObj.Value("rowprocess"); + var basProcessStationList = procList.Select(x => new BasProcessStation + { + id = SnowflakeIdHelper.NextId(), + org_id = dic.ContainsKey(x.Value("org_id")) ? dic[x.Value("org_id")] : "", + process_id = x.Value("id"), + process_code = x.Value("process_code"), + station_code = input.enCode, + station_id = input.id, + create_id = _userManager.UserId, + create_time = DateTime.Now, + }).ToList(); + isOK = await _repository.AsSugarClient().Insertable(basProcessStationList).ExecuteCommandAsync(); + //工位与工序解绑操作 + //>1 根据传递的工位Id获取绑定过的工序Id + var processIds = await _repository.AsSugarClient().Queryable().Where(it => it.station_id == input.id).Select(it => it.process_id).ToListAsync(); + var curProcIds = basProcessStationList.Select(x => x.process_id).Except(processIds).ToList(); + if (curProcIds?.Count > 0) + { + isOK = await _repository.AsSugarClient().Updateable(it => new BasProcessStation { station_id = "", station_code = "" }).Where(it => curProcIds.Contains(it.process_id)).ExecuteCommandAsync(); } } - - if (!(isOK > 0)) throw Oops.Oh(ErrorCode.COM1001); - } #region 第三方同步 diff --git a/system/Tnb.Systems/Tnb.Systems.csproj b/system/Tnb.Systems/Tnb.Systems.csproj index 4c07eac7..328587e7 100644 --- a/system/Tnb.Systems/Tnb.Systems.csproj +++ b/system/Tnb.Systems/Tnb.Systems.csproj @@ -9,6 +9,7 @@ + diff --git a/visualdev/Tnb.VisualDev/RunService.cs b/visualdev/Tnb.VisualDev/RunService.cs index 51d1ba4c..1105f96e 100644 --- a/visualdev/Tnb.VisualDev/RunService.cs +++ b/visualdev/Tnb.VisualDev/RunService.cs @@ -175,22 +175,6 @@ public class RunService : IRunService, ITransient input.queryJson = GetQueryJson(input.queryJson, _userManager.UserOrigin == "pc" ? templateInfo.ColumnData : templateInfo.AppColumnData).ToJsonString(); input.superQueryJson = GetSuperQueryJson(input.superQueryJson).ToJsonString(); - //modified by ly on 20230426 - var jArr = JArray.Parse(entity.Tables); - if (!input.station_code.IsNullOrWhiteSpace()) - { - - if (jArr?.FirstOrDefault()?.Value("table") == "eqp_equipment") - { - sql += $" where station_code='{input.station_code}' or station_code=''"; - } - if (jArr?.FirstOrDefault()?.Value("table") == "bas_process") - { - //sql += $" and station_code='{input.station_code}' or station_code=''"; - } - } - - realList = _databaseService.GetInterFaceData(link, sql, input, templateInfo.ColumnData.Adapt(), new List(), tableFieldKeyValue); From ca43cd8bfe6e4e38ad3c235fbf5d3df31c78bfb7 Mon Sep 17 00:00:00 2001 From: "DEVICE8\\12494" Date: Thu, 4 May 2023 15:40:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=B7=A5=E4=BD=8D=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BasicData/Tnb.BasicData/BasProcessService.cs | 2 +- system/Tnb.Systems/Permission/DepartmentService.cs | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/BasicData/Tnb.BasicData/BasProcessService.cs b/BasicData/Tnb.BasicData/BasProcessService.cs index 725de247..db43c8ae 100644 --- a/BasicData/Tnb.BasicData/BasProcessService.cs +++ b/BasicData/Tnb.BasicData/BasProcessService.cs @@ -68,7 +68,7 @@ namespace Tnb.BasicData if (organize != null) { var whereExpr = Expressionable.Create(); - var curProcessIds = await db.Queryable().Where(it => it.station_id == organize.Id).Select(it => it.process_id).ToListAsync(); + var curProcessIds = await db.Queryable().Where(it => it.station_id == organize.Id).Select(it => it.process_id).Distinct().ToListAsync(); if (curProcessIds?.Count > 0) { whereExpr = whereExpr.And((a, b) => curProcessIds.Contains(a.id)).Or((a, b) => string.IsNullOrEmpty(b.process_id)); diff --git a/system/Tnb.Systems/Permission/DepartmentService.cs b/system/Tnb.Systems/Permission/DepartmentService.cs index 5d45b5a7..3dc97348 100644 --- a/system/Tnb.Systems/Permission/DepartmentService.cs +++ b/system/Tnb.Systems/Permission/DepartmentService.cs @@ -472,7 +472,9 @@ public class DepartmentService : IDepartmentService, IDynamicApiController, ITra { var dic = _repository.GetList().ToDictionary(x => x.FullName, x => x.Id); var procList = jsonObj.Value("rowprocess"); - var basProcessStationList = procList.Select(x => new BasProcessStation + var pids = procList.Select(x => x.Value("id")).Distinct().ToList(); + var dbProcIds = await _repository.AsSugarClient().Queryable().Where(it => pids.Contains(it.process_id)).Select(it => it.process_id).ToListAsync(); + var basProcessStationList = procList.Where(x => !dbProcIds.Contains(x.Value("id"))).Select(x => new BasProcessStation { id = SnowflakeIdHelper.NextId(), org_id = dic.ContainsKey(x.Value("org_id")) ? dic[x.Value("org_id")] : "", @@ -483,7 +485,11 @@ public class DepartmentService : IDepartmentService, IDynamicApiController, ITra create_id = _userManager.UserId, create_time = DateTime.Now, }).ToList(); - isOK = await _repository.AsSugarClient().Insertable(basProcessStationList).ExecuteCommandAsync(); + //数据库中不存在则插入 + if (basProcessStationList?.Count > 0) + { + isOK = await _repository.AsSugarClient().Insertable(basProcessStationList).ExecuteCommandAsync(); + } //工位与工序解绑操作 //>1 根据传递的工位Id获取绑定过的工序Id var processIds = await _repository.AsSugarClient().Queryable().Where(it => it.station_id == input.id).Select(it => it.process_id).ToListAsync();