sunliang
/
DAYE_RDMS_CCFLOW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改打印时AS元素显示ASYS问题，开发者表单生成word名称未时间问题

Browse Source
master
孙亮 9 months ago
parent d734a4fb6e
commit 46de7a7f8a
2 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File

43
CCFlow/Components/BP.En30/Pub/Engine.cs
Unescape Escape View File

@ -17,6 +17,7 @@ using System.Linq;
using System.Collections.Generic; using System.Collections.Generic;
using Spire.Doc.Documents; using Spire.Doc.Documents;
using NPOI.SS.Formula.Functions; using NPOI.SS.Formula.Functions;
using System.Diagnostics;
namespace BP.Pub namespace BP.Pub
@ -1331,6 +1332,16 @@ trgaph108\trleft5\trbrdrl\brdrs\brdrw10 \trbrdrt\brdrs\brdrw10 \trbrdrr\brdrs\br
docs.Paragraphs[1].Range.Delete(); docs.Paragraphs[1].Range.Delete();
docs.SaveAs2(path); docs.SaveAs2(path);
docs.Close(); docs.Close();
Process[] current = Process.GetProcesses();
//遍历与当前进程名称相同的进程列表
foreach (Process process in current)
{
//如果实例已经存在则kill当前进程
if (process.ProcessName.ToUpper().Equals("WINWORD"))
{
process.Kill(); break;
}
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -1454,7 +1465,14 @@ trgaph108\trleft5\trbrdrl\brdrs\brdrw10 \trbrdrt\brdrs\brdrw10 \trbrdrr\brdrs\br
string name = D3.Split(',')[i].ToString(); string name = D3.Split(',')[i].ToString();
if (name.Length > 1) if (name.Length > 1)
{ {
name=name.Substring(0, 1).ToUpper() + name.Substring(1).ToLower(); if (name == "ASYS")
{
name = "As";
}
else
{
name = name.Substring(0, 1).ToUpper() + name.Substring(1).ToLower();//将元素改成首位大写次位小写
}
} }
//如果都没有值择把这个元素移除 //如果都没有值择把这个元素移除
@ -1670,6 +1688,11 @@ trgaph108\trleft5\trbrdrl\brdrs\brdrw10 \trbrdrt\brdrs\brdrw10 \trbrdrr\brdrs\br
sql += "and " + D1 + "='" + D1date.Split(',')[j] + "'"; sql += "and " + D1 + "='" + D1date.Split(',')[j] + "'";
} }
string named3 = D3date.Split(',')[d3Knum].ToString(); string named3 = D3date.Split(',')[d3Knum].ToString();
//取数据时再将As转回未ASYS否则取不到数据
if (named3=="As")
{
named3 = "ASYS";
}
int ss = data.Select(sql).Count(); int ss = data.Select(sql).Count();
string ds = data.Select(sql)[0][named3].ToString(); string ds = data.Select(sql)[0][named3].ToString();
//if (string.IsNullOrEmpty(ds)) //if (string.IsNullOrEmpty(ds))
@ -1697,7 +1720,13 @@ trgaph108\trleft5\trbrdrl\brdrs\brdrw10 \trbrdrt\brdrs\brdrw10 \trbrdrr\brdrs\br
{ {
sql += "and " + D1 + "='" + D1date.Split(',')[j] + "'"; sql += "and " + D1 + "='" + D1date.Split(',')[j] + "'";
} }
string ds = data.Select(sql)[0][D3date.Split(',')[d3Knum].ToString()].ToString(); string named3 = D3date.Split(',')[d3Knum].ToString();
//取数据时再将As转回未ASYS否则取不到数据
if (named3 == "As")
{
named3 = "ASYS";
}
string ds = data.Select(sql)[0][named3].ToString();
//if (string.IsNullOrEmpty(ds)) //if (string.IsNullOrEmpty(ds))
//{ //{
// ds = "W"; // ds = "W";
@ -1735,6 +1764,16 @@ trgaph108\trleft5\trbrdrl\brdrs\brdrw10 \trbrdrt\brdrs\brdrw10 \trbrdrr\brdrs\br
docs.Paragraphs[1].Range.Delete(); docs.Paragraphs[1].Range.Delete();
docs.SaveAs2(path); docs.SaveAs2(path);
docs.Close(); docs.Close();
Process[] current = Process.GetProcesses();
//遍历与当前进程名称相同的进程列表
foreach (Process process in current)
{
//如果实例已经存在则kill当前进程
if (process.ProcessName.ToUpper().Equals("WINWORD"))
{
process.Kill(); break;
}
}
} }
catch (Exception ex) catch (Exception ex)
{ {

16
CCFlow/Components/BP.WF/HttpHandler/WF_WorkOpt.cs
Unescape Escape View File

@ -425,7 +425,6 @@ namespace BP.WF.HttpHandler
return PrintDoc_ChapterFormDoneIt(nd, workID, pkval, formID, func, wk, mapData); return PrintDoc_ChapterFormDoneIt(nd, workID, pkval, formID, func, wk, mapData);
} }
string file = DateTime.Now.Year + "_" + WebUser.DeptNo + "_" + func.MyPK + "_" + WorkID + ".doc"; string file = DateTime.Now.Year + "_" + WebUser.DeptNo + "_" + func.MyPK + "_" + WorkID + ".doc";
string tempFile = func.TempFilePath; string tempFile = func.TempFilePath;
if (tempFile.Contains(".rtf") == false) if (tempFile.Contains(".rtf") == false)
tempFile = tempFile + ".rtf"; tempFile = tempFile + ".rtf";
@ -557,13 +556,19 @@ namespace BP.WF.HttpHandler
} }
paths = file.Split('_'); paths = file.Split('_');
//paths = file;
path = paths[0] + "/" + paths[1] + "/" + paths[2] + "/"; path = paths[0] + "/" + paths[1] + "/" + paths[2] + "/";
string fileModelT = "rtf"; string fileModelT = "rtf";
if ((int)func.TemplateFileModel == 1) if ((int)func.TemplateFileModel == 1)
fileModelT = "word"; fileModelT = "word";
#region BKGY替换word名称 20231026 sunliang
string billUrl = "file@" + fileModelT + "@" + BP.WF.Glo.CCFlowAppPath + "DataUser/Bill/" + path + file; string sql = "select TITLE from WF_GENERWORKFLOW where workid='" + WorkID + "'";
string name = DBAccess.RunSQLReturnString(sql);
var s = name.Split('_');
string da = s[0].ToString().Replace("#", "号") + ".doc";
#endregion
//string billUrl = "file@" + fileModelT + "@" + BP.WF.Glo.CCFlowAppPath + "DataUser/Bill/" + path + file;
string billUrl = "file@" + fileModelT + "@" + BP.WF.Glo.CCFlowAppPath + "DataUser/Bill/" + path + da;
if (func.HisPrintFileType == PrintFileType.PDF) if (func.HisPrintFileType == PrintFileType.PDF)
billUrl = billUrl.Replace(".doc", ".pdf"); billUrl = billUrl.Replace(".doc", ".pdf");
@ -578,7 +583,8 @@ namespace BP.WF.HttpHandler
//用于扫描打印. //用于扫描打印.
string qrUrl = SystemConfig.HostURL + "WF/WorkOpt/PrintDocQRGuide.htm?MyPK=" + func.MyPK; string qrUrl = SystemConfig.HostURL + "WF/WorkOpt/PrintDocQRGuide.htm?MyPK=" + func.MyPK;
rtf.MakeDoc(tempFile, path, file, qrUrl); rtf.MakeDoc(tempFile, path, da, qrUrl);
//rtf.MakeDoc(tempFile, path, file, qrUrl);
#endregion #endregion
#region 转化成pdf. #region 转化成pdf.

Write Preview
Loading…
Cancel
Save