Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipDaqQueryOutput.cs

@@ -0,0 +1,16 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class EquipDaqQueryOutput
+    {
+        public string id { get; set; }
+        public string data_source { get; set; }
+        public string create_id { get; set; }
+        public string create_time { get; set; }
+        public string data_type { get; set; }
+        public string enabled { get; set; }
+        public string equip_id { get; set; }
+        public string label_name { get; set; }
+        public string label_point { get; set; }
+        public string remark { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpDaq.cs

@@ -0,0 +1,87 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities;
+
+/// <summary>
+/// 数据采集项目
+/// </summary>
+[SugarTable("eqp_daq")]
+public partial class EqpDaq : BaseEntity<string>
+{
+    public EqpDaq()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 数据源
+    /// </summary>
+    public string data_source { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 标签名称
+    /// </summary>
+    public string? label_name { get; set; }
+
+    /// <summary>
+    /// 标签点位
+    /// </summary>
+    public string? label_point { get; set; }
+
+    /// <summary>
+    /// 数据类型
+    /// </summary>
+    public string? data_type { get; set; }
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public int? enabled { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? remark { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+    /// <summary>
+    /// 所属组织
+    /// </summary>
+    public string? org_id { get; set; }
+
+    /// <summary>
+    /// 设备id
+    /// </summary>
+    public string equip_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 流程任务Id
+    /// </summary>
+    public string? f_flowtaskid { get; set; }
+
+    /// <summary>
+    /// 流程引擎Id
+    /// </summary>
+    public string? f_flowid { get; set; }
+
+}

EquipMgr/Tnb.EquipMgr.Interfaces/IEqpDaqService.cs

@@ -0,0 +1,12 @@
+using Tnb.EquipMgr.Entities.Dto;
+namespace Tnb.EquipMgr.Interfaces
+{
+    public interface IEqpDaqService
+    {
+        /// <summary>
+        /// 根据设备id获取数采项目
+        /// </summary>
+        /// <returns></returns>
+        public Task<dynamic> GetEquipDaqList(EquipQueryInput input);
+    }
+}

EquipMgr/Tnb.EquipMgr/EqpDaqService.cs

@@ -0,0 +1,63 @@
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Filter;
+using JNPF.DependencyInjection;
+using JNPF.DynamicApiController;
+using JNPF.Systems.Entitys.Permission;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using SqlSugar;
+using Tnb.EquipMgr.Entities;
+using Tnb.EquipMgr.Entities.Dto;
+using Tnb.EquipMgr.Interfaces;
+
+namespace Tnb.EquipMgr
+{
+    /// <summary>
+    /// 设备数采项目
+    /// </summary>
+    [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
+    [Route("api/[area]/[controller]/[action]")]
+    public class EqpDaqService : IEqpDaqService, IDynamicApiController, ITransient
+    {
+        private readonly ISqlSugarRepository<EqpDaq> _repository;
+        private readonly IUserManager _userManager;
+
+        public EqpDaqService(ISqlSugarRepository<EqpDaq> repository, IUserManager userManager)
+        {
+            _userManager = userManager;
+            _repository = repository;
+        }
+
+        [HttpPost]
+        public async Task<dynamic> GetEquipDaqList(EquipQueryInput input)
+        {
+            var db = _repository.AsSugarClient();
+            Dictionary<string, string> queryJson = new Dictionary<string, string>();
+            if (!string.IsNullOrEmpty(input.queryJson))
+            {
+                queryJson = JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson);
+            }
+            var result = await db.Queryable<EqpDaq>()
+                .LeftJoin<UserEntity>((a,b)=>a.create_id==b.Id)
+                .Where(a=>a.equip_id==input.equip_id)
+                .WhereIF(queryJson.ContainsKey("data_source"),a=>a.data_source==queryJson["data_source"])
+                .WhereIF(queryJson.ContainsKey("label_name"),a=>a.label_name.Contains(queryJson["label_name"]))
+                .WhereIF(queryJson.ContainsKey("label_point"),a=>a.label_point.Contains(queryJson["label_point"]))
+                .Select((a,b) => new EquipDaqQueryOutput
+                {
+                    id = a.id,
+                    data_source = a.data_source,
+                    create_id = b.RealName,
+                    create_time = a.create_time.Value.ToString("yyyy-MM-dd HH:mm"),
+                    data_type = a.data_type,
+                    enabled = a.enabled==1 ? "是" : "否",
+                    equip_id = a.equip_id,
+                    label_name = a.label_name,
+                    label_point = a.label_point,
+                    remark = a.remark
+                }).ToPagedListAsync(input.currentPage, input.pageSize);
+
+            return PageResult<EquipDaqQueryOutput>.SqlSugarPageResult(result);
+        }
+    }
+}

EquipMgr/Tnb.EquipMgr/EqpEquipScrapService.cs

@@ -1,6 +1,7 @@
 using JNPF.Common.Core.Manager;
 using JNPF.Common.Dtos.VisualDev;
 using JNPF.Common.Enums;
+using JNPF.Common.Security;
 using JNPF.DependencyInjection;
 using JNPF.DynamicApiController;
 using JNPF.FriendlyException;
@@ -41,6 +42,7 @@ namespace Tnb.EquipMgr
             var db = _repository.AsSugarClient();
             DbResult<bool> result = await db.Ado.UseTranAsync(async () =>
             {
+                eqpEquipScrap.id = SnowflakeIdHelper.NextId();
                 eqpEquipScrap.create_id = _userManager.UserId;
                 eqpEquipScrap.create_time = DateTime.Now;
 

EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs

@@ -11,7 +11,8 @@ using Tnb.EquipMgr.Interfaces;
 
 namespace Tnb.EquipMgr
 {
-    /// 设备备品备件
+    /// <summary>
+    /// 设备技术参数
     /// </summary>
     [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
     [Route("api/[area]/[controller]/[action]")]

PerMgr/Tnb.PerMgr.Entities/Entity/PerProcessParamType.cs

@@ -0,0 +1,67 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.PerMgr.Entities;
+
+/// <summary>
+/// 工艺参数类型
+/// </summary>
+[SugarTable("per_process_param_type")]
+public partial class PerProcessParamType : BaseEntity<string>
+{
+    public PerProcessParamType()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string name { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 设备类型id
+    /// </summary>
+    public string equip_type_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public long ordinal { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 所属组织
+    /// </summary>
+    public string? org_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 流程任务Id
+    /// </summary>
+    public string? f_flowtaskid { get; set; }
+
+    /// <summary>
+    /// 流程引擎Id
+    /// </summary>
+    public string? f_flowid { get; set; }
+
+}

PerMgr/Tnb.PerMgr.Entities/Entity/PerProcessStandardsH.cs

@@ -0,0 +1,107 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.PerMgr.Entities;
+
+/// <summary>
+/// 工艺标准
+/// </summary>
+[SugarTable("per_process_standards_h")]
+public partial class PerProcessStandardsH : BaseEntity<string>
+{
+    public PerProcessStandardsH()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 工艺类型
+    /// </summary>
+    public string process_type { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 编号
+    /// </summary>
+    public string code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 工艺文件名
+    /// </summary>
+    public string? file_name { get; set; }
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public int? enabled { get; set; }
+
+    /// <summary>
+    /// 产出物料id
+    /// </summary>
+    public string? output_material_id { get; set; }
+
+    /// <summary>
+    /// 设备id
+    /// </summary>
+    public string equip_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 模具id
+    /// </summary>
+    public string? molds_id { get; set; }
+
+    /// <summary>
+    /// 工序id
+    /// </summary>
+    public string? process_id { get; set; }
+
+    /// <summary>
+    /// 投入物料id
+    /// </summary>
+    public string? input_material_id { get; set; }
+
+    /// <summary>
+    /// 版本号
+    /// </summary>
+    public string version { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+    /// <summary>
+    /// 所属组织
+    /// </summary>
+    public string? org_id { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? remark { get; set; }
+
+    /// <summary>
+    /// 流程任务Id
+    /// </summary>
+    public string? f_flowtaskid { get; set; }
+
+    /// <summary>
+    /// 流程引擎Id
+    /// </summary>
+    public string? f_flowid { get; set; }
+
+}

PerMgr/Tnb.PerMgr.Interfaces/IPerProcessParamService.cs

@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Mvc;
 using Tnb.PerMgr.Entities.Dto;
 
 namespace Tnb.PerMgr.Interfaces
@@ -10,5 +11,6 @@ namespace Tnb.PerMgr.Interfaces
         /// <param name="dic"></param>
         /// <returns></returns>
         public Task<ProcessParamOutput> GetProcessParamInfo(Dictionary<string,string> dic);
+
     }
 }

PerMgr/Tnb.PerMgr.Interfaces/IPerProcessStandardsService.cs

@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace Tnb.PerMgr.Interfaces
+{
+    public interface IPerProcessStandardsService
+    {
+        /// <summary>
+        /// 导出模板
+        /// </summary>
+        /// <returns></returns>
+        public Task<IActionResult> ExportTemplate();
+    }
+}

PerMgr/Tnb.PerMgr/PerProcessParamService.cs

@@ -1,7 +1,12 @@
 using JNPF.Common.Core.Manager;
 using JNPF.DependencyInjection;
 using JNPF.DynamicApiController;
+using JNPF.FriendlyException;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using NPOI.SS.UserModel;
+using NPOI.SS.Util;
+using NPOI.XSSF.UserModel;
 using SqlSugar;
 using Tnb.PerMgr.Entities;
 using Tnb.PerMgr.Entities.Dto;
@@ -41,5 +46,6 @@ namespace Tnb.PerMgr
                 }).SingleAsync();
             return result;
         }
+
     }
 }

PerMgr/Tnb.PerMgr/PerProcessStandardsService.cs

@@ -0,0 +1,94 @@
+using JNPF;
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Enums;
+using JNPF.Common.Helper;
+using JNPF.Common.Security;
+using JNPF.DependencyInjection;
+using JNPF.DynamicApiController;
+using JNPF.FriendlyException;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using NPOI.SS.UserModel;
+using NPOI.SS.Util;
+using NPOI.XSSF.UserModel;
+using SqlSugar;
+using Tnb.PerMgr.Entities;
+using Tnb.PerMgr.Entities.Dto;
+using Tnb.PerMgr.Interfaces;
+
+namespace Tnb.PerMgr
+{
+    /// <summary>
+    /// 工艺标准
+    /// </summary>
+    [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
+    [Route("api/[area]/[controller]/[action]")]
+    public class PerProcessStandardsService : IPerProcessStandardsService, IDynamicApiController, ITransient
+    {
+        private readonly ISqlSugarRepository<PerProcessStandardsH> _repository;
+        private readonly IUserManager _userManager;
+        
+        public PerProcessStandardsService(ISqlSugarRepository<PerProcessStandardsH> repository, IUserManager userManager)
+        {
+            _userManager = userManager;
+            _repository = repository;
+        }
+        
+        [AllowAnonymous]
+        [HttpGet]
+        public async Task<IActionResult> ExportTemplate()
+        {
+            try
+            {
+                var db = _repository.AsSugarClient();
+                string[] perProcessParamTypes = await db.Queryable<PerProcessParamType>().OrderBy(x => x.ordinal).Select(x=>x.name).ToArrayAsync();
+                string[] perProcessParams = await db.Queryable<PerProcessParam>().OrderBy(x => x.ordinal).Select(x=>x.name).ToArrayAsync();
+                
+                
+                XSSFWorkbook workbook = new XSSFWorkbook();
+                NPOI.SS.UserModel.ISheet sheet = workbook.CreateSheet("BOM详情");
+            
+                IRow row1 = sheet.CreateRow(0);
+                string[] titles = new[] { "工艺参数类型", "工艺参数", "设定值" };
+
+                for (int i = 0; i < titles.Length; i++)
+                {
+                    ICell cell1 = row1.CreateCell(i);
+                    cell1.SetCellValue(titles[i]);
+                    sheet.SetColumnWidth(i,15 * 256);
+                }
+
+                int rowIndex = 1;
+            
+                // var column = sheet.GetColumn(0);
+                // 设置下拉项
+                var validationHelper = sheet.GetDataValidationHelper();
+                var constraint = validationHelper.CreateExplicitListConstraint(perProcessParamTypes);
+                var region = new CellRangeAddressList(1, 1000, 0, 0);
+                var validation = validationHelper.CreateValidation(constraint, region);
+                sheet.AddValidationData(validation);
+            
+                var constraint2 = validationHelper.CreateExplicitListConstraint(perProcessParams);
+                var region2 = new CellRangeAddressList(1, 1000, 1, 1);
+                var validation2 = validationHelper.CreateValidation(constraint2, region2);
+                sheet.AddValidationData(validation2);
+            
+
+                MemoryStream ms = new MemoryStream();
+            
+                workbook.Write(ms);
+                MemoryStream ms2 = new MemoryStream(ms.ToArray());
+                ms2.Position = 0;
+                FileStreamResult fileStreamResult = new FileStreamResult(ms2, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") { FileDownloadName = "template.xlsx" };
+                return fileStreamResult;
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                throw Oops.Bah("导出失败");
+            }
+            
+        }
+    }
+}

QcMgr/Tnb.QcMgr.Entities/Class1.cs

@@ -1,7 +0,0 @@
-namespace Tnb.QcMgr.Entities
-{
-    public class Class1
-    {
-
-    }
-}

QcMgr/Tnb.QcMgr.Entities/Dto/CheckItem.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.QcMgr.Entities
+{
+    public class CheckItemOut
+    {
+        public string checktypeid { get; set; }
+        public string checktypename { get; set; }
+        public List<CheckItem> items { get; set; }
+    }
+    public class CheckItem
+    {
+        public string itemid { get; set; }
+        public string name { get; set; }
+        public string code { get; set; }
+    }
+}

QcMgr/Tnb.QcMgr.Entities/Dto/CheckItems.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.QcMgr.Entities.Dto
+{
+    public class CheckItemsInput
+    {
+        public string name { get; set; }
+        public string status { get; set; }
+        public List<CheckType> checktypoes { get; set; }
+    }
+    public class CheckType 
+    {
+        public string id { get; set; }
+        public List<Item> items { get; set; }
+    }
+    public class Item
+    {
+        public string itemid { get; set; }
+        public string extype { get; set; }
+        public string excontent { get; set; }
+        public string check { get; set; }
+        public string errorcause { get; set; }
+        public string errorlevel { get; set; }
+        public string remark { get; set; }
+        public string attachment { get; set; }
+        public string isexec { get; set; }
+    }
+}

QcMgr/Tnb.QcMgr.Entities/Dto/CheckPlan.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.QcMgr.Entities
+{
+    public class CheckPlanInput
+    {
+        public string name { get; set; }
+
+        public string status { get; set; }
+
+        public string checktype { get; set; }
+
+        public string numtype { get; set; }
+
+        public string pagetype { get; set; }
+
+        public string writerule { get; set; }
+
+        public string remind { get; set; }
+
+        public string attachment { get; set; }
+
+        public string isaddmul { get; set; }
+
+        public string triggertype { get; set; }
+
+        public string content { get; set; }
+    }
+}

QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckItem.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.QcMgr.Entities
+{
+    [SugarTable("qc_check_item")]
+    public class QcCheckItem : BaseEntity<string>
+    {
+        public QcCheckItem()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+        public string? code { get; set; }
+        public string? name { get; set; }
+        public string? type { get; set; }
+        public string? attachment { get; set; }
+        public string? create_id { get; set; }
+        public DateTime? create_time { get; set; }
+        public string? modify_id { get; set; }
+        public DateTime? modify_time { get; set; }
+        public string? extras { get; set; }
+        public string? remark { get; set; }
+    }
+}

QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckItemsD.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.QcMgr.Entities
+{
+    /// <summary>
+    /// 质检项清单子表
+    /// </summary>
+    [SugarTable("qc_check_items_d")]
+    public partial class QcCheckItemsD : BaseEntity<string>
+    {
+        public QcCheckItemsD()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+
+        /// <summary>
+        /// 执行项格式
+        /// </summary>
+        public string? extype { get; set; }
+
+        /// <summary>
+        /// 执行项内容
+        /// </summary>
+        public string? excontent { get; set; }
+
+        /// <summary>
+        /// 抽检类型
+        /// </summary>
+        public string? check { get; set; }
+
+        /// <summary>
+        /// 不良原因
+        /// </summary>
+
+        public string? errorcause { get; set; }
+
+        /// <summary>
+        /// 不良等级
+        /// </summary>
+        public string? errorlevel { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string? remark { get; set; }
+
+        /// <summary>
+        /// 附件
+        /// </summary>
+        public string? attachment { get; set; }
+
+        /// <summary>
+        /// 执行时操作
+        /// </summary>
+        public string? isexec { get; set; }
+       
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string? create_id { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? create_time { get; set; }
+
+        /// <summary>
+        /// 修改用户
+        /// </summary>
+        public string? modify_id { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? modify_time { get; set; }
+    }
+}

QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckItemsH.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.QcMgr.Entities
+{
+    /// <summary>
+    /// 质检项清单
+    /// </summary>
+    [SugarTable("qc_check_items_h")]
+    public partial class QcCheckItemsH : BaseEntity<string>
+    {
+        public QcCheckItemsH()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string? name { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string? status { get; set; }
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string? create_id { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? create_time { get; set; }
+
+        /// <summary>
+        /// 修改用户
+        /// </summary>
+        public string? modify_id { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? modify_time { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string? extras { get; set; }
+
+    }
+
+}

QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckItemsR.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.QcMgr.Entities
+{
+    /// <summary>
+    /// 质检项清单中间表
+    /// </summary>
+    [SugarTable("qc_check_items_r")]
+    public partial class QcCheckItemsR : BaseEntity<string>
+    {
+        public QcCheckItemsR()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+        /// <summary>
+        /// 质检项清单编号
+        /// </summary>
+        public string? itemshid { get; set; }
+
+        /// <summary>
+        /// 质检项分类编号
+        /// </summary>
+        public string? typeid { get; set; }
+
+        /// <summary>
+        /// 质检项编号
+        /// </summary>
+        public string? itemid { get; set; }
+
+        /// <summary>
+        /// 质检项清单子表编号
+        /// </summary>
+        public string? itemsdid { get; set; }
+
+    }
+}

QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckPlanD.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.QcMgr.Entities
+{
+    /// <summary>
+    /// 质检方案附加信息
+    /// </summary>
+    [SugarTable("qc_check_plan_d")]
+    public partial class QcCheckPlanD : BaseEntity<string>
+    {
+        public QcCheckPlanD()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+
+        /// <summary>
+        /// 触发类型
+        /// </summary>
+        public string? triggertype { get; set; }
+
+        /// <summary>
+        /// 触发内容
+        /// </summary>
+        public string? content { get; set; }
+
+        /// <summary>
+        /// 主表编号
+        /// </summary>
+        public string? mainid { get; set; }
+    }
+}

QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckPlanH.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.QcMgr.Entities
+{
+    /// <summary>
+    /// 质检方案主表
+    /// </summary>
+    [SugarTable("qc_check_plan_h")]
+    public partial class QcCheckPlanH : BaseEntity<string>
+    {
+        public QcCheckPlanH()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string? name { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string? status { get; set; }
+
+        /// <summary>
+        /// 质检类型
+        /// </summary>
+        public string? checktype { get; set; }
+
+        /// <summary>
+        /// 报告填写数量类型
+        /// </summary>
+        public string? numtype { get; set; }
+
+        /// <summary>
+        /// 分页方式
+        /// </summary>
+        public string? pagetype { get; set; }
+
+        /// <summary>
+        /// 质检项填写规则
+        /// </summary>
+        public string? writerule { get; set; }
+
+        /// <summary>
+        /// 特别提醒
+        /// </summary>
+        public string? remind { get; set; }
+
+        /// <summary>
+        /// 附件
+        /// </summary>
+        public string? attachment { get; set; }
+
+        /// <summary>
+        /// 可添加多种物料
+        /// </summary>
+        public string? isaddmul { get; set; }
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string? create_id { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? create_time { get; set; }
+
+        /// <summary>
+        /// 修改用户
+        /// </summary>
+        public string? modify_id { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? modify_time { get; set; }
+    }
+}

QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckType.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.QcMgr.Entities
+{
+    [SugarTable("qc_check_type")]
+    public class QcCheckType : BaseEntity<string>
+    {
+        public QcCheckType()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+        public string? name { get; set; }
+        public string? inspection_items { get; set; }
+        public string? remark { get; set; }
+        public string? create_id { get; set; }
+        public DateTime? create_time { get; set; }
+        public string? modify_id { get; set; }
+        public DateTime? modify_time { get; set; }
+        public string? extras { get; set; }
+    }
+}

QcMgr/Tnb.QcMgr.Interfaces/Class1.cs

@@ -1,7 +0,0 @@
-namespace Tnb.QcMgr.Interfaces
-{
-    public class Class1
-    {
-
-    }
-}

QcMgr/Tnb.QcMgr.Interfaces/IQcCheckItemService.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tnb.QcMgr.Entities.Dto;
+
+namespace Tnb.QcMgr.Interfaces
+{
+    public interface IQcCheckItemService
+    {
+        /// <summary>
+        /// 获取质检项集合
+        /// </summary>
+        /// <param name="CheckItemInput"></param>
+        /// <returns></returns>
+        public Task<dynamic> GetCheckItem();
+
+        /// <summary>
+        /// 保存质检项清单
+        /// </summary>
+        /// <param name="CheckItemInput"></param>
+        /// <returns></returns>
+        public Task SaveData(CheckItemsInput CheckItemsInput);
+    }
+}

QcMgr/Tnb.QcMgr.Interfaces/IQcCheckPlanService.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tnb.QcMgr.Entities;
+
+namespace Tnb.QcMgr.Interfaces
+{
+    public interface IQcCheckPlanService
+    {
+        /// <summary>
+        /// 保存质检方案
+        /// </summary>
+        /// <param name="CheckPlanInput"></param>
+        /// <returns></returns>
+        public Task SaveData(CheckPlanInput CheckPlanInput);
+    }
+}

QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTypeService.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tnb.QcMgr.Entities;
+using Tnb.QcMgr.Entities.Dto;
+
+namespace Tnb.QcMgr.Interfaces
+{
+    public interface IQcCheckTypeService
+    {
+
+    }
+}

QcMgr/Tnb.QcMgr/Class1.cs

@@ -1,7 +0,0 @@
-namespace Tnb.QcMgr
-{
-    public class Class1
-    {
-
-    }
-}

QcMgr/Tnb.QcMgr/QcCheckItemService.cs

@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Aspose.Cells.Drawing;
+using COSXML.Model.Tag;
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Enums;
+using JNPF.DependencyInjection;
+using JNPF.DynamicApiController;
+using JNPF.FriendlyException;
+using JNPF.VisualDev;
+using JNPF.VisualDev.Interfaces;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.CodeAnalysis;
+using NPOI.SS.Formula.Eval;
+using NPOI.Util;
+using SqlSugar;
+using Tnb.Common;
+using Tnb.QcMgr.Entities;
+using Tnb.QcMgr.Entities.Dto;
+using Tnb.QcMgr.Interfaces;
+
+namespace Tnb.QcMgr
+{
+    /// <summary>
+    /// 质检项清单模块
+    /// </summary>
+    [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 800)]
+    [Route("api/[area]/[controller]/[action]")]
+    [OverideVisualDev(ModuleId)]
+    public class QcCheckItemService : IOverideVisualDevService, IQcCheckItemService, IDynamicApiController, ITransient
+    {
+        private const string ModuleId = "26500755139349";
+        private readonly ISqlSugarRepository<QcCheckItemsH> _repository;
+        private readonly IUserManager _userManager;
+        public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
+        public QcCheckItemService(ISqlSugarRepository<QcCheckItemsH> repository, IUserManager userManager)
+        {
+            _repository = repository;
+            _userManager = userManager;
+            OverideFuncs.DeleteAsync = Delete;
+        }
+
+        private async Task Delete(string id)
+        {
+            var db = _repository.AsSugarClient();
+            var QcCheckItemsH=await db.Queryable< QcCheckItemsH >().Where(p=>p.id==id).FirstAsync();
+            var QcCheckItemsRs = await db.Queryable<QcCheckItemsR>().Where(p => p.itemshid == id).ToListAsync() ;
+            var QcCheckItemsDs=await db.Queryable<QcCheckItemsD>().Where(p=> QcCheckItemsRs.Select(p=>p.id).ToList().Contains( p.id)).ToListAsync() ;
+            await db.Ado.BeginTranAsync();
+            await db.Deleteable(QcCheckItemsH).ExecuteCommandAsync();
+            await db.Deleteable(QcCheckItemsRs).ExecuteCommandAsync();
+            await db.Deleteable(QcCheckItemsDs).ExecuteCommandAsync();
+            await db.Ado.CommitTranAsync();
+        }
+
+        /// <summary>
+        /// 获取质检项集合
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<dynamic> GetCheckItem()
+        {
+            var db = _repository.AsSugarClient();
+            List<CheckItemOut> CheckItemOuts = new List<CheckItemOut>();
+            var datas = await db.Queryable<QcCheckItem>().InnerJoin<QcCheckType>((a, b) => a.type == b.id).Select((a, b) => new
+            {
+                id = a.id,
+                name = a.name,
+                code = a.code,
+                type = a.type,
+                typename = b.name
+            }).ToListAsync();
+            foreach (var data in datas)
+            {
+                if (CheckItemOuts.Where(p => p.checktypeid == data.type).Any())
+                {
+                    var CheckItemOut = CheckItemOuts.Where(p => p.checktypeid == data.type).First();
+                    if (CheckItemOut.items == null)
+                    {
+                        CheckItemOut.items = new List<CheckItem>();
+                        CheckItemOut.items.Add(new CheckItem { itemid = data.id, name = data.name, code = data.code });
+                    }
+                    else
+                        CheckItemOut.items.Add(new CheckItem { itemid = data.id, name = data.name, code = data.code });
+                }
+                else
+                {
+                    CheckItemOuts.Add(new CheckItemOut { checktypeid = data.type, checktypename = data.typename, items = new List<CheckItem>() });
+                    var CheckItemOut = CheckItemOuts.Where(p => p.checktypeid == data.type).First();
+                    CheckItemOut.items.Add(new CheckItem() { itemid = data.id, name = data.name, code = data.code });
+                }
+            }
+            return CheckItemOuts;
+        }
+
+        /// <summary>
+        /// 保存质检项清单
+        /// </summary>
+        /// <param name="CheckItemInput"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task SaveData(CheckItemsInput CheckItemsInput)
+        {
+            var db = _repository.AsSugarClient();
+            try
+            {
+            
+                QcCheckItemsH QcCheckItemsH = new QcCheckItemsH();
+                QcCheckItemsH.name = CheckItemsInput.name;
+                QcCheckItemsH.status = CheckItemsInput.status;
+                QcCheckItemsH.create_time = DateTime.Now;
+                QcCheckItemsH.create_id = _userManager.UserId;
+                List<QcCheckItemsR> QcCheckItemsRs = new List<QcCheckItemsR>();
+                List<QcCheckItemsD> QcCheckItemsDs = new List<QcCheckItemsD>();
+
+                foreach (var checktype in CheckItemsInput.checktypoes)
+                {
+                    foreach (var item in checktype.items)
+                    {
+                        var QcCheckItemsD = new QcCheckItemsD()
+                        {
+                            extype = item.extype,
+                            excontent = item.excontent,
+                            check = item.check,
+                            errorcause = item.errorcause,
+                            errorlevel = item.errorlevel,
+                            remark = item.remark,
+                            attachment = item.attachment,
+                            isexec = item.isexec
+                        };
+                        QcCheckItemsDs.Add(QcCheckItemsD);
+                        var QcCheckItemsR = new QcCheckItemsR()
+                        {
+                            itemshid = QcCheckItemsH.id,
+                            typeid = checktype.id,
+                            itemid = item.itemid,
+                            itemsdid = QcCheckItemsD.id
+                        };
+
+                        QcCheckItemsRs.Add(QcCheckItemsR);
+                    }
+                }
+                await db.Ado.BeginTranAsync();
+                await db.Insertable(QcCheckItemsH).ExecuteCommandAsync();
+                await db.Insertable(QcCheckItemsRs).ExecuteCommandAsync();
+                await db.Insertable(QcCheckItemsDs).ExecuteCommandAsync();
+                await db.Ado.CommitTranAsync();
+            }
+            catch (Exception ex)
+            {  
+                await db.Ado.RollbackTranAsync();
+                throw Oops.Oh(ErrorCode.COM1000);
+            }
+        }
+    }
+}

QcMgr/Tnb.QcMgr/QcCheckPlanService.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Aspose.Cells.Drawing;
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Enums;
+using JNPF.DependencyInjection;
+using JNPF.DynamicApiController;
+using JNPF.FriendlyException;
+using JNPF.VisualDev;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using Tnb.QcMgr.Entities;
+using Tnb.QcMgr.Entities.Dto;
+using Tnb.QcMgr.Interfaces;
+
+namespace Tnb.QcMgr
+{
+    /// <summary>
+    /// 质检方案模块
+    /// </summary>
+    [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 800)]
+    [Route("api/[area]/[controller]/[action]")]
+    public class QcCheckPlanService : IQcCheckPlanService, IDynamicApiController, ITransient
+    {
+        private readonly ISqlSugarRepository<QcCheckPlanH> _repository;
+        private readonly IUserManager _userManager;
+
+        public QcCheckPlanService(ISqlSugarRepository<QcCheckPlanH> repository, IUserManager userManager)
+        {
+            _repository = repository;
+            _userManager = userManager;
+
+        }
+
+        /// <summary>
+        /// 保存质检方案
+        /// </summary>
+        /// <param name="CheckPlanInput"></param>
+        /// <returns></returns>
+        public async Task SaveData(CheckPlanInput CheckPlanInput)
+        {
+            var db = _repository.AsSugarClient();
+            try
+            {
+                QcCheckPlanH QcCheckPlanH = new QcCheckPlanH();
+                QcCheckPlanH.name = CheckPlanInput.name;
+                QcCheckPlanH.status = CheckPlanInput.status;
+                QcCheckPlanH.checktype = CheckPlanInput.checktype;
+                QcCheckPlanH.numtype = CheckPlanInput.numtype;
+                QcCheckPlanH.pagetype = CheckPlanInput.pagetype;
+                QcCheckPlanH.writerule = CheckPlanInput.writerule;
+                QcCheckPlanH.remind = CheckPlanInput.remind;
+                QcCheckPlanH.attachment = CheckPlanInput.attachment;
+                QcCheckPlanH.isaddmul = CheckPlanInput.isaddmul;
+                QcCheckPlanH.create_time = DateTime.Now;
+                QcCheckPlanH.create_id = _userManager.UserId;
+                QcCheckPlanD QcCheckPlanD = new QcCheckPlanD();
+                QcCheckPlanD.mainid = QcCheckPlanH.id;
+                QcCheckPlanD.triggertype = CheckPlanInput.triggertype;
+                QcCheckPlanD.content = CheckPlanInput.content;
+                await db.Ado.BeginTranAsync();
+                await db.Insertable(QcCheckPlanH).ExecuteCommandAsync();
+                await db.Insertable(QcCheckPlanD).ExecuteCommandAsync();
+                await db.Ado.CommitTranAsync();
+            }
+            catch (Exception ex)
+            {
+                await db.Ado.RollbackTranAsync();
+                throw Oops.Oh(ErrorCode.COM1000);
+            }
+        }
+    }
+}

QcMgr/Tnb.QcMgr/QcCheckTypeService.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Core.Manager;
+using JNPF.DependencyInjection;
+using JNPF.DynamicApiController;
+using JNPF.Systems.Interfaces.System;
+using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
+using JNPF.VisualDev.Entitys;
+using JNPF.VisualDev.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+using NPOI.Util;
+using SqlSugar;
+using Tnb.QcMgr.Interfaces;
+using Tnb.QcMgr.Entities;
+using Microsoft.AspNetCore.Identity;
+using JNPF.Systems.Entitys.Permission;
+
+namespace Tnb.QcMgr
+{
+    /// <summary>
+    /// 质检项分类模块
+    /// </summary>
+    [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 800)]
+    [Route("api/[area]/[controller]/[action]")]
+    [OverideVisualDev(ModuleId)]
+    public class QcCheckTypeService : IOverideVisualDevService, IQcCheckTypeService, IDynamicApiController, ITransient
+    {
+        private const string ModuleId = "26436503234597";
+        private readonly ISqlSugarRepository<QcCheckType> _repository;
+        private readonly IUserManager _userManager;
+        private readonly IVisualDevService _visualDevService;
+        private readonly IRunService _runService;
+        public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
+        public QcCheckTypeService(
+          ISqlSugarRepository<QcCheckType> repository,
+          IUserManager userManager,
+          IRunService runService,
+          IVisualDevService visualDevService
+          )
+        {
+            _repository = repository;
+            _userManager = userManager;
+            _visualDevService = visualDevService;
+            _runService = runService;
+            OverideFuncs.GetListAsync = GetList;
+        }
+        private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
+        {
+            var db = _repository.AsSugarClient();
+            VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
+            var data = await _runService.GetListResult(templateEntity, input);
+            if (data?.list?.Count > 0)
+            {
+                var items = await db.Queryable<QcCheckItem>().ToListAsync();
+                foreach (var row in data.list)
+                {
+                    row["inspection_items"] = string.Join(",", items.Where(p => p.type == row["id"].ToString()).Select(p => p.name).ToList());
+                }
+            }
+            return data!;
+        }
+    }
+}

visualdev/Tnb.VisualDev.Engine/Core/FormDataParsing.cs

@@ -116,11 +116,13 @@ public class FormDataParsing : ITransient
                             if (fieldsModel.precision > dataList.Last().Length) fieldsModel.precision = dataList.Last().Length;
                             conversionData = dataList.First() + "." + dataList.Last().Substring(0, (int)fieldsModel.precision);
                         }
-                        //conversionData = data.ToString().Substring(0, data.ToString().IndexOf(".") + (int)fieldsModel.precision + 1);//modifyby zhoukeda 20230512 增加+1
-                        //conversionData = data.ParseToDouble();//modifyby zhoukeda 20230512
+                        conversionData = conversionData.ParseToDouble();//modifyby zhoukeda 20230605
                     }
-                    else if (fieldsModel.precision > 0) conversionData = data.ToString() + ".".PadRight((int)fieldsModel.precision + 1, '0');
-                    else conversionData = data;
+                    else if (fieldsModel.precision > 0)
+                    {
+                        conversionData = data.ToString() + ".".PadRight((int)fieldsModel.precision + 1, '0');
+                        conversionData = conversionData.ParseToDouble();//modifyby zhoukeda 20230605
+                    }else conversionData = data;
                     break;
                 case JnpfKeyConst.JNPFAMOUNT:
                     conversionData = data.ParseToDecimal(); // 金额输入