日志增加 WorkingProcedureCurrent

schangxiang@126.com

2024-09-04 0e97de73f6719ccd57469cea07a9f567864cc57a

日志增加  WorkingProcedureCurrent

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

@@ -70,9 +70,9 @@
            IAccessInterfaceLogService accessInterfaceLog,
            IRepository<ThreadStatusMonitor, MasterDbContextLocator> threadStatusMonitorRep,
            IRepository<DataCaptureConfig, MasterDbContextLocator> dataCaptureConfigRep,
            IRepository<WorkPieceProcess, MasterDbContextLocator> workPieceProcessRep, WorkPieceInfoService WorkPieceInfoService, 
            IRepository<WorkPieceInfoLog, MasterDbContextLocator> workPieceInfoLog, 
            IRepository<EquipmentCurrentMonitor, MasterDbContextLocator> equipmentCurrentMonitorRep, 
            IRepository<WorkPieceProcess, MasterDbContextLocator> workPieceProcessRep, WorkPieceInfoService WorkPieceInfoService,
            IRepository<WorkPieceInfoLog, MasterDbContextLocator> workPieceInfoLog,
            IRepository<EquipmentCurrentMonitor, MasterDbContextLocator> equipmentCurrentMonitorRep,
            IRepository<EquipmentBaseInfo, MasterDbContextLocator> equipmentBaseInfoRep, ISysDictTypeService dict
            , IRepository<ProductionPlanInfo, MasterDbContextLocator> productionPlanInfoRep
            , IRepository<ShiftInfo, MasterDbContextLocator> shiftInfoRep)
@@ -127,9 +127,10 @@
            {
                addLog.IpAddress = ipAddress.MapToIPv4().ToString();
            }
            AddQualityDataInfoInputV2 input = null;
            try
            {
                var input = JsonConvert.DeserializeObject<AddQualityDataInfoInputV2>(json);
                input = JsonConvert.DeserializeObject<AddQualityDataInfoInputV2>(json);
                addLog.Key = input.WorkPieceID;

                if (input == null || string.IsNullOrEmpty(input.WorkPieceID) || input.QualityState == 0)
@@ -277,7 +278,7 @@
                        }
                        updateinfo.WorkPieceState = (int)WorkPieceState.WIP;//推出后和SPC抽检后 质量录入时状态修改回在制品
                        updateinfo.QualityState = (int)EnumQualityState.Suspected;
                        updateinfo.QualityErrorInfo = $"工件{update.WorkPieceID}在工序{input.WorkingProcedure}抽检不合格，相关工件质量状态变更为疑似";;
                        updateinfo.QualityErrorInfo = $"工件{update.WorkPieceID}在工序{input.WorkingProcedure}抽检不合格，相关工件质量状态变更为疑似"; ;
                        updateinfo.QualityStateUpdateUser = input.QualityStateUpdateUser;
                        updateinfo.QualityStateUpdateTime = now;
                        updateinfo.QualityStateUpdateMode = EnumQualityStateUpdateMode.SPC.ToString();
@@ -299,6 +300,8 @@
            {
                try
                {
                    addLog.WorkPieceID = input.WorkPieceID;
                    addLog.WorkingProcedureCurrent = input.WorkingProcedure;

                    await _accessInterfaceLog.AddInterfaceLogAsync(addLog);
                }
@@ -392,7 +395,7 @@
                .ProjectToType<EquipmentCurrentMonitorOutputV2>()
                .OrderBy(o => o.EquipmentID)
                .ToListAsync();
            

            return equipmentCurrentMonitors;
        }

@@ -406,10 +409,10 @@
            List<ProduceCompletionStatus> list = new List<ProduceCompletionStatus>();

            //获取当前年的第一天
            var yearOneDay= DateTime.Now.AddDays(-((int)DateTime.Now.DayOfYear - 1)).Date;     
            var yearOneDay = DateTime.Now.AddDays(-((int)DateTime.Now.DayOfYear - 1)).Date;
            //获取月份计划
            var productionPlanInfos = _productionPlanInfoRep.DetachedEntities
                                     .Where(o=>o.IsDeleted==false&& o.PlanType.Equals("2")).ToList();
                                     .Where(o => o.IsDeleted == false && o.PlanType.Equals("2")).ToList();
            try
            {
                //获取最近一年下线工件的成品
@@ -444,7 +447,7 @@
                }

            }
            catch(Exception ex)
            catch (Exception ex)
            {

            }
@@ -465,17 +468,17 @@
            var day = DateTime.Now.ToString("yyyy-MM-dd");
            //获取当前月份计划
            var productionPlanInfos = _productionPlanInfoRep.DetachedEntities.ProjectToType<ProductionPlanInfoOutput>().ToList()
                                     .Where(o => o.PlanType.Equals("2")&& o.PlanTimeHand.Equals(month)).FirstOrDefault();
                                     .Where(o => o.PlanType.Equals("2") && o.PlanTimeHand.Equals(month)).FirstOrDefault();
            //获取最近月下线工件的成品
            try
            {

            var MonthCompletionnNum = _workPieceInfoRep.DetachedEntities.ProjectToType<WorkPieceInfoOutput>().ToList()
                                     .Where(o => o.WorkPieceLastOfflineTimeHand.Equals(month)
                                     && o.WorkPieceState == (int)WorkPieceState.FinishedProducts).Count();
                var MonthCompletionnNum = _workPieceInfoRep.DetachedEntities.ProjectToType<WorkPieceInfoOutput>().ToList()
                                         .Where(o => o.WorkPieceLastOfflineTimeHand.Equals(month)
                                         && o.WorkPieceState == (int)WorkPieceState.FinishedProducts).Count();
                currentProduceInfo.CurrentMonthProduceNum = MonthCompletionnNum;
            }
            catch(Exception ex)
            catch (Exception ex)
            {

            }
@@ -485,13 +488,13 @@
                                     && o.WorkPieceState == (int)WorkPieceState.FinishedProducts).Count();

            //获取班次班组信息
            var shiftlist = _shiftInfoRep.DetachedEntities.ProjectToType<ShiftInfoOutput>().ToList().Where(o=>o.StartTime<DateTime.Now&&o.EndTime> DateTime.Now).FirstOrDefault();
            var shiftlist = _shiftInfoRep.DetachedEntities.ProjectToType<ShiftInfoOutput>().ToList().Where(o => o.StartTime < DateTime.Now && o.EndTime > DateTime.Now).FirstOrDefault();

            currentProduceInfo.CurrentShiftProduceNum = DayCompletionnNum;
            currentProduceInfo.CurrentShiftPlanNum = 0;
            currentProduceInfo.CurrentMonthPlanNum = (productionPlanInfos==null?0: productionPlanInfos.PlanProductionNum);
            currentProduceInfo.CurrentMonthPlanNum = (productionPlanInfos == null ? 0 : productionPlanInfos.PlanProductionNum);

            if(shiftlist==null)
            if (shiftlist == null)
            {
                currentProduceInfo.CurrentTime = DateTime.Now;
                currentProduceInfo.CurrentTeamLeader = "袁班长";
@@ -501,11 +504,11 @@
            {
                //获取班次计划
                var shiftplan = _productionPlanInfoRep.DetachedEntities.ProjectToType<ProductionPlanInfoOutput>().ToList()
                                         .Where(o => o.PlanType.Equals("1")&&o.TeamType.Equals(shiftlist.ShiftName)&& o.PlanTimeDayHand.Equals(day)).FirstOrDefault();
                                         .Where(o => o.PlanType.Equals("1") && o.TeamType.Equals(shiftlist.ShiftName) && o.PlanTimeDayHand.Equals(day)).FirstOrDefault();
                currentProduceInfo.CurrentTime = DateTime.Now;
                currentProduceInfo.CurrentTeamLeader = shiftlist.ShiftRemark;
                currentProduceInfo.CurrentTeamName = shiftlist.ShiftName;
                if(shiftplan!=null)
                if (shiftplan != null)
                {
                    currentProduceInfo.CurrentShiftPlanNum = shiftplan.PlanProductionNum;
                }
@@ -532,7 +535,7 @@
                }

            }
            catch(Exception ex)
            catch (Exception ex)
            {
                currentProduceInfo.CurrentSafeProductionDay = "异常";
            }
@@ -564,16 +567,16 @@
                case "OP10连杆厚度":
                    qualityDataDisplay.QualityType = str;
                    var datas = _qualityDataInfoRep.DetachedEntities.ProjectToType<QualityDataInfoOutput>()
                        .Where(o=>!string.IsNullOrEmpty(o.QualityOP10To1)&& !string.IsNullOrEmpty(o.WorkPieceID))
                        .Where(o => !string.IsNullOrEmpty(o.QualityOP10To1) && !string.IsNullOrEmpty(o.WorkPieceID))
                        .OrderByDescending(o => o.OP10QualityReceiveTime)
                        .Select(o=>new QualityData() { WorkPieceID = o.WorkPieceID, QualityDataVaule = double.Parse( o.QualityOP10To1) })
                        .Select(o => new QualityData() { WorkPieceID = o.WorkPieceID, QualityDataVaule = double.Parse(o.QualityOP10To1) })
                        .Take(10).Reverse().ToList();
                    qualityDataDisplay.list = datas;
                    break;
                case "OP30涨断力矩":
                    qualityDataDisplay.QualityType = str;
                    var dataop30ch1 = _qualityDataInfoRep.DetachedEntities.ProjectToType<QualityDataInfoOutput>()
                        .Where(o => !string.IsNullOrEmpty(o.QualityOP30To1)&&!string.IsNullOrEmpty(o.WorkPieceID))
                        .Where(o => !string.IsNullOrEmpty(o.QualityOP30To1) && !string.IsNullOrEmpty(o.WorkPieceID))
                        .OrderByDescending(o => o.OP30QualityReceiveTimeCH3)
                        .Select(o => new QualityData() { WorkPieceID = o.WorkPieceID, QualityDataVaule = double.Parse(o.QualityOP30To1.Replace("kN", "")) })
                        .Take(10).Reverse().ToList();
@@ -582,7 +585,7 @@
                case "OP35压装力矩":
                    qualityDataDisplay.QualityType = str;
                    var dataop35 = _qualityDataInfoRep.DetachedEntities.ProjectToType<QualityDataInfoOutput>()
                        .Where(o => !string.IsNullOrEmpty(o.QualityOP35To1)&&!string.IsNullOrEmpty(o.WorkPieceID))
                        .Where(o => !string.IsNullOrEmpty(o.QualityOP35To1) && !string.IsNullOrEmpty(o.WorkPieceID))
                        .OrderByDescending(o => o.OP35QualityReceiveTime)
                        .Select(o => new QualityData() { WorkPieceID = o.WorkPieceID, QualityDataVaule = double.Parse(o.QualityOP35To1) })
                        .Take(10).Reverse().ToList();
@@ -604,7 +607,7 @@
        {
            try
            {
                

                var dicts = await _dict.GetDictTreeOutput();
                var dict = dicts.Where(o => o.Code.Equals("screen_refresh_frequency"));
                if (dict.Any())
@@ -624,7 +627,7 @@
                    return 5000;
                }
            }
            catch(Exception ex)
            catch (Exception ex)
            {

                return 6000;
@@ -640,20 +643,20 @@
        /// <returns></returns>
        [HttpGet("GetProductionForTime")]
        [AllowAnonymous]
        public async Task<List<ProductionInfo>> GetProductionForTime(DateTime start,DateTime end)
        public async Task<List<ProductionInfo>> GetProductionForTime(DateTime start, DateTime end)
        {
            //获取最近月下线工件的成品
            var Production = from info in _workPieceInfoRep.DetachedEntities.ProjectToType<WorkPieceInfoOutput>().ToList()
                                    where info.WorkPieceLastOfflineTime>=start
                                    where info.WorkPieceLastOfflineTime<=end
                                    where info.WorkPieceState==(int)WorkPieceState.FinishedProducts
                                    group info by info.WorkPieceLastOfflineTimeDayHand into grouplist
                                    select new ProductionInfo()
                                    {
                                        Day=grouplist.Key,
                                        ProductionNum=grouplist.Count(),
                                    };
            return Production.OrderBy(o=>o.Day).ToList();
                             where info.WorkPieceLastOfflineTime >= start
                             where info.WorkPieceLastOfflineTime <= end
                             where info.WorkPieceState == (int)WorkPieceState.FinishedProducts
                             group info by info.WorkPieceLastOfflineTimeDayHand into grouplist
                             select new ProductionInfo()
                             {
                                 Day = grouplist.Key,
                                 ProductionNum = grouplist.Count(),
                             };
            return Production.OrderBy(o => o.Day).ToList();

        }
        #endregion

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

@@ -44,7 +44,11 @@
        public async Task AddInterfaceLogAsync(AddAccessInterfaceLogInput input)
        {
            AccessInterfaceLog log = new();
            log.Id=input.Id;

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

            log.Id = input.Id;
            log.ParaJSON = input.JsonString;
            log.Action = input.Action;
            log.IPAddress = input.IpAddress;
@@ -112,7 +116,7 @@
                //    }
                //}
                //log.Keys = string.Join(", ", keys);
                if(input.Result.GetType().Name.Equals("String"))
                if (input.Result.GetType().Name.Equals("String"))
                {
                    log.ResultJson = input.Result.ToString();


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

@@ -1,4 +1,5 @@
using System;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -11,6 +12,21 @@
    /// </summary>
    public class AddAccessInterfaceLogInput
    {

        /// <summary>
        /// 工件号
        /// </summary>
        [Comment("工件号")]

        public string WorkPieceID { get; set; }


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

        public string WorkingProcedureCurrent { get; set; }
        public long Id { get; set; }
        /// <summary>
        /// 请求参数Json字符串

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

@@ -27,6 +27,16 @@
            添加外部访问日志参数
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogInput.WorkPieceID">
            <summary>
            工件号
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogInput.WorkingProcedureCurrent">
            <summary>
            当前工序;进入下一工序前，此工序不变化
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogInput.JsonString">
            <summary>
            请求参数Json字符串

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

@@ -10,6 +10,21 @@
{
    public class AccessInterfaceLog : DEntityBase
    {

        /// <summary>
        /// 工件号
        /// </summary>
        [Comment("工件号")]

        public string WorkPieceID { get; set; }


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

        public string WorkingProcedureCurrent { get; set; }
        /// <summary>
        /// 调用行为
        /// </summary>