From bd5297c64f39c360a7bf41435a88ae5e70840fc2 Mon Sep 17 00:00:00 2001
From: jace.tang <1536884497@qq.com>
Date: 星期二, 14 六月 2022 14:28:54 +0800
Subject: [PATCH] merge
---
DetectionData.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/DetectionData.cs b/DetectionData.cs
index 2544663..ec0f301 100644
--- a/DetectionData.cs
+++ b/DetectionData.cs
@@ -6,6 +6,8 @@
using System.Text;
using System.Windows.Forms;
using System.Drawing;
+using System.Diagnostics;
+using System.Collections.Generic;
namespace M423project
{
@@ -148,7 +150,8 @@
#region add by Patrick 2018-07-13
public void SaveTrayBarcode(int detectID)
{
- string trayCode = CarrierBarcodeCtrl.GlobalCarrierBarcode;
+ string trayCode = "";
+ trayCode = CarrierBarcodeCtrl.GlobalCarrierBarcode;
if (string.IsNullOrEmpty(trayCode))
{
@@ -163,6 +166,41 @@
using (SqlCommand cmd = new SqlCommand(sql, connection))
{
cmd.ExecuteNonQuery();
+ }
+ }
+ }
+
+ public void SaveTrayBarcode(List<int> detectIDList, string carrierCode = null)
+ {
+ //string trayCode = CarrierBarcodeCtrl.GlobalCarrierBarcode;
+
+ if (carrierCode == null)
+ {
+ carrierCode = CarrierBarcodeCtrl.GlobalCarrierBarcode;
+ }
+
+ if (detectIDList.Count == 0)
+ {
+ return;
+ }
+ lock (synObj)
+ {
+ string idList = string.Join(",", detectIDList);
+ try
+ {
+ string sql = $"Update ProductDetectionDetail set CarrierBarcode='{carrierCode}' where AutoID in ({idList})";
+
+ using (SqlCommand cmd = new SqlCommand(sql, connection))
+ {
+ cmd.ExecuteNonQuery();
+ }
+
+ Trace.TraceInformation($"{idList}浜у搧缁戝畾杞藉叿鐮侊細{carrierCode}");
+ }
+ catch (Exception ex)
+ {
+ Trace.TraceError($"{idList}浜у搧缁戝畾杞藉叿鐮侊細{carrierCode}寮傚父锛歿ex.Message}");
+ //throw;
}
}
}
@@ -284,8 +322,14 @@
public void SaveToCsv(ProductMeasureResult pmr)
{
string fileName = @"E:\DailyReport\detectdata" + DateTime.Now.ToString("yyyyMMdd") + ".csv";
- bool IsNewFile = !File.Exists(fileName);
+ CSVDataRecord(pmr, fileName);
+
+ }
+
+ public void CSVDataRecord(ProductMeasureResult pmr, string fileName)
+ {
+ bool IsNewFile = !File.Exists(fileName);
lock (csvLock)
{
using (FileStream myStream = new FileStream(fileName, FileMode.OpenOrCreate))
--
Gitblit v1.8.0