From aefe9f2572eac7c61f6d2952593ec18a700dfcf0 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期二, 01 六月 2021 11:43:19 +0800
Subject: [PATCH] 1. 上传数据线程部分修改，界面关闭时退出所有相关线程
---
SizeDetection.cs | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/SizeDetection.cs b/SizeDetection.cs
index 5656971..2f5f8cb 100644
--- a/SizeDetection.cs
+++ b/SizeDetection.cs
@@ -334,6 +334,10 @@
btyLength += compL;
btyWidth += compW;
+ //闄愬埗绮惧害5浣�
+ btyLength = Math.Round(btyLength, 5);
+ btyWidth = Math.Round(btyWidth, 5);
+
lengthMeasureState = (btyLength >= opcConfig.batteryLengthLimit.Min && btyLength <= opcConfig.batteryLengthLimit.Max) ? MeasureState.OK : MeasureState.NG;
widthMeasureState = (btyWidth >= opcConfig.batteryWidthLimit.Min && btyWidth <= opcConfig.batteryWidthLimit.Max) ? MeasureState.OK : MeasureState.NG;
@@ -652,6 +656,15 @@
{
GregorianCalendar gc = new GregorianCalendar();
int weekOfYear = gc.GetWeekOfYear(dt, CalendarWeekRule.FirstDay, DayOfWeek.Monday);
+
+ var weekPlusStr = ConfigurationManager.AppSettings["WeekPlus"];
+ int weekPlus = 0;
+ if (!int.TryParse(weekPlusStr, out weekPlus))
+ {
+ weekPlus = 0;
+ }
+ weekOfYear += weekPlus;
+
string week = weekOfYear.ToString().Length == 1 ? "0" + weekOfYear.ToString() : weekOfYear.ToString();
string year = dt.Year.ToString().Substring(dt.Year.ToString().Length - 1, 1);
return year + week;
--
Gitblit v1.8.0