Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-client

# Conflicts:
#	shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs

shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs

@@ -429,15 +429,25 @@ namespace XGLFinishPro.Views
                     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();
+                    }
+                }
+                    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;
@@ -478,8 +488,6 @@ namespace XGLFinishPro.Views
             {
 
             }
-
-
         }
 
         private void btnCheckLog_Click(object sender, RoutedEventArgs e)