Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManager.java
===================================================================
diff -u -r21981 -r21996
--- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManager.java	(.../WorkFlowManager.java)	(revision 21981)
+++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManager.java	(.../WorkFlowManager.java)	(revision 21996)
@@ -54,4 +54,6 @@
 	
 	public Boolean isWorkFlowRunning(Long WorkFlowId);
 
+	Boolean isExitsNodeDefinitionName(String nodeDefinitionName, String id);
+
 }
Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowForm.js
===================================================================
diff -u -r21979 -r21996
--- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowForm.js	(.../workFlowForm.js)	(revision 21979)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowForm.js	(.../workFlowForm.js)	(revision 21996)
@@ -221,6 +221,23 @@
 	//大保存
 	function save(store) {
 		var workFlowName = Ext4.getCmp('workFlowName').getValue();
+		var result="";
+		Ext4.Ajax.request({
+			 	async:false, 
+				url : WWWROOT
+						+ '/disinfectSystem/workFlowAction!isExitsWorkFlowName.do',
+				params : {id:id,workFlowName:workFlowName},
+				success : function(response, options) {
+					result = Ext4.decode(response.responseText);
+					if (result.success) {
+						showResult('流程名称已经存在，请重新填写！');
+						return false;
+					}
+				},
+				failure : function(response, options) {
+				}
+		});
+		
 		var status = Ext4.getCmp('status').getValue();
 		if (!workFlowName) {
 			showResult('请填写留下名称！');
@@ -231,51 +248,78 @@
 			showResult('请选择状态！');
 			return false;
 		}
-		var nodes = store.getRootNode().childNodes;
-		
-		var items = [];
-		for (var i=0; i<nodes.length; i++){
-			var node = nodes[i];
-			var allowDisagree;
-			if(node.get('allowDisagree')=='是'){
-				allowDisagree=1;
-			}else{
-				allowDisagree=0;
+		if(!result.success){
+			var nodes = store.getRootNode().childNodes;
+			var sequenceNumberItems=[];
+			var items = [];
+			for (var i=0; i<nodes.length; i++){
+				var node = nodes[i];
+				
+				var roleName = node.get('roleName');
+				var userName = node.get('userName');
+				if (userName == "" && roleName == "") {
+					showResult('请至少选择一个角色或者一个用户！');
+					return ;
+				}
+				var oneSequenceNumber=node.get('sequenceNumber');
+				if (oneSequenceNumber == ""||oneSequenceNumber==0) {
+					showResult('序列号不能为0，请重新输入！');
+					return ;
+				}
+				if(sequenceNumberItems.length==0){
+					sequenceNumberItems.push(oneSequenceNumber);
+				}else{
+					for(var i=0; i<sequenceNumberItems.length; i++){
+						if(sequenceNumberItems[i]==oneSequenceNumber){
+							showResult('序列号不能出现两次，请重新修改！');
+							return ;
+						}
+					}
+					sequenceNumberItems.push(oneSequenceNumber);
+				}
+				
+				var allowDisagree;
+				if(node.get('allowDisagree')=='是'){
+					allowDisagree=1;
+				}else{
+					allowDisagree=0;
+				}
+				var allowRollback;
+				if(node.get('allowRollback')=='是'){
+					allowRollback=1;
+				}else{
+					allowRollback=0;
+				}
+				var item = {
+					allowDisagree: allowDisagree,
+					allowRollback: allowRollback,
+					name:node.get('name'),
+					nodeApprovalId:node.get('nodeApprovalId'),
+					nodeDefinitionId:node.get('nodeDefinitionId'),
+					roleId:node.get('roleId'),
+					roleName:node.get('roleName'),
+					sequenceNumber:node.get('sequenceNumber'),
+					userId:node.get('userId'),
+					userName:node.get('userName')
+				};
+				
+				items.push(item);
 			}
-			var allowRollback;
-			if(node.get('allowRollback')=='是'){
-				allowRollback=1;
-			}else{
-				allowRollback=0;
-			}
-			var item = {
-				allowDisagree: allowDisagree,
-				allowRollback: allowRollback,
-				name:node.get('name'),
-				nodeApprovalId:node.get('nodeApprovalId'),
-				nodeDefinitionId:node.get('nodeDefinitionId'),
-				roleId:node.get('roleId'),
-				roleName:node.get('roleName'),
-				sequenceNumber:node.get('sequenceNumber'),
-				userId:node.get('userId'),
-				userName:node.get('userName')
-			};
-			items.push(item);
+			
+			Ext4.getCmp("items").setValue(Ext4.encode(items));
+			formObj.getForm().submit({
+				clientValidation : true,
+				url : WWWROOT + '/disinfectSystem/workFlowAction!save.do',
+				success : function(form, action) {
+					showResult("保存成功");
+					grid.reloadData();
+					windowObj.close();
+				},
+				failure : function(form, action) {
+					showResult("保存失败");
+				}
+			});
 		}
-		
-		Ext4.getCmp("items").setValue(Ext4.encode(items));
-		formObj.getForm().submit({
-			clientValidation : true,
-			url : WWWROOT + '/disinfectSystem/workFlowAction!save.do',
-			success : function(form, action) {
-				showResult("保存成功");
-				grid.reloadData();
-				windowObj.close();
-			},
-			failure : function(form, action) {
-				showResult("保存失败");
-			}
-		});
 	}
 	//删除节点定义
 	function deleteNodeDefinitions(grid) {
@@ -513,7 +557,8 @@
 	                   beforeedit: function(editor, context, eOpts){
 	                   	var record = context.record;
 	                   },
-	                   edit:function(editor, context, eOpts){       	
+	                   edit:function(editor, context, eOpts){ 
+	                	    
 	                   }
 	               }
 	           });
@@ -576,7 +621,7 @@
 					border : 0,
 					fieldLabel : '流程名称',
 					name : "workFlowName",
-					id : "workFlowName"// ,
+					id : "workFlowName"
 				} ]
 			}, {
 				layout : 'form',
@@ -593,6 +638,7 @@
 					id : "status",
 					valueField : 'value',
 					displayField : 'name',
+					value : false,
 					store : statusStore,
 					mode : 'local'
 				} ]
@@ -646,10 +692,8 @@
 					success : function(response, options) {
 						var result = Ext4.decode(response.responseText);
 						if (result.success) {
-							Ext4.getCmp('workFlowName').setValue(
-									result.data["workFlowName"]);
-							Ext4.getCmp('status').setValue(
-									result.data["status"]);
+							Ext4.getCmp('workFlowName').setValue(result.data["workFlowName"]);
+							Ext4.getCmp('status').setValue(result.data["status"]);
 							Ext4.getCmp('id').setValue(result.data["id"]);
 						}
 					},
Index: forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowAction.java
===================================================================
diff -u -r21979 -r21996
--- forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowAction.java	(.../WorkFlowAction.java)	(revision 21979)
+++ forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowAction.java	(.../WorkFlowAction.java)	(revision 21996)
@@ -53,7 +53,39 @@
 
 	private UserManager userManager;
 	
+	
 	/**
+	 * 判断当前流程是否被申请单使用
+	 * @param nodeDefinitionName 节点名字
+	 * @param id 流程id
+	 */
+	public void isWorkFlowRunning(){
+		StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
+		String id = StrutsParamUtils.getPraramValue("id", "");
+		Boolean flag=false;
+		if(!"".equals(id))
+			flag= workFlowManager.isWorkFlowRunning(Long.valueOf(id));
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("success", flag);
+		StrutsResponseUtils.output(jsonObject);
+	}
+	
+	/**
+	 * 根据节点名字，判断是否已经存在
+	 * @param nodeDefinitionName 节点名字
+	 * @param id 流程id
+	 */
+	public void isExitsNodeDefinitionName(){
+		StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
+		String nodeDefinitionName = StrutsParamUtils.getPraramValue("nodeDefinitionName", "");
+		String id = StrutsParamUtils.getPraramValue("id", "");
+		Boolean flag= workFlowManager.isExitsNodeDefinitionName(nodeDefinitionName,id);
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("success", flag);
+		StrutsResponseUtils.output(jsonObject);
+	}
+	
+	/**
 	 * 根据流程名字，判断是否已经存在
 	 * 
 	 */
@@ -177,24 +209,16 @@
 	 * 删除流程
 	 * @return
 	 */
-	public String deleteWorkFlow() {
+	public void deleteWorkFlow() {
+		StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
 		String ids = StrutsParamUtils.getPraramValue("ids", "");
-		String message = "";
 		try {
 			String[] idArray = ids.split(";");
 			workFlowManager.deleteWorkFlow(idArray);
-			message = "{\"success\":true}";
+			StrutsResponseUtils.output(true, "保存成功");
 		} catch (Exception e) {
-			message = "{\"success\":false}";
-			e.printStackTrace();
+			StrutsResponseUtils.output(false, e.getMessage());
 		}
-		try {
-			StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
-			StrutsParamUtils.getResponse().getWriter().print(message);
-		} catch (Exception e) {
-
-		}
-		return null;
 	}
 
 	/**
Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
===================================================================
diff -u -r21979 -r21996
--- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js	(.../workFlowApprovalTaskForm.js)	(revision 21979)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js	(.../workFlowApprovalTaskForm.js)	(revision 21996)
@@ -401,7 +401,7 @@
 		},{
 			text : '审核不通过',
 			iconCls : 'btn_ext_application_edit',
-			hidden: allowStore.getAt(0).get('allowDisagree')?true:false,
+			hidden: allowStore.getAt(0).get('allowDisagree')?false:true,
 			handler : function() {
 				Fail();
 			}
Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
===================================================================
diff -u -r21981 -r21996
--- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java	(.../WorkFlowApprovalTaskManagerImpl.java)	(revision 21981)
+++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java	(.../WorkFlowApprovalTaskManagerImpl.java)	(revision 21996)
@@ -289,6 +289,7 @@
 				workFlowApprovalTask1.setTitle(workFlowApprovalTask2.getFormId()+workFlowApprovalTask2.getFormType());
 				workFlowApprovalTask1.setCreateTaskTime(new Date());
 				workFlowApprovalTask1.setUserId(workFlowApprovalTask2.getUserId());
+				workFlowApprovalTask1.setUserId(workFlowApprovalTask2.getRoleId());
 				workFlowApprovalTask1.setStatus(0);
 				saveOrUpdateWorkFlowApprovalTask(workFlowApprovalTask1);
 			}else{//节点为空，返回申请人---前台调用家的修改单流程状态				
Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowView.js
===================================================================
diff -u -r21947 -r21996
--- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowView.js	(.../workFlowView.js)	(revision 21947)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowView.js	(.../workFlowView.js)	(revision 21996)
@@ -23,8 +23,26 @@
 		return false;
 	}
 	var id = records[0].data['id'];
-	addAndEditWorkFlow(id);
-	grid.getSelectionModel().deselectAll();// grid reload() 后，getSelectionModel()不变
+	
+	var result="";
+	Ext4.Ajax.request({
+		 	async:false, 
+			url : WWWROOT
+					+ '/disinfectSystem/workFlowAction!isWorkFlowRunning.do',
+			params : {id:id},
+			success : function(response, options) {
+				result = Ext4.decode(response.responseText);
+				if (!result.success) {
+					addAndEditWorkFlow(id);
+					grid.getSelectionModel().deselectAll();// grid reload() 后，getSelectionModel()不变
+				}else{
+					showResult('当前流程已经被申请单使用，无法修改！');
+					return false;
+				}
+			},
+			failure : function(response, options) {
+			}
+	});
 }
 
 function renderStatus(value, metaData, record, rowIndex, colIndex, store, view) {
@@ -69,7 +87,7 @@
 												showResult('删除成功！');
 												grid.reloadData();
 											} else {
-												showResult('删除失败！');
+												showResult(result.message);
 											}
 										},
 										failure : function(response, options) {
Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java
===================================================================
diff -u -r21985 -r21996
--- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java	(.../WorkFlowManagerImpl.java)	(revision 21985)
+++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java	(.../WorkFlowManagerImpl.java)	(revision 21996)
@@ -6,6 +6,7 @@
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.bouncycastle.crypto.RuntimeCryptoException;
+import org.jfree.data.DataUtilities;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -41,20 +42,51 @@
 		this.workFlowApprovalTaskManager = workFlowApprovalTaskManager;
 	}
 
+	private Boolean isExitsWorkFlowFormType(String formType,String workFlowId){
+		String sql="";
+		if(DatabaseUtil.isPoIdValid(workFlowId)){//修改
+			sql=" where po.invoicePlanType='"+formType+"' po.id !="+workFlowId;
+		}else{//增加
+			sql=" where po.invoicePlanType='"+formType+"'";
+		}
+		WorkFlow  workFlow =(WorkFlow) objectDao.getBySql(WorkFlow.class.getSimpleName(), sql);
+		if(workFlow!=null)
+			return true;
+		return false;
+	}
+	
 	@Override
-	public Boolean isWorkFlowRunning(Long WorkFlowId) {
+	public Boolean isWorkFlowRunning(Long workFlowId) {
 		Boolean flag=false;
-		String sql=" where po.id="+WorkFlowId+" and po.id in ( select distinct nd.workFlow_id id from NodeDefinition nd where nd.id in (select nodeDefinition_id from WorkFlowApprovalTask w where w.status!=1))";
-		WorkFlow workFlow = (WorkFlow) objectDao.getBySql(WorkFlow.class.getSimpleName(), sql);
+		String sql;
+		WorkFlow workFlow = null;
+		if(DatabaseUtil.isPoIdValid(workFlowId)){
+			sql=" where po.id="+workFlowId+" and po.id in ( select distinct nd.workFlow.id from NodeDefinition nd where nd.id in (select w.nodeDefinition.id from WorkFlowApprovalTask w where w.status!=1))";
+			workFlow = (WorkFlow) objectDao.getBySql(WorkFlow.class.getSimpleName(), sql);
+		}
 		if(workFlow!=null){
 			flag=true;
 		}
 		return flag;
 	}	
 	
 	@Override
-	public Boolean isExitsWorkFlowName(String workFlowName,String id) {
-		String sql=" where po.workFlowName="+workFlowName+" and po.id="+id;
+	public Boolean isExitsNodeDefinitionName(String nodeDefinitionName,String id) {
+		String sql=" where po.name="+nodeDefinitionName+" and po.workFlow.id="+id;
+		NodeDefinition  nodeDefinition =(NodeDefinition) objectDao.getBySql(NodeDefinition.class.getSimpleName(), sql);
+		if(nodeDefinition!=null)
+			return true;
+		return false;
+	}
+	
+	@Override
+	public Boolean isExitsWorkFlowName(String workFlowName, String id) {
+		String sql="";
+		if(DatabaseUtil.isPoIdValid(id)){//修改
+			sql=" where po.workFlowName="+workFlowName+" po.id !="+id;
+		}else{//增加
+			sql=" where po.workFlowName="+workFlowName;
+		}
 		WorkFlow  workFlow =(WorkFlow) objectDao.getBySql(WorkFlow.class.getSimpleName(), sql);
 		if(workFlow!=null)
 			return true;
@@ -80,35 +112,46 @@
 		if(isWorkFlowRunningFlag){
 			throw new RuntimeException("该流程已经有申请单在使用，故不能修改！");
 		}else{
-			saveOrUpdateWorkFlow(workFlow);	
-			if(CollectionUtils.isNotEmpty(itemInfo)){
-				//获取当前工作流id的所有节点，如与当前传过来的数据不匹配 删除
-				List<NodeDefinition> nodeDefinitions = objectDao.findByProperty(NodeDefinition.class.getSimpleName(), "workFlow.id", String.valueOf(workFlow.getId()));
-				long nodeDefinitionId=0;
-				Boolean flag=true;
-				for(NodeDefinition nodeDefinition :nodeDefinitions){
-					flag=true;
-					for(int i = 0;i < itemInfo.size();++i){
-						JSONObject item = itemInfo.getJSONObject(i);
-						if(!"".equals(item.opt("nodeDefinitionId").toString())){
-							nodeDefinitionId=Long.parseLong(item.opt("nodeDefinitionId").toString());
-							if(DatabaseUtil.isPoIdValid(nodeDefinitionId)){
-								if(nodeDefinition.getId()==nodeDefinitionId){//存在则不删除
-									flag=false;
+			Boolean isExitsWorkFlowNameFlag=isExitsWorkFlowName(workFlow.getWorkFlowName(),String.valueOf(workFlow.getId()));
+			
+			if(!isExitsWorkFlowNameFlag){
+				Boolean isisExitsWorkFlowFormTypeFlag=isExitsWorkFlowFormType(workFlow.getInvoicePlanType(),String.valueOf(workFlow.getId()));
+				if(!isisExitsWorkFlowFormTypeFlag){
+					saveOrUpdateWorkFlow(workFlow);	
+					if(CollectionUtils.isNotEmpty(itemInfo)){
+						//获取当前工作流id的所有节点，如与当前传过来的数据不匹配 删除
+						List<NodeDefinition> nodeDefinitions = objectDao.findByProperty(NodeDefinition.class.getSimpleName(), "workFlow.id", String.valueOf(workFlow.getId()));
+						long nodeDefinitionId=0;
+						Boolean flag=true;
+						for(NodeDefinition nodeDefinition :nodeDefinitions){
+							flag=true;
+							for(int i = 0;i < itemInfo.size();++i){
+								JSONObject item = itemInfo.getJSONObject(i);
+								if(!"".equals(item.opt("nodeDefinitionId").toString())){
+									nodeDefinitionId=Long.parseLong(item.opt("nodeDefinitionId").toString());
+									if(DatabaseUtil.isPoIdValid(nodeDefinitionId)){
+										if(nodeDefinition.getId()==nodeDefinitionId){//存在则不删除
+											flag=false;
+										}
+									}
 								}
 							}
+							if(flag){//true为不存在
+								NodeApproval nodeApproval=(NodeApproval) objectDao.getByProperty(NodeApproval.class.getSimpleName(), "nodeDefinition.id",nodeDefinition.getId());
+								objectDao.delete(nodeApproval);
+								deleteNodeDefinition(nodeDefinition);
+							}
 						}
+						for(int i = 0;i < itemInfo.size();++i){
+							JSONObject item = itemInfo.getJSONObject(i);
+							saveNodeDefinition(workFlow, item);
+						}
 					}
-					if(flag){//true为不存在
-						NodeApproval nodeApproval=(NodeApproval) objectDao.getByProperty(NodeApproval.class.getSimpleName(), "nodeDefinition.id",nodeDefinition.getId());
-						objectDao.delete(nodeApproval);
-						deleteNodeDefinition(nodeDefinition);
-					}
+				}else{
+					throw new RuntimeException("该单类型已被使用，请重新命名！");
 				}
-				for(int i = 0;i < itemInfo.size();++i){
-					JSONObject item = itemInfo.getJSONObject(i);
-					saveNodeDefinition(workFlow, item);
-				}
+			}else{
+				throw new RuntimeException("该流程名字已被使用，请重新命名！");
 			}
 		}
 	}
@@ -207,21 +250,27 @@
 	@SuppressWarnings("unchecked")
 	@Override
 	public void deleteWorkFlow(Object[] idArray) {
+		Boolean isWorkFlowRunningFlag=false;
 		for (Object object : idArray) {
-			List<NodeDefinition> nodeDefinitions=  objectDao.findByProperty(NodeDefinition.class.getSimpleName(), "workFlow.id",""+object);
-			for(NodeDefinition nodeDefinition:nodeDefinitions){
-				List<NodeApproval> nodeApprovals=  (List<NodeApproval>) objectDao.findByProperty(NodeApproval.class.getSimpleName(),"nodeDefinition.id",""+nodeDefinition.getId());
-				for(NodeApproval nodeApproval:nodeApprovals){
-					deleteNodeApproval(nodeApproval);//删除所属的节点审批
+			isWorkFlowRunningFlag= isWorkFlowRunning(Long.parseLong(object.toString()));
+			if(isWorkFlowRunningFlag){
+				throw new RuntimeException(object+"该流程已经有申请单在使用，故不能删除！");
+			}else{
+				List<NodeDefinition> nodeDefinitions=  objectDao.findByProperty(NodeDefinition.class.getSimpleName(), "workFlow.id",""+object);
+				for(NodeDefinition nodeDefinition:nodeDefinitions){
+					List<NodeApproval> nodeApprovals=  (List<NodeApproval>) objectDao.findByProperty(NodeApproval.class.getSimpleName(),"nodeDefinition.id",""+nodeDefinition.getId());
+					for(NodeApproval nodeApproval:nodeApprovals){
+						deleteNodeApproval(nodeApproval);//删除所属的节点审批
+					}
+					List<WorkFlowApprovalTask> workFlowApprovalTasks=  (List<WorkFlowApprovalTask>) objectDao.findByProperty(WorkFlowApprovalTask.class.getSimpleName(),"nodeDefinition.id",""+nodeDefinition.getId());
+					for(WorkFlowApprovalTask workFlowApprovalTask:workFlowApprovalTasks){
+						workFlowApprovalTaskManager.deleteWorkFlowApprovalTask(workFlowApprovalTask);//删除所属的节点审批
+					}
+					deleteNodeDefinition(nodeDefinition);//删除所属的节点
 				}
-				List<WorkFlowApprovalTask> workFlowApprovalTasks=  (List<WorkFlowApprovalTask>) objectDao.findByProperty(WorkFlowApprovalTask.class.getSimpleName(),"nodeDefinition.id",""+nodeDefinition.getId());
-				for(WorkFlowApprovalTask workFlowApprovalTask:workFlowApprovalTasks){
-					workFlowApprovalTaskManager.deleteWorkFlowApprovalTask(workFlowApprovalTask);//删除所属的节点审批
-				}
-				deleteNodeDefinition(nodeDefinition);//删除所属的节点
-			}
-			WorkFlow workFlow=(WorkFlow) objectDao.getByID_ForUpdate(WorkFlow.class.getSimpleName(), object.toString());
-			objectDao.delete(workFlow);
+				WorkFlow workFlow=(WorkFlow) objectDao.getByID_ForUpdate(WorkFlow.class.getSimpleName(), object.toString());
+				objectDao.delete(workFlow);
+			}		
 		}
 	}
 
Fisheye: Tag 20434 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dataUpdater/logs/updateReport.txt'.
Fisheye: No comparison available.  Pass `N' to diff?