From d74e1e2af9f0c862d0a9eb6c06319f6dafc778ff Mon Sep 17 00:00:00 2001 From: zzk Date: Fri, 15 Sep 2023 14:22:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=84=8F=E8=A7=81=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessApplication/ApprovalForm.jsp | 7 +++++-- .../businessapply/BusinessApproveManager.java | 20 ++++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index 5c6ad036b..373a5bcda 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -701,6 +701,7 @@ if(vo=="0010"||vo=="0040"){ showItem(0,"VETO"); setItemRequired(0,"VETO",true); + setItemValue(0, 0, "VETO", ""); }else { hideItem(0,"VETO"); setItemRequired(0,"VETO",false); @@ -826,7 +827,7 @@ if(checkOpinion("THIRDCHOICE")){ return; } - } + } var updatedFields = DisplayFields[0]; if(iV_all(0)){ document.getElementById("messageBox").style.display='none'; @@ -863,12 +864,14 @@ openDWDialog(); var phaseChoice = ""; var phaseOpinion = ""; + var VETO = ""; if("0030" == "<%=phaseNo%>"){ phaseChoice = getItemValue(0,0,"firstchoice"); phaseOpinion = getItemValue(0,0,"firstopinion"); }else if("0040" == "<%=phaseNo%>"||"0050" == "<%=phaseNo%>"){ phaseChoice = getItemValue(0,0,"secondchoice"); phaseOpinion = getItemValue(0,0,"secondopinion"); + VETO = getItemValue(0,0,"VETO"); }else if("0060" == "<%=phaseNo%>"){ phaseChoice = getItemValue(0,0,"thirdchoice"); phaseOpinion = getItemValue(0,0,"thirdopinion"); @@ -883,7 +886,7 @@ // var InterOpinion3 = getItemValue(0,0,"InterOpinion3"); // var DistriOpinion3 = getItemValue(0,0,"DistriOpinion3"); var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","saveApproveOpinion", - "serialNo=<%=taskno%>,phaseNo=<%=phaseNo%>,flowunid=<%=flowunid%>,phaseChoice="+phaseChoice+",phaseOpinion="+phaseOpinion+",userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>"); + "serialNo=<%=taskno%>,phaseNo=<%=phaseNo%>,flowunid=<%=flowunid%>,phaseChoice="+phaseChoice+",phaseOpinion="+phaseOpinion+",veto="+VETO+",userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>"); if("SUCCESS" == sResult){ resetDWDialog("保存成功!",true); reloadSelf(); diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java index 4b6b7f569..208924afd 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java @@ -1,5 +1,7 @@ package com.tenwa.lease.flow.project.businessapply; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; import jbo.app.LB_EQUIPMENT_CAR; import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP; import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP; @@ -38,7 +40,17 @@ public class BusinessApproveManager { private String projectId; private String dataNum;//租赁物复制的数量 private String carId; - + + private String veto;//拒单理由 + + public String getVeto() { + return veto; + } + + public void setVeto(String veto) { + this.veto = veto; + } + public String getDistriOpinion1() { return DistriOpinion1; } @@ -208,6 +220,12 @@ public class BusinessApproveManager { bomFT.createQuery("update O set relativeobjectno='"+serialNo+"' where serialno='"+serialNo+"'").executeUpdate(); } bomFO.saveObject(bo); + if(veto!=null||"".equals(veto)){ + Transaction sqlca = Transaction.createTransaction(tx); + String ssql= "update LB_PROJECT_INFO_TEMP set veto = '"+veto+"' where FLOWUNID = '"+flowunid+"'"; + SqlObject sqlObject = new SqlObject(ssql); + sqlca.executeSQL(sqlObject); + } tx.commit(); }catch(Exception e){ e.printStackTrace();