diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index c1ac16c..528000b 100644
Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ
diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
index 5560c15..214e5a1 100644
--- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
+++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
@@ -424,14 +424,22 @@ namespace XGLFinishPro.Views
                 DataTable dtNewReportCode = formingMachineService.GetReportCode();
                 if (dtNewReportCode == null || dtNewReportCode.Rows.Count == 0)
                 {
-                    newReportCode = (Convert.ToInt64(dtNewReportCode.Rows[0]["report_code"].ToString()) + 1).ToString();
+                    newReportCode = DateTime.Now.ToString("yyyyMMdd") + "0001";
+                }
+                else
+                {
+                    if (string.IsNullOrEmpty(dtNewReportCode.Rows[0]["report_code"].ToString()))
+                    {
+                        newReportCode = DateTime.Now.ToString("yyyyMMdd") + "0001";
+                    }
+                    else
+                    {
+                        newReportCode = (Convert.ToInt64(dtNewReportCode.Rows[0]["report_code"].ToString()) + 1).ToString();
+                    }
                 }
 
                 ExecReportWorkWin execReport = new ExecReportWorkWin(selectedRow["workorder_code"].ToString(), selectedRow["quantity_split"].ToString());
 
-
-
-
                 if (execReport.ShowDialog() == true)
                 {
                     string workTime = execReport._workTime;
@@ -472,8 +480,6 @@ namespace XGLFinishPro.Views
             {
 
             }
-
-
         }
 
         private void btnCheckLog_Click(object sender, RoutedEventArgs e)