From c66c25cb7b1eec1d3b3de4496525dffe9a3c4040 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 18 8月 2024 10:27:37 +0800
Subject: [PATCH] 1
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs
index b8319e0..f2d1235 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs
+++ b/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
{
@@ -79,25 +80,41 @@
WorkingProcedure = "OP30",
WorkPieceID = "DZ045L2406240103521TAS",
UpdatedTime = DateTime.Now,
+ QualityState = (int)QualityState.NG,
+ QualityNoOk = (int)QualityNoOkEnum.OP30娑ㄦ柇宸ヤ綅鍔涚煩澶�,
+ QualityNoOkReason = QualityNoOkEnum.OP30娑ㄦ柇宸ヤ綅鍔涚煩澶�.ToString(),
MonitoringPoint = "",
- QualityStateStr="OK"
+ QualityStateStr = "NG"
}
;
string WorkingProcedure = logMiddle.WorkingProcedure;
//鏍规嵁璐ㄩ噺鏁版嵁鍒ゆ柇鏄惁鍚堟牸/涓嶅悎鏍� 銆怑ditby shaocx,2024-06-25銆�
- QualityNoOkEnum? qualityNoOkEnum = null;
- QualityState qualityState = WorkPieceInfoManager.CalcQualityStateForOP(logMiddle, ref qualityNoOkEnum);
- logMiddle.QualityState = (int)qualityState;
- if (qualityNoOkEnum != null)
- {
- logMiddle.QualityNoOk = (int)qualityNoOkEnum;
- logMiddle.QualityNoOkReason = qualityNoOkEnum.ToString();
- }
+ WorkPieceInfoManager.SetLogMiddleForQuality(ref logMiddle);
+
//鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰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 = "";
+ }
}
}
--
Gitblit v1.9.3