1

schangxiang@126.com

2024-08-18 c66c25cb7b1eec1d3b3de4496525dffe9a3c4040

1

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs

@@ -135,6 +135,12 @@

                            Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}工序测标记读取{DateTime.Now}***3****");

                            if (string.IsNullOrEmpty(wplog.QualityOP70To1) && string.IsNullOrEmpty(wplog.QualityOP70To2) && string.IsNullOrEmpty(wplog.QualityOP70To3))
                            {
                                Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"读取 {DataCapturePointCode}质量信息三个值都是空的：");
                                continue;
                            }

                            //获取OP70未结束的工件列表
                            var ooDateTime = Convert.ToDateTime("0001-01-01");
                            List<WorkPieceProcess> noFinishWorkPieceProcessList = null;
@@ -142,6 +148,7 @@
                            {
                                var dateTime = DateTime.Now;
                                noFinishWorkPieceProcessList = db.WorkPieceProcess.Where(x => x.CreatedTime >= DateTime.Now.AddHours(-12)
                                  && x.WorkingProcedureCurrent == WorkingProcedure
                                  && x.EndTime == ooDateTime).ToList();
                            }
                            if (noFinishWorkPieceProcessList?.Count > 0)
@@ -153,6 +160,10 @@
                                    threadStatusMonitor.Threadstatue = 1;
                                }
                            }
                            else
                            {
                                Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"读取 {DataCapturePointCode}质量信息三个值有值，但是获取OP70未结束的工件列表为空：");
                            }
                        }



 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs

@@ -6,6 +6,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;

namespace iWare_SCADA_Test
{
@@ -80,21 +81,40 @@
                WorkPieceID = "DZ045L2406240103521TAS",
                UpdatedTime = DateTime.Now,
                QualityState = (int)QualityState.NG,
                QualityNoOk=(int)QualityNoOkEnum.OP30涨断工位力矩大,
                QualityNoOkReason= QualityNoOkEnum.OP30涨断工位力矩大.ToString(),
                QualityNoOk = (int)QualityNoOkEnum.OP30涨断工位力矩大,
                QualityNoOkReason = QualityNoOkEnum.OP30涨断工位力矩大.ToString(),
                MonitoringPoint = "",
                QualityStateStr="NG"
                QualityStateStr = "NG"
            }
           ;
            string WorkingProcedure = logMiddle.WorkingProcedure;
            //根据质量数据判断是否合格/不合格 【Editby shaocx,2024-06-25】
            WorkPieceInfoManager.SetLogMiddleForQuality(ref logMiddle);
           

            //更新WorkPieceInfo表以及插入WorkPieceLog表和WorkPieceInfoLog表
            WorkPieceInfoManager.QualityInfoComplete(logMiddle, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));


            string cc = "";
        }

        [TestMethod]
        public void aaaaa()
        {
            //获取OP70未结束的工件列表
            var ooDateTime = Convert.ToDateTime("0001-01-01");
            List<WorkPieceProcess> noFinishWorkPieceProcessList = null;
            using (DbModel db = new DbModel())
            {
                var dateTime = DateTime.Now;
                noFinishWorkPieceProcessList = db.WorkPieceProcess.Where(x =>
                1 == 1
                  && x.WorkingProcedureCurrent == "OP70"
                  && x.EndTime == ooDateTime).ToList();
            }


            string cc = "";
        }
    }
}