优化界面

schangxiang@126.com

2024-06-08 d8ae39b2bafce2556e61b1686358924d498be95a

优化界面

 iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceOutbound/WorkPieceOutboundService.cs

@@ -18,6 +18,7 @@
    //[Route("api")]
    [ApiDescriptionSettings("自己的业务", Name = "WorkPieceOutbound", Order = 100)]
    [Route("api/[Controller]")]
    [DisableOpLog]
    public class WorkPieceOutboundService : IWorkPieceOutboundService, IDynamicApiController, ITransient
    {
        private readonly IRepository<WorkPieceOutbound,MasterDbContextLocator> _workPieceOutboundRep;

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

@@ -25,7 +25,13 @@
        /// 工件号
        /// </summary>
        public virtual string WorkPieceID { get; set; }
        


        /// <summary>
        /// 成品码
        /// </summary>
        public virtual string OP80NewCode { get; set; }

        /// <summary>
        /// 当前设备
        /// </summary>

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

@@ -32,6 +32,11 @@
        public string WorkPieceID { get; set; }

        /// <summary>
        /// 成品码
        /// </summary>
        public virtual string OP80NewCode { get; set; }

        /// <summary>
        /// 当前工序
        /// </summary>
        public string WorkingProcedureCurrent { get; set; }
@@ -174,119 +179,123 @@
    /// </summary>
    [Description("工件加工追溯信息(工件+工序)")]
    public class WorkPieceProcessExcelOutput
    {
        /// <summary>
        /// 工件号
        /// </summary>
        [Description("工件号")]
        public string WorkPieceID { get; set; }

        /// <summary>
        /// 当前工序
        /// </summary>
        [Description("当前工序")]
        public string WorkingProcedureCurrent { get; set; }

        /// <summary>
        /// 设备名称
        /// </summary>
        [Description("设备名称")]
        public string EquipmentName { get; set; }

        /// <summary>
        /// 工序上线时间
        /// </summary>
        [Description("上线时间")]
        public string StartTime { get; set; }

        private string m_EndTime = "";
        /// <summary>
        /// 工序下线时间
        /// </summary>
        [Description("下线时间")]
        public string EndTime
        {
            /// <summary>
            /// 工件号
            /// </summary>
            [Description("工件号")]
            public string WorkPieceID { get; set; }

            /// <summary>
            /// 当前工序
            /// </summary>
            [Description("当前工序")]
            public string WorkingProcedureCurrent { get; set; }

            /// <summary>
            /// 设备名称
            /// </summary>
            [Description("设备名称")]
            public string EquipmentName { get; set; }

            /// <summary>
            /// 工序上线时间
            /// </summary>
            [Description("上线时间")]
            public string StartTime { get; set; }

            private string m_EndTime = "";
            /// <summary>
            /// 工序下线时间
            /// </summary>
            [Description("下线时间")]
            public string EndTime
            get
            {
                get
                if (string.IsNullOrEmpty(m_EndTime))
                {
                    if (string.IsNullOrEmpty(m_EndTime))
                    {
                        return "";
                    }

                    if (m_EndTime.Contains("0001-01-01"))
                    {
                        return "";
                    }
                    else
                    {
                        return m_EndTime;
                    }
                    return "";
                }
                set { m_EndTime = value; }
            }

            /// <summary>
            /// 加工时长
            /// </summary>
            [Description("加工时长")]
            public string TimeSceonds
            {
                get
                if (m_EndTime.Contains("0001-01-01"))
                {
                    if (string.IsNullOrEmpty(EndTime) || string.IsNullOrEmpty(StartTime))
                    {
                        return "";
                    }

                    TimeSpan ts = Convert.ToDateTime(EndTime) - Convert.ToDateTime(StartTime);

                    return Convert.ToInt32(ts.TotalMinutes).ToString() + "min";
                    return "";
                }
                else
                {
                    return m_EndTime;
                }
            }
            set { m_EndTime = value; }
        }

            /// <summary>
            /// 质量状态
            /// </summary>
            public int QualityState { get; set; }
            /// <summary>
            /// 质量状态名称
            /// </summary>
            [Description("质量状态")]
            public string QualityStateName
        /// <summary>
        /// 加工时长
        /// </summary>
        [Description("加工时长")]
        public string TimeSceonds
        {
            get
            {
                get
                if (string.IsNullOrEmpty(EndTime) || string.IsNullOrEmpty(StartTime))
                {
                    if (1 == QualityState)
                    {
                        return "合格";
                    return "";
                }

                    }
                    else if (2 == QualityState)
                    {
                TimeSpan ts = Convert.ToDateTime(EndTime) - Convert.ToDateTime(StartTime);

                        return "不合格";
                    }
                    else if (3 == QualityState)
                    {
                return Convert.ToInt32(ts.TotalMinutes).ToString() + "min";
            }
        }

                        return "疑似";
                    }
                    else
                    {
                        return "";
                    }
        /// <summary>
        /// 质量状态
        /// </summary>
        public int QualityState { get; set; }
        /// <summary>
        /// 质量状态名称
        /// </summary>
        [Description("质量状态")]
        public string QualityStateName
        {
            get
            {
                if (1 == QualityState)
                {
                    return "合格";

                }
                else if (2 == QualityState)
                {

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

                    return "疑似";
                }
                else
                {
                    return "";
                }
            }
        }
        /// <summary>
        /// 成品码
        /// </summary>
        [Description("成品码")]
        public string OP80NewCode { get; set; }


            /// <summary>
            /// Id主键
            /// </summary>
            public long Id { get; set; }
        /// <summary>
        /// Id主键
        /// </summary>
        public long Id { get; set; }
        /// <summary>
        /// 创建人
        /// </summary>
        [Description("信息来源")]
        [Description("数据来源")]
        public string CreateUserName { get; set; }

    }
@@ -327,6 +336,12 @@
        /// 工件号
        /// </summary>
        public string WorkPieceID { get; set; }


        /// <summary>
        /// 成品码
        /// </summary>
        public virtual string OP80NewCode { get; set; }

        /// <summary>
        /// 当前工序
@@ -692,7 +707,7 @@
        /// <summary>
        /// 质量状态
        /// </summary>
        public int? QualityState { get; set; }
        private int? QualityState { get; set; }

        /// <summary>
        /// 质量状态名字
@@ -724,6 +739,13 @@
            }
        }


        /// <summary>
        /// 成品码
        /// </summary>
        [Description("成品码")]
        public string OP80NewCode { get; set; }

        /// <summary>
        /// Id主键
        /// </summary>

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

@@ -25,9 +25,10 @@
    /// </summary>
    [ApiDescriptionSettings("数据查询服务", Name = "WorkPieceProcess", Order = 100)]
    [Route("api/[Controller]")]
    [DisableOpLog]
    public class WorkPieceProcessService : IWorkPieceProcessService, IDynamicApiController, ITransient
    {
        private readonly IRepository<WorkPieceProcess,MasterDbContextLocator> _workPieceProcessRep;
        private readonly IRepository<WorkPieceProcess, MasterDbContextLocator> _workPieceProcessRep;
        private readonly IRepository<WorkPieceInfo, MasterDbContextLocator> _workPieceInfoRep;
        private readonly IRepository<EquipmentBaseInfo, MasterDbContextLocator> _equipmentBaseInfoRep;
        private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
@@ -43,7 +44,7 @@
        /// <param name="sysDictTypeRep"></param>
        /// <param name="sysDictDataRep"></param>
        public WorkPieceProcessService(
            IRepository<WorkPieceProcess,MasterDbContextLocator> workPieceProcessRep,
            IRepository<WorkPieceProcess, MasterDbContextLocator> workPieceProcessRep,
            IRepository<WorkPieceInfo, MasterDbContextLocator> workPieceInfoRep,
            IRepository<EquipmentBaseInfo, MasterDbContextLocator> equipmentBaseInfoRep,
            IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep,
@@ -74,34 +75,38 @@
            //                   EmployeeName = emp.Name,
            //                   DepartmentName = dept != null ? dept.Name : null
            //               };
            var workPieceProcesss = await(from process in _workPieceProcessRep.DetachedEntities
                    join baseinfo in _equipmentBaseInfoRep.DetachedEntities
                  on process.EquipmentID equals baseinfo.EquipmentId into joinedEmpty
                    from baseinfo2 in joinedEmpty.DefaultIfEmpty()
                    where process.IsDeleted == false && process.WorkPieceID.Contains(string.IsNullOrEmpty(input.WorkPieceID)?"": input.WorkPieceID)
                    && process.QualityState == (input.QualityState.HasValue? input.QualityState.Value: process.QualityState)
                    && process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
                    && process.WorkingProcedureCurrent == (string.IsNullOrEmpty(input.WorkingProcedureCurrent) ? process.WorkingProcedureCurrent : input.WorkingProcedureCurrent)
                    && process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
                    && process.OperationType==(string.IsNullOrEmpty(input.OperationType) ? process.OperationType : input.OperationType)
                    && !string.IsNullOrEmpty(process.WorkPieceID)
                    &&process.StartTime>= (input.StartTimeBeginTime.HasValue?input.StartTimeBeginTime:DateTime.MinValue)
                    && process.StartTime <= (input.StartTimeEndTime.HasValue ? input.StartTimeEndTime : DateTime.MaxValue)
                                          select new WorkPieceProcessOutput
                    {
            var workPieceProcesss = await (from process in _workPieceProcessRep.DetachedEntities
                                           join baseinfo in _equipmentBaseInfoRep.DetachedEntities on process.EquipmentID equals baseinfo.EquipmentId into joinedEmpty
                                           from baseinfo2 in joinedEmpty.DefaultIfEmpty()
                                           join workPiece in _workPieceInfoRep.DetachedEntities on process.WorkPieceID equals workPiece.WorkPieceID into joined2Empty
                                           from workPiece2 in joined2Empty.DefaultIfEmpty()
                                           where process.IsDeleted == false && process.WorkPieceID.Contains(string.IsNullOrEmpty(input.WorkPieceID) ? "" : input.WorkPieceID)
                     && process.QualityState == (input.QualityState.HasValue ? input.QualityState.Value : process.QualityState)
                     && process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
                     && process.WorkingProcedureCurrent == (string.IsNullOrEmpty(input.WorkingProcedureCurrent) ? process.WorkingProcedureCurrent : input.WorkingProcedureCurrent)
                     && workPiece2.OP80NewCode == (string.IsNullOrEmpty(input.OP80NewCode) ? workPiece2.OP80NewCode : input.OP80NewCode)
                     && process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
                     && process.OperationType == (string.IsNullOrEmpty(input.OperationType) ? process.OperationType : input.OperationType)
                     && !string.IsNullOrEmpty(process.WorkPieceID)
                     && process.StartTime >= (input.StartTimeBeginTime.HasValue ? input.StartTimeBeginTime : DateTime.MinValue)
                     && process.StartTime <= (input.StartTimeEndTime.HasValue ? input.StartTimeEndTime : DateTime.MaxValue)
                                           select new WorkPieceProcessOutput
                                           {

                        Id = process.Id,
                        WorkPieceID = process.WorkPieceID,
                        EquipmentID = process.EquipmentID,
                        EquipmentName = (baseinfo2 == null ? "" : baseinfo2.EquipmentName),
                        WorkingProcedureCurrent = process.WorkingProcedureCurrent,
                        StartTime = process.StartTime,
                        EndTime = process.EndTime,
                        QualityState = process.QualityState,
                        QualityDataInfoID = process.QualityDataInfoID,
                         OperationType=process.OperationType,
                                              CreateUserName=process.CreatedUserName
                                          }).OrderBy(o=>o.StartTime)
                                               Id = process.Id,
                                               WorkPieceID = process.WorkPieceID,
                                               EquipmentID = process.EquipmentID,
                                               EquipmentName = (baseinfo2 == null ? "" : baseinfo2.EquipmentName),
                                               OP80NewCode = workPiece2.OP80NewCode,

                                               WorkingProcedureCurrent = process.WorkingProcedureCurrent,
                                               StartTime = process.StartTime,
                                               EndTime = process.EndTime,
                                               QualityState = process.QualityState,
                                               QualityDataInfoID = process.QualityDataInfoID,
                                               OperationType = process.OperationType,
                                               CreateUserName = process.CreatedUserName
                                           }).OrderBy(o => o.StartTime)
             .ProjectToType<WorkPieceProcessOutput>()
              .ToADPagedListAsync(input.PageNo, input.PageSize);

@@ -174,17 +179,21 @@
                                                 join baseinfo in _equipmentBaseInfoRep.DetachedEntities
                                               on process.EquipmentID equals baseinfo.EquipmentId into joinedEmpty
                                                 from baseinfo2 in joinedEmpty.DefaultIfEmpty()
                                                 join workPiece in _workPieceInfoRep.DetachedEntities on process.WorkPieceID equals workPiece.WorkPieceID into joined2Empty
                                                 from workPiece2 in joined2Empty.DefaultIfEmpty()
                                                 where process.IsDeleted == false && process.WorkPieceID.Contains(string.IsNullOrEmpty(input.WorkPieceID) ? "" : input.WorkPieceID)
                    && process.QualityState == (input.QualityState.HasValue ? input.QualityState.Value : process.QualityState)
                                                 && process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
                                                 && process.WorkingProcedureCurrent == (string.IsNullOrEmpty(input.WorkingProcedureCurrent) ? process.WorkingProcedureCurrent : input.WorkingProcedureCurrent)
                                                 && process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
                                                 && workPiece2.OP80NewCode == (string.IsNullOrEmpty(input.OP80NewCode) ? workPiece2.OP80NewCode : input.OP80NewCode)
                    && process.OperationType == (string.IsNullOrEmpty(input.OperationType) ? process.OperationType : input.OperationType)
                                                && !string.IsNullOrEmpty(process.WorkPieceID)
                    && process.StartTime >= (input.StartTimeBeginTime.HasValue ? input.StartTimeBeginTime : DateTime.MinValue)
                    && process.StartTime <= (input.StartTimeEndTime.HasValue ? input.StartTimeEndTime : DateTime.MaxValue)
                                                 select new WorkPieceProcessExcelOutput
                                                 {
                                                     OP80NewCode = workPiece2.OP80NewCode,

                                                     Id = process.Id,
                                                     WorkPieceID = process.WorkPieceID,
@@ -193,8 +202,8 @@
                                                     WorkingProcedureCurrent = process.WorkingProcedureCurrent,
                                                     StartTime = process.StartTime.ToString(),
                                                     EndTime = process.EndTime.ToString(),
                                                     QualityState = process.QualityState,
                                                     CreateUserName=process.CreatedUserName
                                                     //QualityState = process.QualityState,
                                                     CreateUserName = process.CreatedUserName
                                                 }).OrderBy(o => o.StartTime).Distinct()
            .ProjectToType<WorkPieceProcessExcelOutput>()
             .ToListAsync();
@@ -227,7 +236,7 @@

            foreach (WorkPieceProcessExcelOutput item in workPieceMachiningInfos)
            {
                item.StartTime = string.IsNullOrEmpty(item.StartTime) ? "" :Convert.ToDateTime(item.StartTime).ToString("yyyy-MM-dd hh:mm:ss");
                item.StartTime = string.IsNullOrEmpty(item.StartTime) ? "" : Convert.ToDateTime(item.StartTime).ToString("yyyy-MM-dd hh:mm:ss");
                item.EndTime = string.IsNullOrEmpty(item.EndTime) ? "" : Convert.ToDateTime(item.EndTime).ToString("yyyy-MM-dd hh:mm:ss");
            }

@@ -255,13 +264,14 @@
               .Join(_sysDictTypeRep.DetachedEntities, g => g.f.TypeId, h => h.Id, (f, g) => new { f, g })
               .Where(x => (x.g.Code.Equals("workpiece_state") && (string.IsNullOrEmpty(input.WorkPieceState.ToString()) ? true : x.f.f.Code.Equals(input.WorkPieceState.ToString()))))
               .Where(!string.IsNullOrEmpty(input.WorkPieceID), u => u.f.e.a.WorkPieceID.Contains(input.WorkPieceID))
               .Where(!string.IsNullOrEmpty(input.OP80NewCode), u => u.f.e.a.OP80NewCode.Contains(input.OP80NewCode))
               .Where(!string.IsNullOrEmpty(input.WorkPieceState.ToString()), u => u.f.e.a.WorkPieceState == input.WorkPieceState)
               .Where(!string.IsNullOrEmpty(input.EquipmentID), u => u.f.e.a.EquipmentID.Equals(input.EquipmentID))
               .Where(!string.IsNullOrEmpty(input.WorkingProcedureCurrent), u => u.f.e.a.WorkingProcedureCurrent.Equals(input.WorkingProcedureCurrent))
              .Where(!string.IsNullOrEmpty(input.StartTimeBeginTime.ToString()), u => u.f.e.a.WorkPieceinitOnlineTime >= input.StartTimeBeginTime)
              .Where(!string.IsNullOrEmpty(input.StartTimeEndTime.ToString()), u => u.f.e.a.WorkPieceinitOnlineTime <= input.StartTimeEndTime)
               .Where(o => !string.IsNullOrEmpty(o.f.e.a.WorkPieceID))
               .Where(o=>o.f.e.a.QualityState== (input.QualityState.HasValue ? input.QualityState.Value : o.f.e.a.QualityState))
               .Where(o => o.f.e.a.QualityState == (input.QualityState.HasValue ? input.QualityState.Value : o.f.e.a.QualityState))
               .Select(s => new WorkPieceInfoMachiningPageOutput
               {
                   Id = s.f.e.a.Id,
@@ -276,7 +286,8 @@
                   QualityState = s.f.e.a.QualityState,
                   EquipmentID = s.f.e.a.EquipmentID,
                   EquipmentName = s.f.e.b.EquipmentName,
                   OperationType = "正常"
                   OperationType = "正常",
                   OP80NewCode = s.f.e.a.OP80NewCode,
               })
               .OrderBy(PageInputOrder.OrderBuilder<WorkPieceProcessSearch>(input))
               .ProjectToType<WorkPieceInfoMachiningPageOutput>()
@@ -299,6 +310,7 @@
              .Join(_sysDictTypeRep.DetachedEntities, g => g.f.TypeId, h => h.Id, (f, g) => new { f, g })
              .Where(x => (x.g.Code.Equals("workpiece_state") && (string.IsNullOrEmpty(input.WorkPieceState.ToString()) ? true : x.f.f.Code.Equals(input.WorkPieceState.ToString()))))
              .Where(!string.IsNullOrEmpty(input.WorkPieceID), u => u.f.e.a.WorkPieceID.Contains(input.WorkPieceID))
               .Where(!string.IsNullOrEmpty(input.OP80NewCode), u => u.f.e.a.OP80NewCode.Contains(input.OP80NewCode))
              .Where(!string.IsNullOrEmpty(input.WorkPieceState.ToString()), u => u.f.e.a.WorkPieceState == input.WorkPieceState)
              .Where(!string.IsNullOrEmpty(input.EquipmentID), u => u.f.e.a.EquipmentID.Equals(input.EquipmentID))
              .Where(!string.IsNullOrEmpty(input.WorkingProcedureCurrent), u => u.f.e.a.WorkingProcedureCurrent.Equals(input.WorkingProcedureCurrent))
@@ -315,7 +327,8 @@
                  WorkPieceLastOfflineTime = s.f.e.a.WorkPieceLastOfflineTime.ToString(),
                  WorkPieceStateName = s.f.f.Value,
                  EquipmentName = s.f.e.b.EquipmentName,
                  QualityState = s.f.e.a.QualityState,
                  //QualityState = s.f.e.a.QualityState,
                  OP80NewCode = s.f.e.a.OP80NewCode,
              })
              .Distinct()
              .OrderBy(PageInputOrder.OrderBuilder<WorkPieceProcessSearch>(input))

 iWara.SCADA.Code/iWare.Wms.Application/Service/YieldAnalysis/YieldAnalysisService.cs

@@ -18,6 +18,7 @@
    /// </summary>
    [ApiDescriptionSettings("数据查询服务", Name = "YieldAnalysis", Order = 100)]
    [Route("api/[Controller]")]
    [DisableOpLog]
    public class YieldAnalysisService : IYieldAnalysisService, IDynamicApiController, ITransient
    {
        private readonly IRepository<YieldAnalysis,MasterDbContextLocator> _yieldAnalysisRep;

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

@@ -14966,6 +14966,11 @@
            工件号
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.WorkPieceProcessSearch.OP80NewCode">
            <summary>
            成品码
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.WorkPieceProcessSearch.EquipmentID">
            <summary>
            当前设备
@@ -15091,6 +15096,11 @@
            工件号
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.WorkPieceProcessOutput.OP80NewCode">
            <summary>
            成品码
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.WorkPieceProcessOutput.WorkingProcedureCurrent">
            <summary>
            当前工序
@@ -15201,6 +15211,11 @@
            质量状态名称
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.WorkPieceProcessExcelOutput.OP80NewCode">
            <summary>
            成品码
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.WorkPieceProcessExcelOutput.Id">
            <summary>
            Id主键
@@ -15229,6 +15244,11 @@
        <member name="P:iWare.Wms.Application.WorkPieceInfoMachiningPageOutput.WorkPieceID">
            <summary>
            工件号
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.WorkPieceInfoMachiningPageOutput.OP80NewCode">
            <summary>
            成品码
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.WorkPieceInfoMachiningPageOutput.WorkingProcedureCurrent">
@@ -15466,6 +15486,11 @@
            质量状态名字
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.WorkPieceInfoMachiningExcelPageOutput.OP80NewCode">
            <summary>
            成品码
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.WorkPieceInfoMachiningExcelPageOutput.Id">
            <summary>
            Id主键

 iWara.SCADA.Code/iWare.Wms.EntityFramework.Core/iWare.Wms.EntityFramework.Core.csproj

@@ -6,6 +6,10 @@
    <Nullable>disable</Nullable>
  </PropertyGroup>

  <ItemGroup>
    <None Remove="dbsettings.Development.json" />
  </ItemGroup>


  <ItemGroup>
    <Content Include="dbsettings.Development.json">