patrick.xu
2021-03-10 990445751e7e7f65521d0413b7de4dc607e76e14
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;