From bee994dc073379cb7a295c70a0cce70487ae8567 Mon Sep 17 00:00:00 2001 From: sunliang <593170460@qq.com> Date: Tue, 22 Oct 2024 15:16:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E5=AE=A1=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=E4=B8=ADpdf=E6=96=87=E4=BB=B6=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=94=B9=E4=B8=BA=E6=B5=8F=E8=A7=88=E5=99=A8?= =?UTF-8?q?=E8=87=AA=E5=B8=A6=E6=89=93=E5=BC=80=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CCFlow/.vs/CCFlowCloud/v17/.suo | Bin 1584640 -> 1584640 bytes CCFlow/CCFlow/WF/CCForm/Ath.js | 6 ++- CCFlow/Components/BP.WF/Dev2Interface.cs | 19 +++++++--- CCFlow/Components/BP.WF/WF/ShiftWork.cs | 45 ++++++++++++++++++----- 4 files changed, 53 insertions(+), 17 deletions(-) diff --git a/CCFlow/.vs/CCFlowCloud/v17/.suo b/CCFlow/.vs/CCFlowCloud/v17/.suo index 907bd43db7b1835c6743cf3610cb2cb1aa18c933..b03f7c583e66a9a083b53020ad4547e74d42b0ce 100644 GIT binary patch delta 35111 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 diff --git a/CCFlow/CCFlow/WF/CCForm/Ath.js b/CCFlow/CCFlow/WF/CCForm/Ath.js index b808b618..a8ec93ef 100644 --- a/CCFlow/CCFlow/WF/CCForm/Ath.js +++ b/CCFlow/CCFlow/WF/CCForm/Ath.js @@ -884,6 +884,10 @@ function AthView(mypk, filePath) { var host = window.location.protocol + "//" + window.location.host; var url = host + filePath; + //pdf文件 + if (filePath.endsWith('.pdf')) { + window.open(url); + } //url = 'http://localhost:2296/DataUser/UploadFile/ND18201/838/6456dd46-04ec-4843-a057-31351053cd42.混合 - 副本.docx'; url = encodeURIComponent(base64Encode(url)); //debugger; @@ -900,7 +904,7 @@ function AthView(mypk, filePath) { return; } - window.open(fileServerHost + 'preview/onlinePreview?url=' + url); + window.open(fileServerHost + '/onlinePreview?url=' + url); return; } diff --git a/CCFlow/Components/BP.WF/Dev2Interface.cs b/CCFlow/Components/BP.WF/Dev2Interface.cs index 624e115d..8e79b7e4 100644 --- a/CCFlow/Components/BP.WF/Dev2Interface.cs +++ b/CCFlow/Components/BP.WF/Dev2Interface.cs @@ -6811,19 +6811,26 @@ namespace BP.WF string sql3 = "select WorkID,FK_Emp from WF_GenerWorkerlist where WorkID = '"+ workid + "' AND FK_Node = '"+ gwf.NodeID + "'"; DataTable dtNum = DBAccess.RunSQLReturnTable(sql3); string sql2 = ""; + //foreach (DataRow dr in dtNum.Rows) + //{ + // //流程调整前写入最新待办 调整节点@BKGY + // sql2 = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) "; + // sql2 += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + dr[1] + "','" + BP.WF.Dev2Interface.EmpWorksNums(dr[1].ToString()) + "','0',"+workid+")"; + // DBAccess.RunSQL(sql2); + //} + + //删除当前节点的d待办. + gwl.Delete(GenerWorkerListAttr.WorkID, workid, GenerWorkerListAttr.FK_Node, gwf.NodeID); + //删除要调整到的节点数据. + gwl.Delete(GenerWorkerListAttr.WorkID, workid, GenerWorkerListAttr.FK_Node, toNodeID); foreach (DataRow dr in dtNum.Rows) { //流程调整前写入最新待办 调整节点@BKGY sql2 = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) "; - sql2 += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + dr[1] + "','" + BP.WF.Dev2Interface.EmpWorksNums(dr[1].ToString()) + "','0',"+workid+")"; + sql2 += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + dr[1] + "','" + BP.WF.Dev2Interface.EmpWorksNums(dr[1].ToString()) + "','0'," + workid + ")"; DBAccess.RunSQL(sql2); } - //删除当前节点的d待办. - gwl.Delete(GenerWorkerListAttr.WorkID, workid, GenerWorkerListAttr.FK_Node, gwf.NodeID); - //删除要调整到的节点数据. - gwl.Delete(GenerWorkerListAttr.WorkID, workid, GenerWorkerListAttr.FK_Node, toNodeID); - //调整流程强制结束. GenerWorkFlows gwfs = new GenerWorkFlows(); diff --git a/CCFlow/Components/BP.WF/WF/ShiftWork.cs b/CCFlow/Components/BP.WF/WF/ShiftWork.cs index f02feca7..43f83a33 100644 --- a/CCFlow/Components/BP.WF/WF/ShiftWork.cs +++ b/CCFlow/Components/BP.WF/WF/ShiftWork.cs @@ -6,6 +6,7 @@ using BP.Port; using BP.DA; using BP.WF.Template; using System.Data; +using static iTextSharp.text.pdf.AcroFields; namespace BP.WF { @@ -108,22 +109,25 @@ namespace BP.WF item.ItIsRead = false; item.SDT = sdt; item.Insert(); //执行插入. + + //移交后写入最新待办,被移交人@BKGY + sql = ""; + sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) "; + sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + item.EmpNo + "','" + BP.WF.Dev2Interface.EmpWorksNums(item.EmpNo) + "','0'," + workID + ")"; + DBAccess.RunSQL(sql); + break; } } #endregion 判断是否是,admin的移交. - //移交后写入最新待办,被移交人@BKGY - sql = ""; - sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) "; - sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + emp.No + "','" + BP.WF.Dev2Interface.EmpWorksNums(emp.UserID) + "','0',"+ workID + ")"; - DBAccess.RunSQL(sql); + //移交后写入最新待办,移交人@BKGY sql = ""; sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) "; - sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + WebUser.No + "','" + BP.WF.Dev2Interface.Todolist_EmpWorks + "','0',"+ workID + ")"; + sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + WebUser.No + "','" + BP.WF.Dev2Interface.Todolist_EmpWorks + "','0'," + workID + ")"; DBAccess.RunSQL(sql); //记录日志. Glo.AddToTrack(ActionType.Shift, nd.FlowNo, workID, gwf.FID, nd.NodeID, nd.Name, @@ -149,11 +153,22 @@ namespace BP.WF //非协作模式. gwl = new GenerWorkerList(); i = gwl.Retrieve(GenerWorkerListAttr.FK_Node, gwf.NodeID, GenerWorkerListAttr.WorkID, gwf.WorkID); + string sql2 = ""; if (i == 1) { string sql = "UPDATE WF_GenerWorkerlist SET IsRead=0, FK_Emp='" + emp.UserID + "', EmpName='" + emp.Name + "' WHERE FK_Emp='" + gwl.EmpNo + "' AND FK_Node=" + gwf.NodeID + " AND WorkID=" + workID; DBAccess.RunSQL(sql); + + //移交后写入最新待办,被移交人@BKGY + sql2 = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) "; + sql2 += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + gwl.GetValStrByKey("FK_Emp") + "','" + BP.WF.Dev2Interface.EmpWorksNums(gwl.GetValStrByKey("FK_Emp")) + "','0'," + workID + ")"; + DBAccess.RunSQL(sql2); } else { gwl.Delete(GenerWorkerListAttr.WorkID, gwf.WorkID, GenerWorkerListAttr.FK_Node, gwf.NodeID); + //移交后写入最新待办,被移交人@BKGY + sql2 = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) "; + sql2 += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + gwl.GetValStrByKey("FK_Emp") + "','" + BP.WF.Dev2Interface.EmpWorksNums(gwl.GetValStrByKey("FK_Emp")) + "','0'," + workID + ")"; + DBAccess.RunSQL(sql2); + gwl.EmpNo = emp.UserID; gwl.EmpName = emp.Name; gwl.ItIsEnable = true; @@ -165,6 +180,10 @@ namespace BP.WF gwf.TodoEmpsNum = 1; gwf.TodoEmps = gwf.TodoEmps.Replace(WebUser.No + "," + WebUser.Name + ";", "") + emp.UserID + "," + emp.Name + ";"; gwf.Update(); + //移交后写入最新待办,被移交人@BKGY + sql2 = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) "; + sql2 += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + WebUser.No + "','" + BP.WF.Dev2Interface.EmpWorksNums(WebUser.No) + "','0'," + workID + ")"; + DBAccess.RunSQL(sql2); //记录日志. Glo.AddToTrack(ActionType.Shift, nd.FlowNo, workID, gwf.FID, nd.NodeID, nd.Name, @@ -279,10 +298,10 @@ namespace BP.WF info += "@" + ExecEvent.DoNode(EventListNode.ShitAfter, nd, work, null, atPara1); //移交后写入最新待办 被移交人@BKGY - string sql2 = ""; - sql2 = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) "; - sql2 += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + emp.UserID + "','" + BP.WF.Dev2Interface.EmpWorksNums(emp.UserID) + "','0',"+ workID + ")"; - DBAccess.RunSQL(sql2); + string sql3 = ""; + sql3 = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) "; + sql3 += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + emp.UserID + "','" + BP.WF.Dev2Interface.EmpWorksNums(emp.UserID) + "','0',"+ workID + ")"; + DBAccess.RunSQL(sql3); //处理移交后发送的消息事件,发送消息. PushMsgs pms1 = new PushMsgs(); @@ -302,6 +321,12 @@ namespace BP.WF gwl.PassInt = 0; gwl.SDT = sdt; gwl.Insert(); + + //移交后写入最新待办 被移交人@BKGY + string sql2 = ""; + sql2 = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) "; + sql2 += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + emp.UserID + "','" + BP.WF.Dev2Interface.EmpWorksNums(emp.UserID) + "','0'," + workID + ")"; + DBAccess.RunSQL(sql2); } //重新查询.