|
|
@@ -68,7 +68,7 @@ namespace UAS_LabelMachine.PublicMethod
|
|
|
string Year = Data.Substring(0, 1);
|
|
|
string Week = Data.Substring(1, 2);
|
|
|
DateTime DateBegin = DateTime.Now;
|
|
|
- GetDaysOfWeeks(int.Parse("201" + Year), int.Parse(Week), out DateBegin);
|
|
|
+ GetDaysOfWeeks(int.Parse("202" + Year), int.Parse(Week), out DateBegin);
|
|
|
ReturnData = DateBegin.ToString("yyyyMMdd");
|
|
|
}
|
|
|
break;
|
|
|
@@ -103,7 +103,8 @@ namespace UAS_LabelMachine.PublicMethod
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- first = startDay.AddDays((7 - dayOfWeek) + (index - 1) * 7); //index周的起始日期
|
|
|
+ first = startDay.AddDays((7 - dayOfWeek) + (index - 2) * 7); //index周的起始日期
|
|
|
+
|
|
|
}
|
|
|
if (first > endDay) //startDayOfWeeks不在该年范围内
|
|
|
{
|