测量岛数据展示

schangxiang@126.com

2024-09-06 cb212ea9a9b56540a7fec33f4ec198f59a99020a

测量岛数据展示

 iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterface/AccessInterfaceService.cs

@@ -306,6 +306,7 @@
                {
                    addLog.WorkPieceID = input?.WorkPieceID;
                    addLog.WorkingProcedureCurrent = input?.WorkingProcedure;
                    addLog.QualityState = input?.QualityState;

                    await _accessInterfaceLog.AddInterfaceLogAsync(addLog);
                }

 iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterfaceLog/AccessInterfaceLogService.cs

@@ -2,6 +2,7 @@
using Furion.DependencyInjection;
using Furion.DynamicApiController;
using iWare.Wms.Core;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using StackExchange.Redis;
@@ -20,8 +21,8 @@
    /// <summary>
    /// å¤–部访问接口日志
    /// </summary>
    //[ApiDescriptionSettings("外部访问接口日志", Name = "AccessInterfaceLog", Order = 100)]
    //[Route("api/[Controller]")]
    [ApiDescriptionSettings("外部访问接口日志", Name = "AccessInterfaceLog", Order = 100)]
    [Route("api/[Controller]")]
    public class AccessInterfaceLogService : IAccessInterfaceLogService, IDynamicApiController, ITransient
    {
        private readonly IRepository<AccessInterfaceLog, MasterDbContextLocator> _accessInterfaceLogRep;
@@ -35,6 +36,28 @@
            _accessInterfaceLogRep = accessInterfaceLogRep;
        }



        [HttpGet("page")]
        public async Task<PageResult<AddAccessInterfaceLogOutnput>> Page([FromQuery] AccessInterfaceLogInputSearch input)
        {
            var workPieceOutbounds = await _accessInterfaceLogRep.DetachedEntities
                                     .Where(!string.IsNullOrEmpty(input.WorkPieceID), u => u.WorkPieceID.Contains(input.WorkPieceID))
                                     .Where(!string.IsNullOrEmpty(input.WorkingProcedureCurrent), u => u.WorkingProcedureCurrent.Contains(input.WorkingProcedureCurrent))
                                     .Where(!string.IsNullOrEmpty(input.createdUserName), u => u.CreatedUserName.Contains(input.createdUserName))
                                     .Where(input.QualityState != null, u => u.QualityState == input.QualityState)
                                     .Where(!string.IsNullOrEmpty(input.StartTimeBeginTime.ToString()), u => u.CreatedTime >= input.StartTimeBeginTime)
                                     .Where(!string.IsNullOrEmpty(input.StartTimeEndTime.ToString()), u => u.CreatedTime <= input.StartTimeEndTime)
                                     //.OrderBy(PageInputOrder.OrderBuilder<AccessInterfaceLogInputSearch>(input))
                                     .OrderByDescending(x => x.Id)
                                     .ProjectToType<AddAccessInterfaceLogOutnput>()
                                     .ToADPagedListAsync(input.PageNo, input.PageSize);
            return workPieceOutbounds;
        }




        /// <summary>
        /// æ·»åŠ æ—¥å¿—
        /// </summary>
@@ -47,6 +70,7 @@

            log.WorkPieceID = input.WorkPieceID;
            log.WorkingProcedureCurrent = input.WorkingProcedureCurrent;
            log.QualityState = input.QualityState;

            log.Id = input.Id;
            log.ParaJSON = input.JsonString;

 iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterfaceLog/Dto/AccessInterfaceLogInputSearch.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,93 @@
using iWare.Wms.Core;
using iWare.Wms.Core.Service;
using System.ComponentModel.DataAnnotations;

namespace iWare.Wms.Application
{

   
    public class AccessInterfaceLogInputSearch : PageInputBase
    {

        /// <summary>
        /// Y N
        /// </summary>
        public virtual string IsHaveOP80Code { get; set; }

        public virtual string createdUserName { get; set; }


        /// <summary>
        /// å·¥ä»¶å·
        /// </summary>
        public virtual string WorkPieceID { get; set; }


        /// <summary>
        /// æˆå“ç 
        /// </summary>
        public virtual string OP80NewCode { get; set; }

        /// <summary>
        /// å½“前设备
        /// </summary>
        public virtual string EquipmentID { get; set; }
        /// <summary>
        /// æ“ä½œç±»åž‹ï¼ˆSPC/生产）
        /// </summary>
        public string OperationType { get; set; }

        /// <summary>
        /// å½“前工序
        /// </summary>
        public virtual string WorkingProcedureCurrent { get; set; }
        
        /// <summary>
        /// å·¥åºä¸Šçº¿æ—¶é—´
        /// </summary>
        public virtual DateTime? StartTime { get; set; }

        /// <summary>
        /// å·¥åºä¸Šçº¿æ—¶é—´å¼€å§‹
        /// </summary>
        public virtual DateTime? StartTimeBeginTime { get; set; }

        /// <summary>
        /// å·¥åºä¸Šçº¿æ—¶é—´ç»“束时间
        /// </summary>
        public virtual DateTime? StartTimeEndTime { get; set; }        
        
        /// <summary>                                     
        /// å·¥åºä¸‹çº¿æ—¶é—´
        /// </summary>
        public virtual DateTime? EndTime { get; set; }

        /// <summary>
        /// å·¥ä»¶çŠ¶æ€
        /// </summary>
        public virtual int? WorkPieceState { get; set; }

        /// <summary>
        /// å·¥åºä¸Šçº¿æ—¶é—´å¼€å§‹æ—¶é—´(检索使用)
        /// </summary>
        public virtual DateTime? OnlineTimeBeginTime { get; set; }

        /// <summary>
        /// å·¥åºä¸Šçº¿æ—¶é—´ç»“束时间(检索使用)
        /// </summary>
        public virtual DateTime? OnlineTimeEndTime { get; set; }

        /// <summary>
        /// è´¨é‡çŠ¶æ€
        /// </summary>
        public virtual int? QualityState { get; set; }
        
        /// <summary>
        /// è´¨é‡ä¿¡æ¯id
        /// </summary>
        public virtual int? QualityDataInfoID { get; set; }
        
    }


}

 iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterfaceLog/Dto/AddAccessInterfaceLogInput.cs

@@ -27,6 +27,12 @@
        [Comment("当前工序")]

        public string WorkingProcedureCurrent { get; set; }

        /// <summary>
        /// è´¨é‡çŠ¶æ€
        /// </summary>
        public int? QualityState { get; set; }

        public long Id { get; set; }
        /// <summary>
        /// è¯·æ±‚参数Json字符串

 iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterfaceLog/Dto/AddAccessInterfaceLogOutnput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,183 @@
using iWare.Wms.Core;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace iWare.Wms.Application
{
    /// <summary>
    /// æ·»åŠ å¤–部访问日志参数
    /// </summary>
    public class AddAccessInterfaceLogOutnput
    {

        /// <summary>
        /// ä¸»é”®Id
        /// </summary>
        [Key]
        [DatabaseGenerated(DatabaseGeneratedOption.None)]
        [Comment("Id主键")]
        public virtual long Id { get; set; }

        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        [Comment("创建时间")]
        public virtual DateTimeOffset? CreatedTime { get; set; }

        /// <summary>
        /// æ›´æ–°æ—¶é—´
        /// </summary>
        [Comment("更新时间")]
        public virtual DateTimeOffset? UpdatedTime { get; set; }

        /// <summary>
        /// åˆ›å»ºè€…Id
        /// </summary>
        [Comment("创建者Id")]
        public virtual long? CreatedUserId { get; set; }

        /// <summary>
        /// åˆ›å»ºè€…名称
        /// </summary>
        [Comment("创建者名称")]
        [MaxLength(50)]
        public virtual string CreatedUserName { get; set; }

        /// <summary>
        /// ä¿®æ”¹è€…Id
        /// </summary>
        [Comment("修改者Id")]
        public virtual long? UpdatedUserId { get; set; }

        /// <summary>
        /// ä¿®æ”¹è€…名称
        /// </summary>
        [Comment("修改者名称")]
        [MaxLength(50)]
        public virtual string UpdatedUserName { get; set; }


        /// <summary>
        /// å·¥ä»¶å·
        /// </summary>
        [Comment("工件号")]

        public string WorkPieceID { get; set; }


        /// <summary>
        /// å½“前工序;进入下一工序前，此工序不变化
        /// </summary>
        [Comment("当前工序")]

        public string WorkingProcedureCurrent { get; set; }

        /// <summary>
        /// è´¨é‡çŠ¶æ€
        /// </summary>
        public int? QualityState { get; set; }

        /// <summary>
        /// è°ƒç”¨è¡Œä¸º
        /// </summary>
        [Comment("调用行为")]
        [Required]
        public int Action { get; set; }

        /// <summary>
        /// æ“ä½œæŽ¥å£
        /// </summary>
        [Comment("操作接口")]
        [MaxLength(200)]
        public string OperateAddress { get; set; }

        [Comment("操作人Id")]
        [MaxLength(200)]
        public string OperateUserId { get; set; }

        [Comment("操作人名称")]
        [MaxLength(200)]
        public string OperateUserName { get; set; }

        /// <summary>
        /// æ“ä½œIp
        /// </summary>
        [Comment("操作Ip")]
        [MaxLength(50)]
        public string IPAddress { get; set; }

        /// <summary>
        /// å‚æ•°1
        /// </summary>
        [Comment("参数1")]
        [MaxLength(200)]
        public string Param1 { get; set; }

        /// <summary>
        /// å‚æ•°2
        /// </summary>
        [Comment("参数2")]
        [MaxLength(200)]
        public string Param2 { get; set; }

        /// <summary>
        /// å‚æ•°3
        /// </summary>
        [Comment("参数3")]
        [MaxLength(200)]
        public string Param3 { get; set; }

        /// <summary>
        /// è¯·æ±‚参数json
        /// </summary>
        [Comment("请求参数json")]
        public string ParaJSON { get; set; }

        /// <summary>
        /// è¿”回结果
        /// </summary>
        [Comment("返回结果")]
        public string ResultJson { get; set; }

        /// <summary>
        /// å…³é”®å­—集合
        /// </summary>
        [Comment("关键字集合")]
        public string Keys { get; set; }

        /// <summary>
        /// è´¨é‡çŠ¶æ€åç§°
        /// </summary>
        public string QualityStateName
        {
            get
            {
                if (1 == QualityState)
                {
                    return "合格";

                }
                else if (2 == QualityState)
                {

                    return "不合格";
                }
                else if (3 == QualityState)
                {

                    return "疑似";
                }
                else
                {
                    return "";
                }
            }
        }
    }
}

 iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterfaceLog/IAccessInterfaceLogService.cs

@@ -1,4 +1,6 @@
using System;
using iWare.Wms.Core;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -11,6 +13,9 @@
    /// </summary>
    public interface IAccessInterfaceLogService
    {

        Task<PageResult<AddAccessInterfaceLogOutnput>> Page([FromQuery] AccessInterfaceLogInputSearch input);
        
        /// <summary>
        /// æ·»åŠ æ—¥å¿—
        /// </summary>

 iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml

@@ -107,6 +107,81 @@
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.IsHaveOP80Code">
            <summary>
            Y N
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.WorkPieceID">
            <summary>
            å·¥ä»¶å·
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.OP80NewCode">
            <summary>
            æˆå“ç 
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.EquipmentID">
            <summary>
            å½“前设备
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.OperationType">
            <summary>
            æ“ä½œç±»åž‹ï¼ˆSPC/生产）
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.WorkingProcedureCurrent">
            <summary>
            å½“前工序
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.StartTime">
            <summary>
            å·¥åºä¸Šçº¿æ—¶é—´
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.StartTimeBeginTime">
            <summary>
            å·¥åºä¸Šçº¿æ—¶é—´å¼€å§‹
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.StartTimeEndTime">
            <summary>
            å·¥åºä¸Šçº¿æ—¶é—´ç»“束时间
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.EndTime">
            <summary>                                     
            å·¥åºä¸‹çº¿æ—¶é—´
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.WorkPieceState">
            <summary>
            å·¥ä»¶çŠ¶æ€
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.OnlineTimeBeginTime">
            <summary>
            å·¥åºä¸Šçº¿æ—¶é—´å¼€å§‹æ—¶é—´(检索使用)
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.OnlineTimeEndTime">
            <summary>
            å·¥åºä¸Šçº¿æ—¶é—´ç»“束时间(检索使用)
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.QualityState">
            <summary>
            è´¨é‡çŠ¶æ€
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AccessInterfaceLogInputSearch.QualityDataInfoID">
            <summary>
            è´¨é‡ä¿¡æ¯id
            </summary>
        </member>
        <member name="T:iWare.Wms.Application.AddAccessInterfaceLogInput">
            <summary>
            æ·»åŠ å¤–部访问日志参数
@@ -120,6 +195,11 @@
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogInput.WorkingProcedureCurrent">
            <summary>
            å½“前工序;进入下一工序前，此工序不变化
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogInput.QualityState">
            <summary>
            è´¨é‡çŠ¶æ€
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogInput.JsonString">
@@ -162,6 +242,111 @@
            æ“ä½œäººåç§°
            </summary>
        </member>
        <member name="T:iWare.Wms.Application.AddAccessInterfaceLogOutnput">
            <summary>
            æ·»åŠ å¤–部访问日志参数
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.Id">
            <summary>
            ä¸»é”®Id
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.CreatedTime">
            <summary>
            åˆ›å»ºæ—¶é—´
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.UpdatedTime">
            <summary>
            æ›´æ–°æ—¶é—´
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.CreatedUserId">
            <summary>
            åˆ›å»ºè€…Id
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.CreatedUserName">
            <summary>
            åˆ›å»ºè€…名称
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.UpdatedUserId">
            <summary>
            ä¿®æ”¹è€…Id
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.UpdatedUserName">
            <summary>
            ä¿®æ”¹è€…名称
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.WorkPieceID">
            <summary>
            å·¥ä»¶å·
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.WorkingProcedureCurrent">
            <summary>
            å½“前工序;进入下一工序前，此工序不变化
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.QualityState">
            <summary>
            è´¨é‡çŠ¶æ€
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.Action">
            <summary>
            è°ƒç”¨è¡Œä¸º
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.OperateAddress">
            <summary>
            æ“ä½œæŽ¥å£
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.IPAddress">
            <summary>
            æ“ä½œIp
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.Param1">
            <summary>
            å‚æ•°1
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.Param2">
            <summary>
            å‚æ•°2
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.Param3">
            <summary>
            å‚æ•°3
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.ParaJSON">
            <summary>
            è¯·æ±‚参数json
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.ResultJson">
            <summary>
            è¿”回结果
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.Keys">
            <summary>
            å…³é”®å­—集合
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogOutnput.QualityStateName">
            <summary>
            è´¨é‡çŠ¶æ€åç§°
            </summary>
        </member>
        <member name="T:iWare.Wms.Application.IAccessInterfaceLogService">
            <summary>
            å¤–部访问接口日志

 iWara.SCADA.Code/iWare.Wms.Core/Entity/Access/AccessInterfaceLog.cs

@@ -25,6 +25,12 @@
        [Comment("当前工序")]

        public string WorkingProcedureCurrent { get; set; }

        /// <summary>
        /// è´¨é‡çŠ¶æ€
        /// </summary>
        public int? QualityState { get; set; }

        /// <summary>
        /// è°ƒç”¨è¡Œä¸º
        /// </summary>