新增点击按钮跳转工艺路径页面,去掉工艺卡隐藏时生成的节点标题,增加创建工艺卡时引用冶金规范成功提示

master
孙亮 3 months ago
parent 05594749c7
commit f5c0aafc8f

@ -216,14 +216,12 @@ function GongCheng() {
//TB_BeiZhu //TB_BeiZhu
var W = document.body.clientWidth - 150; var W = document.body.clientWidth - 150;
//WinOpenIt('https://craft.dayesteel.com.cn:9001/AProcessCard/RoutingPaths'); //WinOpenIt('https://craft.dayesteel.com.cn:9001/AProcessCard/RoutingPaths');
OpenBootStrapModal('https://craft.dayesteel.com.cn:9001/AProcessCard/RoutingPaths', "eudlgframe", "工艺路线", W, 600, "icon-edit", false); OpenModal('https://craft.dayesteel.com.cn:9001/AProcessCard/RoutingPaths', "GCdlgframe", "工艺路线", W, 600, "icon-edit", false);
window.addEventListener('message', function (e) { window.addEventListener('message', function (e) {
if (e.data) { if (e.data) {
//document.getElementById('TB_BeiZhu').innerHTML(e.data); document.getElementById('TB_PROCESS_ROUTE').value = e.data;
document.getElementById('TB_PROCESS_ROUTE').innerHTML(e.data);
} }
}) })
// alert("11");
} }
function WinOpenIt(url) { function WinOpenIt(url) {
@ -235,4 +233,126 @@ function WinOpenIt(url) {
InitHomeCount(); InitHomeCount();
} }
}, 1); }, 1);
} }
function OpenModal(url, iframeId, dlgTitle, dlgWidth, dlgHeight, dlgIcon, showBtns, okBtnFunc, okBtnFuncArgs, dlgClosedFunc, divId, closeBtnColor, showCloseBtn) {
///<summary>使用EasyUiDialog打开一个页面</summary>
///<param name="url" type="String">页面链接</param>
///<param name="iframeId" type="String">嵌套url页面的iframe的id在okBtnFunc中可以通过document.getElementById('eudlgframe').contentWindow获取该页面然后直接调用该页面的方法比如获取选中值</param>
///<param name="dlgTitle" type="String">Dialog标题</param>
///<param name="dlgWidth" type="int">Dialog宽度</param>
///<param name="dlgHeight" type="int">Dialog高度</param>
///<param name="dlgIcon" type="String">Dialog图标必须是一个样式class</param>
///<param name="showBtns" type="Boolean">Dialog下方是否显示“确定”“取消”按钮如果显示则后面的okBtnFunc参数要填写</param>
///<param name="okBtnFunc" type="Function">点击“确定”按钮调用的方法</param>
///<param name="okBtnFuncArgs" type="Object">okBtnFunc方法使用的参数</param>
///<param name="dlgClosedFunc" type="Function">窗体关闭调用的方法注意此方法中不能再调用dialog中页面的内容</param>
///<param name="showCloseBtn" type="Boolean">是否显示关闭按钮</param>
var dlg = $('#bootStrapdlg');
var isTheFirst;
if (divId != null && divId != "")
dlg = $('#' + divId);
if (dlg.length == 0) {
isTheFirst = true;
var divDom = $("<div class='modal fade' data-backdrop='static'></div>");
//divDom.attr("id", "bootStrapdlg");
if (divId != null && divId != "")
divDom.attr("id", divId);
else
divDom.attr("id", "bootStrapdlg");
$(document.body).append(divDom);
if (divId != null && divId != "")
dlg = $('#' + divId);
else
dlg = $('#bootStrapdlg');
}
if (dlg.length == 1) {
dlg.children().remove();
dlg.empty();
dlg.html("");
}
var modalDialog = $("<div class='modal-dialog'></div>");
modalDialog.width(dlgWidth).height(dlgHeight);
//容器
var modalContent = $("<div class='modal-content' style='border-radius:0px;text-align:left;'></div>");
modalDialog.append(modalContent);
//标题
var modalHead = $("<div class='modal-header' style='padding: 5px;background-color:#1d7dd4'></div>");
if (showCloseBtn == null)
showCloseBtn = true;
//关闭按钮
if (showCloseBtn == true)
var btnClose = $("<button type='button' id='closeModal' style='color:white;font-size: 16px;float: right;background: transparent;border: none;' data-dismiss='modal' aria-hidden='true'>关闭</button>");
if (closeBtnColor && closeBtnColor != "")
btnClose = $("<button type='button' id='closeModal' style='color:black;float: right;background: transparent;border: none;' data-dismiss='modal' aria-hidden='true'>X</button>");
//标题
var titleHead = $("<h4 class='modal-title' style='color:white;'></h4>");
titleHead.text(dlgTitle);
modalHead.append(btnClose);
modalHead.append(titleHead);
//添加标题块
modalContent.append(modalHead);
//body块
var modalBody = $("<div class='modal-body' style='margin:5px;padding:0px;text-align:center'></div>");
var iframeWidth = dlgWidth - 45;
var iFrame = $("<iframe></iframe>");
iFrame.attr("id", iframeId);
iFrame.attr("name", iframeId);
iFrame.attr("src", url);
iFrame.attr("src", url);
iFrame.css("width", iframeWidth + "px").css("height", dlgHeight + "px").css("border", "0px");
modalBody.append(iFrame);
//添加内容块
modalContent.append(modalBody);
//结束
dlg.append(modalDialog);
if (showBtns && okBtnFunc) {
var modalFooter = $("<div class='modal-footer'></div>");
var footerClose = $("<button type='button' class='btn' data-dismiss='modal'>关闭</button>");
footerClose.click(function () {
dlg.modal('hide');
});
var footerOK = $("<button type='button' class='btn'>确定</button>");
footerOK.click(function () {
if (okBtnFunc(okBtnFuncArgs) == false) {
return;
}
dlg.modal('hide');
});
//添加确定和关闭按钮
modalFooter.append(footerOK);
modalFooter.append(footerClose);
//添加底层脚本
modalContent.append(modalFooter);
}
//关闭事件
dlg.off('hide.bs.modal');
dlg.on('hide.bs.modal', function () {
/*防止缓存,切换页面不能显示问题*/
dlg.remove();
// 关闭时清空edit状态为add
dlg.find("iframe").attr('src', '');
if (dlgClosedFunc) {
dlgClosedFunc();
}
});
dlg.modal().show();
return "bootStrapdlg";
}

@ -40,7 +40,14 @@
<script src="../../WF/Portal/layui-v2.9.6/layui.js" type="text/javascript"></script> <script src="../../WF/Portal/layui-v2.9.6/layui.js" type="text/javascript"></script>
<script src="../../DataUser/JSLibData/CCFormRef.js" type="text/javascript"></script> <script src="../../DataUser/JSLibData/CCFormRef.js" type="text/javascript"></script>
<script type="text/javascript" src="../Scripts/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../Scripts/bootstrap/BootstrapUIDialog.js"></script> <script type="text/javascript" src="../Scripts/bootstrap/BootstrapUIDialog.js"></script>
<link href="../Scripts/bootstrap/css/bootstrap.css" rel="stylesheet" />
<script type="text/javascript" src="../Scripts/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../Scripts/bootstrap/BootstrapUIDialog.js"></script>
<link href="../Scripts/bootstrap/css/bootstrap.css" rel="stylesheet" />
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
var frmID = null; var frmID = null;
var oid = null; var oid = null;
@ -756,7 +763,7 @@
function analysis(Tip) { function analysis(Tip) {
let tipArr = Tip.split("@"); let tipArr = Tip.split("@");
let tempul = `<ul class="tipsul"> let tempul = `<ul class="tipsul">
${tipArr.map(item => { ${tipArr.map(item => {
if (item.includes('###')) { if (item.includes('###')) {
return `<li class="m-1"><h3>${item.split("###").join('')}</h3></li>` return `<li class="m-1"><h3>${item.split("###").join('')}</h3></li>`
} else if (item.includes(')')) { } else if (item.includes(')')) {
@ -766,7 +773,7 @@
} }
}).join('')} }).join('')}
</ul>` </ul>`
Tip = tempul; Tip = tempul;
return Tip; return Tip;
} }

@ -461,6 +461,10 @@ function FullCtrl(selectVal, ctrlIdBefore, mapExt, oid) {
if (ctrlIdBefore.indexOf('DDL_') > 1) { if (ctrlIdBefore.indexOf('DDL_') > 1) {
beforeID = ctrlIdBefore.substring(0, ctrlIdBefore.indexOf('DDL_')); beforeID = ctrlIdBefore.substring(0, ctrlIdBefore.indexOf('DDL_'));
endId = ctrlIdBefore.substring(ctrlIdBefore.lastIndexOf('_')); endId = ctrlIdBefore.substring(ctrlIdBefore.lastIndexOf('_'));
}
if (ctrlIdBefore.indexOf('Btn_') != -1) {
beforeID = ctrlIdBefore.substring(0, ctrlIdBefore.indexOf('Btn_'));
endId = ctrlIdBefore.substring(ctrlIdBefore.lastIndexOf('_') + 1);
} else { } else {
beforeID = ctrlIdBefore.substring(0, ctrlIdBefore.indexOf('TB_')); beforeID = ctrlIdBefore.substring(0, ctrlIdBefore.indexOf('TB_'));
endId = ctrlIdBefore.substring(ctrlIdBefore.lastIndexOf('_')); endId = ctrlIdBefore.substring(ctrlIdBefore.lastIndexOf('_'));
@ -485,6 +489,7 @@ function FullCtrl(selectVal, ctrlIdBefore, mapExt, oid) {
} else { } else {
dataObj = GetDataTableByDB(dbSrc, mapExt.DBType, mapExt.FK_DBSrc, selectVal, mapExt, "Doc"); dataObj = GetDataTableByDB(dbSrc, mapExt.DBType, mapExt.FK_DBSrc, selectVal, mapExt, "Doc");
} }
TableFullCtrl(dataObj, ctrlIdBefore, beforeID, endId, mapExt); TableFullCtrl(dataObj, ctrlIdBefore, beforeID, endId, mapExt);
//如果含有FullDataDtl也需要处理 //如果含有FullDataDtl也需要处理
@ -638,6 +643,15 @@ function TableFullCtrl(dataObj, ctrlIdBefore, beforeID, endId, mapExt) {
en.Update(); en.Update();
} }
} }
for (var i = 0; i < frmMapAttrs.length; i++) {
var item = frmMapAttrs[i];
var keyOfEn = item.KeyOfEn;
if (keyOfEn == endId) {
alert(item.Name + '填充成功!');
}
}
} }
/**填充下拉框信息**/ /**填充下拉框信息**/
@ -747,6 +761,14 @@ function FullDtl(selectVal, mapExt, oid) {
} }
}) })
for (var i = 0; i < frmMapAttrs.length; i++) {
var item = frmMapAttrs[i];
var keyOfEn = item.KeyOfEn;
if (keyOfEn == mapExt.AttrOfOper) {
alert(item.Name + '填充成功!');
}
}
} }
} }

@ -68,7 +68,19 @@
data = data.replace('url@', ''); data = data.replace('url@', '');
if (data.indexOf('rtf@') != -1) { if (data.indexOf('rtf@') != -1) {
window.location.href = filterXSS(data).replace('rtf@', ''); //window.location.href = filterXSS(data).replace('rtf@', '');
data = filterXSS(data).replace('rtf@', '');
if (data.lastIndexOf('/') == -1) {
data = ReplaceName(data);
window.location.href = filterXSS(data);
}
var filePath = data.substring(0, data.lastIndexOf('/') + 1);
var fileName = data.substring(data.lastIndexOf('/') + 1);
fileName = ReplaceName(fileName);
data = filePath + fileName;
window.location.href = filterXSS(data);
return; return;
} else { } else {
data = data.replace('word@', ''); data = data.replace('word@', '');

@ -6813,8 +6813,8 @@ namespace BP.WF
foreach (DataRow dr in dtNum.Rows) foreach (DataRow dr in dtNum.Rows)
{ {
//流程调整前写入最新待办 调整节点@BKGY //流程调整前写入最新待办 调整节点@BKGY
sql2 = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql2 += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + dr[1] + "','" + BP.WF.Dev2Interface.EmpWorksNums(dr[1].ToString()) + "','0',"+workid+")";
DBAccess.RunSQL(sql2); DBAccess.RunSQL(sql2);
} }
@ -6850,8 +6850,8 @@ namespace BP.WF
gwl.Insert(); gwl.Insert();
//调整后写入最新待办,被调整人@BKGY //调整后写入最新待办,被调整人@BKGY
sql2 = ""; sql2 = "";
sql2 = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql2 += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + emp.UserID + "','" + BP.WF.Dev2Interface.EmpWorksNums(emp.UserID) + "','0',"+ workid + ")";
DBAccess.RunSQL(sql2); DBAccess.RunSQL(sql2);
@ -10922,14 +10922,14 @@ namespace BP.WF
//退回后写入最新待办@BKGY //退回后写入最新待办@BKGY
sql = ""; sql = "";
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + WebUser.No + "','" + BP.WF.Dev2Interface.Todolist_EmpWorks + "','0',"+ workID + ")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);
//退回给XX刷新@BKGY //退回给XX刷新@BKGY
sql = ""; sql = "";
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) ";
sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + returnToEmp + "','" + BP.WF.Dev2Interface.EmpWorksNums(returnToEmp) + "','0')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + returnToEmp + "','" + BP.WF.Dev2Interface.EmpWorksNums(returnToEmp) + "','0',"+ workID + ")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);
return "已经退回给父流程“" + gwfP.FlowName + "”节点“" + gwfP.NodeName + "”,退回给“" + toEmp.Name + "”"; return "已经退回给父流程“" + gwfP.FlowName + "”节点“" + gwfP.NodeName + "”,退回给“" + toEmp.Name + "”";
@ -10965,14 +10965,14 @@ namespace BP.WF
throw new Exception("err@退回出现系统错误,请联系管理员或者在执行一次退回.WorkID=" + workID); throw new Exception("err@退回出现系统错误,请联系管理员或者在执行一次退回.WorkID=" + workID);
} }
sql = ""; sql = "";
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EMPWORKSNUMS,FLAG) "; 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')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'"+WebUser.No+"','"+BP.WF.Dev2Interface.Todolist_EmpWorks+"','0',"+ gwf.WorkID + ")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);
//退回给XX刷新 //退回给XX刷新
sql = ""; sql = "";
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) ";
sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + wr.ReturnToEmp + "','" + BP.WF.Dev2Interface.EmpWorksNums(wr.ReturnToEmp) + "','0')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + wr.ReturnToEmp + "','" + BP.WF.Dev2Interface.EmpWorksNums(wr.ReturnToEmp) + "','0',"+ gwf.WorkID + ")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);
return info; return info;

@ -1037,7 +1037,17 @@ namespace BP.WF.HttpHandler
idx++; idx++;
if (rtfStr.Contains("<Group." + gf.OID + ">") == true) if (rtfStr.Contains("<Group." + gf.OID + ">") == true)
{ {
rtfStr = rtfStr.Replace("<Group." + gf.OID + ">", parentIdx + "." + idx.ToString() + rtf.GetCode(gf.Lab)); MapData mapdata = new MapData(gf.FrmID);
if (!(mapdata.Name.LastIndexOf("工艺卡") > 0))
{
rtfStr = rtfStr.Replace("<Group." + gf.OID + ">", parentIdx + "." + idx.ToString() + rtf.GetCode(gf.Lab));
}
else
{
rtfStr = rtfStr.Replace("<Group." + gf.OID + ">", "");
}
//rtfStr = rtfStr.Replace("<Group." + gf.OID + ">", parentIdx + "." + idx.ToString() + rtf.GetCode(gf.Lab));
//处理 //处理
rtfStr = GetChildNodes(gf.OID, gfs, rtfStr, hidegroup, parentIdx + "." + idx.ToString(), rtf,mapAttrs); rtfStr = GetChildNodes(gf.OID, gfs, rtfStr, hidegroup, parentIdx + "." + idx.ToString(), rtf,mapAttrs);
} }

@ -116,14 +116,14 @@ namespace BP.WF
//移交后写入最新待办,被移交人@BKGY //移交后写入最新待办,被移交人@BKGY
sql = ""; sql = "";
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + emp.No + "','" + BP.WF.Dev2Interface.EmpWorksNums(emp.UserID) + "','0',"+ workID + ")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);
//移交后写入最新待办,移交人@BKGY //移交后写入最新待办,移交人@BKGY
sql = ""; sql = "";
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + WebUser.No + "','" + BP.WF.Dev2Interface.Todolist_EmpWorks + "','0',"+ workID + ")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);
//记录日志. //记录日志.
Glo.AddToTrack(ActionType.Shift, nd.FlowNo, workID, gwf.FID, nd.NodeID, nd.Name, Glo.AddToTrack(ActionType.Shift, nd.FlowNo, workID, gwf.FID, nd.NodeID, nd.Name,
@ -280,8 +280,8 @@ namespace BP.WF
//移交后写入最新待办 被移交人@BKGY //移交后写入最新待办 被移交人@BKGY
string sql2 = ""; string sql2 = "";
sql2 = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql2 += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + emp.UserID + "','" + BP.WF.Dev2Interface.EmpWorksNums(emp.UserID) + "','0',"+ workID + ")";
DBAccess.RunSQL(sql2); DBAccess.RunSQL(sql2);
//处理移交后发送的消息事件,发送消息. //处理移交后发送的消息事件,发送消息.
@ -330,8 +330,8 @@ namespace BP.WF
//移交后写入最新待办 移交人@BKGY //移交后写入最新待办 移交人@BKGY
string sql = ""; string sql = "";
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + WebUser.No + "','" + BP.WF.Dev2Interface.Todolist_EmpWorks + "','0',"+ workID + ")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);
//移交后事件. //移交后事件.

@ -199,8 +199,8 @@ namespace BP.WF
{ {
//流程删除前写入最新待办@BKGY //流程删除前写入最新待办@BKGY
string sql2 = ""; string sql2 = "";
sql2 = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql2 += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + dr[1] + "','" + BP.WF.Dev2Interface.EmpWorksNums(dr[1].ToString()) + "','0',"+ this.WorkID + ")";
DBAccess.RunSQL(sql2); DBAccess.RunSQL(sql2);
} }
@ -617,8 +617,8 @@ namespace BP.WF
{ {
//流程删除前写入最新待办@BKGY //流程删除前写入最新待办@BKGY
string sql2 = ""; string sql2 = "";
sql2 = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql2 += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + dr[1] + "','" + BP.WF.Dev2Interface.EmpWorksNums(dr[1].ToString()) + "','0',"+ workid + ")";
DBAccess.RunSQL(sql2); DBAccess.RunSQL(sql2);
} }
@ -1358,8 +1358,8 @@ namespace BP.WF
//流程结束后写入最新待办@BKGY //流程结束后写入最新待办@BKGY
string sql = ""; string sql = "";
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + WebUser.No + "','" + BP.WF.Dev2Interface.Todolist_EmpWorks + "','0',"+ this.WorkID + ")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);

@ -1133,8 +1133,8 @@ namespace BP.WF
//流程结束后写入最新待办@BKGY //流程结束后写入最新待办@BKGY
string sql = ""; string sql = "";
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + WebUser.No + "','" + BP.WF.Dev2Interface.Todolist_EmpWorks + "','0',"+ this.WorkID + ")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);
this.addMsg(SendReturnMsgFlag.End, msg); this.addMsg(SendReturnMsgFlag.End, msg);
@ -7110,8 +7110,8 @@ namespace BP.WF
//协作时入待办数量@BKGY //协作时入待办数量@BKGY
string sql = ""; string sql = "";
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + WebUser.No + "','" + BP.WF.Dev2Interface.Todolist_EmpWorks + "','0',"+ this.WorkID + ")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);
//@BKGY //@BKGY
@ -7119,8 +7119,8 @@ namespace BP.WF
DataTable dt2 = DBAccess.RunSQLReturnTable(sql); DataTable dt2 = DBAccess.RunSQLReturnTable(sql);
foreach (DataRow dr in dt2.Rows) foreach (DataRow dr in dt2.Rows)
{ {
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) ";
sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + dr[0].ToString() + "','" + BP.WF.Dev2Interface.EmpWorksNums(dr[0].ToString()) + "','0')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + dr[0].ToString() + "','" + BP.WF.Dev2Interface.EmpWorksNums(dr[0].ToString()) + "','0',"+WorkID+")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);
} }
@ -7906,8 +7906,8 @@ namespace BP.WF
//写入待办数量@BKGY //写入待办数量@BKGY
string sql = ""; string sql = "";
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + WebUser.No + "','" + BP.WF.Dev2Interface.Todolist_EmpWorks + "','0',"+ this.WorkID + ")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);
//@BKGY //@BKGY
@ -7915,8 +7915,8 @@ namespace BP.WF
DataTable dt2 = DBAccess.RunSQLReturnTable(sql); DataTable dt2 = DBAccess.RunSQLReturnTable(sql);
foreach (DataRow dr in dt2.Rows) foreach (DataRow dr in dt2.Rows)
{ {
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag,WorkID) ";
sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + dr[0].ToString() + "','" + BP.WF.Dev2Interface.EmpWorksNums(dr[0].ToString()) + "','0')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + dr[0].ToString() + "','" + BP.WF.Dev2Interface.EmpWorksNums(dr[0].ToString()) + "','0',"+ WorkID + ")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);
} }

@ -666,8 +666,8 @@ namespace BP.WF
//撤销后后写入最新待办数量@BKGY //撤销后后写入最新待办数量@BKGY
sql = ""; sql = "";
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + WebUser.No + "','" + BP.WF.Dev2Interface.Todolist_EmpWorks + "','0',"+ this.WorkID + ")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);
return "@协作模式下,撤销成功."; return "@协作模式下,撤销成功.";
@ -958,8 +958,8 @@ namespace BP.WF
//撤销后后写入最新待办数量@BKGY //撤销后后写入最新待办数量@BKGY
sql = ""; sql = "";
sql = "INSERT INTO WEB_SOCKET (ID,USER_NO,EmpWorksNums,Flag) "; 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')"; sql += "VALUES(S_WEB_SOCKET.NEXTVAL,'" + WebUser.No + "','" + BP.WF.Dev2Interface.Todolist_EmpWorks + "','0',"+ this.WorkID + ")";
DBAccess.RunSQL(sql); DBAccess.RunSQL(sql);
return "工作已经被您撤销到:" + cancelToNode.Name; return "工作已经被您撤销到:" + cancelToNode.Name;

Loading…
Cancel
Save