Merge commit '32c92f7ab9a14cac19aa285e481893a008fa486e' into zhangxueyang

Common/system/LatticeFileHelper.cs

         /// <param name="PDFPath">PDF文件位置</param>
         /// <param name="SavePath">保存文件位置 TPF</param>
         /// <param name="PrintResult">输出结果，非0为失败</param>
-        public static void GeneratingPDF(string PDFPath, string SavePath, out int PrintResult, int PointType = 0)
+        /// <param name="StandardError">错误信息</param>
+        /// <param name="StandardOutput">输出信息["1536.688.35.70","1536.688.35.71","1536.688.35.72"]</param>
+        /// <param name="PointType">0 为方点，1 为圆点 默认方点</param>
+        public static void GeneratingPDF(string PDFPath, string SavePath, out int PrintResult, out string StandardError, out string StandardOutput, int PointType = 0)
         {
             //XML点阵文件位置
             string XmlFile = FileToolsCommon.GetFileAbsolutePath("/LatticeXML/print_license.xml");
             PrintProcess.StartInfo.Arguments = ContentParameter;
             PrintProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             PrintProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
+            PrintProcess.StartInfo.RedirectStandardOutput = true;
             PrintProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
             PrintProcess.StartInfo.RedirectStandardInput = true;      //用于模拟该进程控制台的输入
             //外部程序(这里是FFMPEG)输出流时候产生的事件,这里是把流的处理过程转移到下面的方法中,详细请查阅MSDN
             PrintProcess.ErrorDataReceived += new DataReceivedEventHandler(Output);
             PrintProcess.Start();                 //启动线程
-            PrintProcess.BeginErrorReadLine();    //开始异步读取
             PrintProcess.WaitForExit();           //阻塞等待进程结束
+            StandardError = PrintProcess.StandardError.ReadToEnd();
+            StandardOutput = PrintProcess.StandardOutput.ReadToEnd();
+            //PrintProcess.BeginErrorReadLine();    //开始异步读取
+            Output("【制作点阵文件】错误：" + StandardError);
+            Output("【制作点阵文件】返回信息：" + StandardOutput);
             PrintResult = PrintProcess.ExitCode;     //打印结果 非0则为打印失败
             Output("【制作点阵文件】" + ContentParameter);//记录打印日志
             PrintProcess.Close();                 //关闭进程
         /// <param name="PrinterNum">打印份数</param>
         /// <param name="PrinterName">打印机名称</param>
         /// <param name="PrintResult">输出结果，非0为失败</param>
-        public static void PrinterTPFFile(string TPFPath, int PrinterNum, string PrinterName, out int PrintResult)
+        /// <param name="StandardError">错误信息</param>
+        /// <param name="StandardOutput">输出信息</param>
+        public static void PrinterTPFFile(string TPFPath, int PrinterNum, string PrinterName, out int PrintResult, out string StandardError, out string StandardOutput)
         {
+            TPFPath = TPFPath.Replace("/", "\\");
             //XML点阵文件位置
-            string XmlFile = FileToolsCommon.GetFileAbsolutePath("/LatticeXML/print_license.xml");
+            //string XmlFile = FileToolsCommon.GetFileAbsolutePath("/LatticeXML/print_license.xml");
             string ContentParameter = null;
-            ContentParameter = "-sMode=Print \"-sTPF =" + TPFPath + "\" \"-dCopy= " + PrinterNum + "\" \"-dPaperSize=9\" \"-sPrinter=" + PrinterName + "\"";//[-dPaperSize =] 
+            ContentParameter = " -sMode=Print \"-sTPF=" + TPFPath + "\" \"-sPrinter=" + PrinterName + "\" \"-dCopy=" + PrinterNum + "\"";//\"-dPaperSize=9\"
             #region 打印参数说明
             //-sMode = Print，参数如下：
             //PrintTool.exe - sMode = Print - sTPF = [-dCopy =][-dPaperSize =] - sPrinter =
             }
             PrintProcess = new Process();
             LogPath = CreateLog();
-            PrintProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath("/PrintTool/PrintTool.exe");   //绝对路径
+            PrintProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath("/PrintTool/PrintTool.exe").Replace("/", "\\"); ;   //绝对路径
             PrintProcess.StartInfo.Arguments = ContentParameter;
             PrintProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             PrintProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
             //外部程序(这里是FFMPEG)输出流时候产生的事件,这里是把流的处理过程转移到下面的方法中,详细请查阅MSDN
             PrintProcess.ErrorDataReceived += new DataReceivedEventHandler(Output);
             PrintProcess.Start();                 //启动线程
-            PrintProcess.BeginErrorReadLine();    //开始异步读取
+            //PrintProcess.BeginErrorReadLine();    //开始异步读取
             PrintProcess.WaitForExit();           //阻塞等待进程结束
+            StandardError = PrintProcess.StandardError.ReadToEnd();
+            StandardOutput = PrintProcess.StandardOutput.ReadToEnd();
+            Output("【制作点阵文件】错误：" + StandardError);
+            Output("【制作点阵文件】返回信息：" + StandardOutput);
             PrintResult = PrintProcess.ExitCode;     //打印结果 非0则为打印失败
             Output("【打印TPF文件】" + ContentParameter);//记录打印日志
             PrintProcess.Close();                 //关闭进程