发票作废

src/main/java/com/jeeplus/modules/workinvoice/dao/WorkInvoiceDao.java

@@ -47,13 +47,6 @@ public interface WorkInvoiceDao extends CrudDao<WorkInvoice> {
 	public int updateProcessInstanceId(WorkInvoice workInvoice);
 
 	/**
-	 * 更新作废流程实例ID
-	 * @param
-	 * @return
-	 */
-	public int updateCancellationProcessInstanceId(WorkInvoice workInvoice);
-
-	/**
 	 * 修改日期信息
 	 * @param workInvoice
 	 * @return

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceAllService.java

@@ -1687,14 +1687,14 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 	 */
 	@Transactional(readOnly = false)
 	public void conditionCancelInvalidate(WorkInvoice workInvoice) {
-		String invalidateProcessInstanceId = workInvoice.getCancellationProcessInstanceId();
+		String invalidateProcessInstanceId = workInvoice.getProcessInstanceId();
 		try {
 			//将流程图中尚未走到的task的流程追踪信息逻辑删除，添加一条"撤销"流程追踪信息
 			WorkActivityProcess process = new WorkActivityProcess();
-			process.setProcessInstanceId(workInvoice.getCancellationProcessInstanceId());
+			process.setProcessInstanceId(workInvoice.getProcessInstanceId());
 			process.setIsApproval("0");
 			WorkActivityProcess workActivityProcess = new WorkActivityProcess();
-			workActivityProcess.setProcessInstanceId(workInvoice.getCancellationProcessInstanceId());
+			workActivityProcess.setProcessInstanceId(workInvoice.getProcessInstanceId());
 			List<WorkActivityProcess> processList = workActivityProcessService.findList(workActivityProcess);
 			WorkProjectNotify notify = new WorkProjectNotify();
 			notify.setNotifyId(workInvoice.getId());
@@ -1721,7 +1721,7 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 			}
 			//结束该流程,设为"撤销"状态
 			actTaskService.endProcessInstance(invalidateProcessInstanceId, "发票作废-撤销");
-			workInvoice.setCancellationState("11");
+			workInvoice.setInvoiceState("11");
 			workInvoice.preUpdate();
 			workInvoiceDao.update(workInvoice);
 		} catch (ActivitiObjectNotFoundException e) {

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -2336,7 +2336,7 @@ public class WorkProjectNotifyController extends BaseController {
 						workInvoice.setBank(bankName);
 					}
 					workInvoice.setHome("home");
-					workInvoice.setAct(getByAct(workInvoice.getCancellationProcessInstanceId()));
+					workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
 					String taskDefKey = workInvoice.getAct().getTaskDefKey();
 					model.addAttribute("workInvoice", workInvoice);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoList.jsp

@@ -833,19 +833,7 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-                ,{align:'center', title: '作废状态', fixed: 'right', width:70,templet:function(d){
-						<%--var st = getAuditState(d.status);--%>
-
-						<%--var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/workinvoice/workInvoice/getProcessOne?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
-						<%--return xml;--%>
-						var st = getCancellationAuditState(d.cancellationStatus);
-						if(st.action)
-							var xml = "<span onclick=\"openDialogListView('发票作废流程追踪', '${ctx}/workinvoiceTwo/workinvoiceTwo/getCancellationProcess?id=" + d.id + "','"+ d.id +"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						else
-							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >"+ st.status + "</span>";
-						return xml;
-					}}
-				,{field:'op',align:'center',title:"操作",fixed: 'right',width:140,templet:function(d){
+                ,{field:'op',align:'center',title:"操作",fixed: 'right',width:140,templet:function(d){
                         ////对操作进行初始化
                         var xml="<div class=\"layui-btn-group\">";
 
@@ -885,7 +873,7 @@
 						if(d.cancellationFlag != undefined && d.cancellationFlag =="1")
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"openElectronicInvoiceDialogreplay('上传电子发票', '${ctx}/workinvoiceTwo/workinvoiceTwo/electronicInvoiceForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传电子发票</a>";
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废发票', '${ctx}/workinvoiceTwo/workinvoiceTwo/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 作废</a>";
+							//xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废发票', '${ctx}/workinvoiceTwo/workinvoiceTwo/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 作废</a>";
 						}
 						if(d.conditionCanedit != undefined && d.conditionCanedit =="1")
 						{
@@ -931,7 +919,6 @@
                     ,"responsibleName":"${workInvoice.createBy.name}"
                     ,"receiptMoney":"${workInvoice.receiptMoney}"
                     ,"status":"${workInvoice.invoiceState}"
-                    ,"cancellationStatus":"${workInvoice.cancellationState}"
 					,"notifyFlag":"${workInvoice.notifyFlag}"
 					,"notifyId":"${workInvoice.notifyId}"
 					,"widNumber":"${workInvoice.widNumber}"
@@ -945,21 +932,21 @@
                     ,"receiptMoneyDate":"<fmt:formatDate value="${workInvoice.receiptMoneyDate}" pattern="yyyy-MM-dd"/>"
                     <c:if test="${workInvoice.invoiceState == 1 && fns:getUser().id == workInvoice.createBy.id}"><shiro:hasPermission name="workinvoice:workInvoice:edit">,"canedit1":"1"</shiro:hasPermission></c:if><%--暂存-修改--%>
                     <c:if test="${workInvoice.invoiceState == '4' && fns:getUser().id == workInvoice.createBy.id}">,"canedit2":"1"</c:if><%--驳回--修改--%>
-                    <c:if test="${(workInvoice.invoiceState == '9' || workInvoice.cancellationState == '9') && fns:getUser().id == workInvoice.createBy.id}">,"conditionCanedit":"1"</c:if><%--驳回--修改--%>
-                    <c:if test="${(workInvoice.cancellationState == '11' || workInvoice.invoiceState == '11') && fns:getUser().id == workInvoice.createBy.id}">,"conditionCanedit3":"1"</c:if><%--作废撤回--修改--%>
+                    <c:if test="${workInvoice.invoiceState == '9' && fns:getUser().id == workInvoice.createBy.id}">,"conditionCanedit":"1"</c:if><%--驳回--修改--%>
+                    <c:if test="${workInvoice.invoiceState == '11' && fns:getUser().id == workInvoice.createBy.id}">,"conditionCanedit3":"1"</c:if><%--作废撤回--修改--%>
                     <c:if test="${workInvoice.invoiceState == '3' && fns:getUser().id == workInvoice.createBy.id}">,"canedit3":"1"</c:if><%--撤回--修改--%>
                     <c:if test="${fns:getUser().id == workInvoice.createBy.id}"><c:if test="${workInvoice.invoiceState == '1' or workInvoice.invoiceState == '3' or workInvoice.invoiceState == '4'}"><shiro:hasPermission name="workinvoice:workInvoice:del">,"candelete":"1"</shiro:hasPermission></c:if></c:if>
-                    <c:if test="${fns:getUser().id == workInvoice.createBy.id}"><c:if test="${workInvoice.invoiceState == '9' || workInvoice.invoiceState == '11' || workInvoice.cancellationState == '9' || workInvoice.cancellationState == '11' }">,"conditionCandelete":"1"</c:if></c:if>
+                    <c:if test="${fns:getUser().id == workInvoice.createBy.id}"><c:if test="${workInvoice.invoiceState == '9' || workInvoice.invoiceState == '11' }">,"conditionCandelete":"1"</c:if></c:if>
                     <c:if test="${workInvoice.invoiceState == '2' && fns:getUser().id == workInvoice.createBy.id}">,"cancancel":"1"</c:if>
-                    <c:if test="${(workInvoice.cancellationState == '6' ||workInvoice.invoiceState == '6') && fns:getUser().id == workInvoice.createBy.id}">,"conditionCancancel":"1"</c:if>
-					<c:if test="${workInvoice.invoiceState == '5' && (workInvoice.cancellationState == '' or workInvoice.cancellationState == undefined or  workInvoice.cancellationState == '0') && fns:getUser().id == workInvoice.createBy.id}">,"cancellationFlag":"1"</c:if>
+                    <c:if test="${workInvoice.invoiceState == '6' && fns:getUser().id == workInvoice.createBy.id}">,"conditionCancancel":"1"</c:if>
+					<c:if test="${workInvoice.invoiceState == '5' && fns:getUser().id == workInvoice.createBy.id}">,"cancellationFlag":"1"</c:if>
 
 
 					<shiro:hasPermission name="workinvoice:workInvoice:alteredit">
                     <c:if test="${workInvoice.invoiceState == '5'}">,"canalter":"1"</c:if>
                     </shiro:hasPermission>
 					,"cancellation":<c:choose>
-							<c:when test="${workInvoice.cancellationState == '7' or workInvoice.invoiceState == '7'}">"是"</c:when>
+							<c:when test="${workInvoice.invoiceState == '7'}">"是"</c:when>
 					<c:otherwise>"否"</c:otherwise>
 					</c:choose>
 					<shiro:hasPermission name="ruralProject:ruralProjectView:workInvoiceView">