日志类型优化

schangxiang@126.com

2024-09-10 429923d78ca4a016ab86adf30d189eb0e7774925

日志类型优化

 iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs

@@ -62,12 +62,16 @@



        [Description("备注")]
        public string Remarks { get; set; }
        //[Description("备注")]
        //public string Remarks { get; set; }



        [Description("创建人")]
        [Description("来源")]
        public string DataCapturePointCname { get; set; }


        [Description("来源代码")]
        public virtual string CreatedUserName { get; set; }

        /// <summary>
@@ -75,8 +79,6 @@
        /// </summary>
        [Description("创建时间")]
        public virtual DateTimeOffset? CreatedTime { get; set; }






 iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceLogYieldInput.cs

@@ -1,6 +1,7 @@
using iWare.Wms.Core;
using iWare.Wms.Core.Service;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;

namespace iWare.Wms.Application
@@ -48,6 +49,11 @@
        /// </summary>
        public virtual string workingProcedure { get; set; }



        [Description("来源")]
        public string DataCapturePointCname { get; set; }

        public virtual string createdUserName { get; set; }

        public virtual string remarks { get; set; }

 iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs

@@ -295,6 +295,7 @@
                                    .Where(!string.IsNullOrEmpty(input.WorkPieceID), u => u.WorkPieceID.Contains(input.WorkPieceID))
                                    .Where(!string.IsNullOrEmpty(input.workingProcedure), u => u.WorkingProcedure.Contains(input.workingProcedure))
                                      .Where(!string.IsNullOrEmpty(input.createdUserName), u => u.CreatedUserName.Contains(input.createdUserName))
                                        .Where(!string.IsNullOrEmpty(input.DataCapturePointCname), u => u.DataCapturePointCname.Contains(input.DataCapturePointCname))
                                       .Where(!string.IsNullOrEmpty(input.PieceLogTypeName), u => u.PieceLogTypeName.Contains(input.PieceLogTypeName))
                                       .Where(input.PieceLogType != null, u => u.PieceLogType == input.PieceLogType)
                                       .Where(!string.IsNullOrEmpty(input.remarks), u => u.Remarks.Contains(input.remarks))

 iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceLog.cs

@@ -16,6 +16,12 @@
    [Comment("工件接收信息履历表")]
    public class WorkPieceLog : DEntityBase
    {

        /// <summary>
        /// 数据来源
        /// </summary>
        public string DataCapturePointCname { get; set; }

        /// <summary>
        /// 工件号
        /// </summary>