修改校验日期

UAS-出货标签管理(泽天)/UAS_出货标签管理.cs

@@ -380,7 +380,7 @@ namespace UAS_LabelMachine
                 string Year1 = datecod1.Substring(0, 2);
                 System.DateTime dt2 = new DateTime(int.Parse("20" + Year1), 01, 01);
                 string Week1 = datecod1.Substring(2, 2);
-                System.DateTime dt3 = dt2.AddDays(int.Parse(Week1) * 7);
+                System.DateTime dt3 = dt2.AddDays(int.Parse(Week1) * 7 + 7);
                 //当前扫码的年周
                 if (dt1 > dt3)
                 {
@@ -1629,8 +1629,8 @@ namespace UAS_LabelMachine
                 BaseUtil.SetFormCenter(stw);
                 stw.ShowDialog();
                 Input.Focus();
-                if(AutoAfterPrint.Checked)
-                OutBoxNum.Text = "新增";
+                if (AutoAfterPrint.Checked)
+                    OutBoxNum.Text = "新增";
             }
             else
                 MessageBox.Show("未维护外箱标签", "提示");
@@ -2250,13 +2250,13 @@ namespace UAS_LabelMachine
                 string Year = DateCode.Substring(0, 2);
                 System.DateTime dt = new DateTime(int.Parse("20" + Year), 01, 01);
                 string Week = DateCode.Substring(2, 2);
-                System.DateTime dt1 = dt.AddDays(int.Parse(Week) * 7);
+                System.DateTime dt1 = dt.AddDays((int.Parse(Week) -1)* 7);
 
                 //减去DC校验后的日期
                 System.DateTime now = System.DateTime.Now;
                 System.DateTime now1 = now.AddDays(-int.Parse(DCCheck.Text));
                 //物料的DateCode大于限制日期即可
-                if (dt1 > now1&& dt1< now)
+                if (dt1 > now1 && dt1 < now)
                 {
                     return true;
                 }