Skip to content

T
topsun-bpm
Commit 693254e6 authored by 1650842865's avatar 1650842865
Browse files
Options

采购申请撤审；采购订单撤审

parent afd5ee79
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 66 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalList.js
View file @ 693254e6
......@@ -11,24 +11,26 @@ function initUI() {
function initPurchaseListGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
// revokeApproveHandler: {
// id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () {
// var rows = purchaseApprovalGridManager.getSelectedRows();
// if (rows.length == 0 || rows.length > 1) {
// Public.tip("请选择一条已完成的数据！");
// return;
// }
// if (rows[0].status != 3) {
// Public.tip("请选择一条已完成的数据！");
// return;
// }
// UICtrl.confirm('确定要把当前单据撤销审批吗?', function () {
// Public.ajax(web_app.name + '/sapPurchaseApproval/revokeApproval.ajax', {id: rows[0].id}, function (msg) {
// purchaseApprovalGridManager.loadData();
// });
// });
// }
// }
revokeApproveHandler: {
id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () {
var row = purchaseApprovalGridManager.getSelectedRow();
if (row.status != 3) {
Public.tip("请选择一条已完成的数据！");
return;
}
UICtrl.showAjaxDialog({
url: web_app.name + '/sapPurchaseApproval/showRevokeDetail.load',
param:{id:row.id},
title: "撤审",
width: 400,
ok: function () {
Public.ajax(web_app.name + '/sapPurchaseApproval/revokeApproval.ajax', {id: row.id,revokeReason: $("#revokeForm #revokeReason").val()}, function (msg) {
purchaseApprovalGridManager.loadData();
});
}
});
}
}
});
purchaseApprovalGridManager = UICtrl.grid('#purchaseApprovalGrid', {
columns: [
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/showRevokeDetail.jsp 0 → 100644
View file @ 693254e6
<%@ page language="java" contentType="text/html; charset=utf-8" %>
<%@taglib uri="/WEB-INF/taglib.tld" prefix="x" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
</head>
<body>
<form class="hg-form" method="post" action="" id="revokeForm">
<x:hidden name="id"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:textareaC name="revokeReason" required="true" label="撤审原因" labelCol="4" fieldCol="8" rows="3"/>
</div>
</div>
</form>
</body>
</html>
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.js
View file @ 693254e6
var itemGridManager = null;
$(function () {
$("#toolBar").toolBar("enable", "forceAbortTask");
revoke();
initItemGrid();
bindEvent();
var retpo = $("#retpo").val();
......@@ -17,6 +18,18 @@ function bindEvent() {
}
function revoke(){
var revokeReason = $("#revokeReason").val();
if (Public.isNotBlank(revokeReason)) {
$("#billTitle .subject").html("采购订单撤审")
$("#revoke").show();
$("#normal").hide();
}else {
$("#normal").show();
$("#revoke").hide();
}
}
function initItemGrid() {
itemGridManager = UICtrl.grid('#maingrid', {
columns: getGridColumns(),
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.jsp
View file @ 693254e6
......@@ -44,25 +44,20 @@
<x:inputC name="headText" label="备注" readonly="true" labelCol="1" fieldCol="8" required="false"/>
</div>
</div>
<x:title title="sap回执" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="msgType" label="消息类型" readonly="true" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="message" label="消息内容" readonly="true" labelCol="1" fieldCol="2" required="false"/>
<%-- <x:inputC name="msgId" label="消息id" readonly="true" labelCol="1" fieldCol="2" required="false"/>--%>
<%-- <x:inputC name="number" label="消息编号" readonly="true" labelCol="1" fieldCol="2" required="false"/>--%>
<%-- <x:inputC name="logNo" label="日志编号" readonly="true" labelCol="1" fieldCol="2" required="false"/>--%>
<%-- <x:inputC name="logMsgNo" label="日志消息编号" readonly="true" labelCol="1" fieldCol="2"--%>
<%-- required="false"/>--%>
<%-- <x:inputC name="messageV1" label="消息参数 1" readonly="true" wrapper="date" labelCol="1" fieldCol="2"--%>
<%-- required="false"/>--%>
<%-- <x:inputC name="messageV2" label="消息参数 2" readonly="true" wrapper="date" labelCol="1" fieldCol="2"--%>
<%-- required="false"/>--%>
<%-- <x:inputC name="messageV3" label="消息参数 3" readonly="true" wrapper="date" labelCol="1" fieldCol="2"--%>
<%-- required="false"/>--%>
<%-- <x:inputC name="messageV4" label="消息参数 4" readonly="true" wrapper="date" labelCol="1" fieldCol="2"--%>
<%-- required="false"/>--%>
<div id="normal">
<x:title title="sap回执" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="msgType" label="消息类型" readonly="true" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="message" label="消息内容" readonly="true" labelCol="1" fieldCol="2" required="false"/>
</div>
</div>
</div>
<div id="revoke">
<div class="hg-form-cols">
<div class="hg-form-row">
<x:textareaC name="revokeReason" required="true" label="撤审原因" labelCol="1" fieldCol="5" rows="3"/>
</div>
</div>
</div>
<div id="maingrid"></div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.js
View file @ 693254e6
......@@ -26,25 +26,27 @@ function loadGrid() {
sendOutHandler();
}
},
// revokeApproveHandler: {
// id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () {
// var rows = purchaseOrderGridManager.getSelectedRows();
// if (rows.length == 0 || rows.length > 1) {
// Public.tip("请选择一条已完成的数据！");
// return;
// }
// if (rows[0].status != 3) {
// Public.tip("请选择一条已完成的数据！");
// return;
// }
// UICtrl.confirm('确定要把当前单据撤销审批吗?', function () {
// Public.ajax(web_app.name + '/sapPurchaseOrder/revokeApproval.ajax', {id: rows[0].id}, function (msg) {
// purchaseOrderGridManager.loadData();
// });
// });
// }
// }
});
revokeApproveHandler: {
id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () {
var row = purchaseOrderGridManager.getSelectedRow();
if (row.status != 3) {
Public.tip("请选择一条已完成的数据！");
return;
}
UICtrl.showAjaxDialog({
url: web_app.name + '/sapPurchaseOrder/showRevokeDetail.load',
param:{id:row.id},
title: "撤审",
width: 400,
ok: function () {
Public.ajax(web_app.name + '/sapPurchaseOrder/revokeApproval.ajax', {id: row.id,revokeReason: $("#revokeForm #revokeReason").val()}, function (msg) {
purchaseOrderGridManager.loadData();
});
}
});
}
}
});
//debugger
purchaseOrderGridManager = UICtrl.grid('#purchaseOrderGrid', {
columns: [
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/showRevokeDetail.jsp 0 → 100644
View file @ 693254e6
<%@ page language="java" contentType="text/html; charset=utf-8" %>
<%@taglib uri="/WEB-INF/taglib.tld" prefix="x" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
</head>
<body>
<form class="hg-form" method="post" action="" id="revokeForm">
<x:hidden name="id"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:textareaC name="revokeReason" required="true" label="撤审原因" labelCol="4" fieldCol="8" rows="3"/>
</div>
</div>
</form>
</body>
</html>
topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/SapPurchaseApprovalApplication.java
View file @ 693254e6
......@@ -23,7 +23,7 @@ public interface SapPurchaseApprovalApplication {
void saveSapPurchaseApprovalVo(SapPurchaseApprovalDto sapPurchaseApprovalDto);
String revokeApproval(String id);
String revokeApproval(String id,String revokeReason);
void abortPurchaseApproval(String id,String jobPageId);
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java
View file @ 693254e6
......@@ -170,7 +170,10 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
SapPurchaseApproval sapPurchaseApproval = sapPurchaseApprovalRepository.findOne(bizId);
sapPurchaseApproval.setStatusId(status.getId());
sapPurchaseApprovalRepository.save(sapPurchaseApproval);
sendSapData(sapPurchaseApproval,"Y","");
if (StringUtil.isBlank(sapPurchaseApproval.getRevokeReason())){
//如果没有撤销原因，才去调用sap接口；撤审通知去sap主动撤审
sendSapData(sapPurchaseApproval,"Y","");
}
}
/**
......@@ -497,7 +500,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
}
@Override
public String revokeApproval(String id){
public String revokeApproval(String id,String revokeReason){
SapPurchaseApproval sapPurchaseApproval = this.sapPurchaseApprovalRepository.findOne(id);
if (sapPurchaseApproval.getStatusId()!=BizBillStatus.COMPLETED.getId()){
throw new RuntimeException("审批完成的单据才能撤销！");
......@@ -509,7 +512,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
SapPurchaseApproval newSapPurchaseApproval=new SapPurchaseApproval();
ClassHelper.copyProperties(sapPurchaseApproval,newSapPurchaseApproval);
newSapPurchaseApproval.setId("");
newSapPurchaseApproval.setRevokeReason(revokeReason);
String pId=mannualStartWorkApplication.startWorkflow(newSapPurchaseApproval,PROCESS_DEFINITION_KEY,"sapPurchaseApproval");
newSapPurchaseApproval=this.sapPurchaseApprovalRepository.findOne(pId);
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/controller/SapPurchaseApprovalController.java
View file @ 693254e6
......@@ -98,7 +98,8 @@ public class SapPurchaseApprovalController extends CommonController {
public String revokeApproval(){
SDO sdo = this.getSDO();
String id=sdo.getString("id");
String newId=sapPurchaseApprovalApplication.revokeApproval(id);
String revokeReason=sdo.getString("revokeReason");
String newId=sapPurchaseApprovalApplication.revokeApproval(id,revokeReason);
return success();
}
......@@ -114,4 +115,11 @@ public class SapPurchaseApprovalController extends CommonController {
sapPurchaseApprovalApplication.abortPurchaseApproval(id, jobPageId);
return success();
}
public String showRevokeDetail(){
SDO sdo = this.getSDO();
String id = sdo.getId();
this.putAttribute("id",id);
return forward("showRevokeDetail");
}
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/domain/SapPurchaseApproval.java
View file @ 693254e6
......@@ -55,6 +55,12 @@ public class SapPurchaseApproval extends FlowBillAbstractEntity {
@Column(name = "EKGRP")
private String ekgrp;
/**
* 撤审原因
*/
@Column(name = "revoke_reason")
private String revokeReason;
private static final long serialVersionUID = 1L;
@Override
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/SapPurchaseOrderApplication.java
View file @ 693254e6
......@@ -27,7 +27,7 @@ public interface SapPurchaseOrderApplication {
void sendSapDate(SapPurchaseOrder sapPurchaseOrder,String flag,String status);
String revokeApproval(String id);
String revokeApproval(String id, String revokeReason);
Map<String, Object> print(String id);
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java
View file @ 693254e6
......@@ -208,7 +208,10 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
SapPurchaseOrder sapPurchaseOrder = sapPurchaseOrderRepository.findOne(bizId);
sapPurchaseOrder.setStatusId(status.getId());
SapPurchaseOrder save = sapPurchaseOrderRepository.save(sapPurchaseOrder);
this.sendSapDate(save, "Y","");
if (StringUtil.isBlank(sapPurchaseOrder.getRevokeReason())){
//如果没有撤销原因，才去调用sap接口；撤审通知去sap主动撤审
this.sendSapDate(save, "Y","");
}
// asyncWriteExecutor.execute(()->
// //创建放行条
// this.startSapPermit(sapPurchaseOrder)
......@@ -429,7 +432,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
}
@Override
public String revokeApproval(String id){
public String revokeApproval(String id,String revokeReason){
SapPurchaseOrder sapPurchaseOrder = this.sapPurchaseOrderRepository.findOne(id);
if (sapPurchaseOrder.getStatusId()!=BizBillStatus.COMPLETED.getId()){
throw new RuntimeException("审批完成的单据才能撤销！");
......@@ -441,7 +444,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
SapPurchaseOrder newSapPurchaseOrder=new SapPurchaseOrder();
ClassHelper.copyProperties(sapPurchaseOrder,newSapPurchaseOrder);
newSapPurchaseOrder.setId("");
newSapPurchaseOrder.setRevokeReason(revokeReason);//撤审原因
String pId=mannualStartWorkApplication.startWorkflow(newSapPurchaseOrder,PROCESS_DEFINITION_KEY,"sapPurchaseOrder");
newSapPurchaseOrder=this.sapPurchaseOrderRepository.findOne(pId);
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/controller/SapPurchaseOrderController.java
View file @ 693254e6
......@@ -93,7 +93,8 @@ public class SapPurchaseOrderController extends CommonController {
public String revokeApproval(){
SDO sdo = this.getSDO();
String id=sdo.getString("id");
String newId=sapPurchaseOrderApplication.revokeApproval(id);
String revokeReason=sdo.getString("revokeReason");
String newId=sapPurchaseOrderApplication.revokeApproval(id,revokeReason);
return success();
}
......@@ -144,4 +145,11 @@ public class SapPurchaseOrderController extends CommonController {
sapPurchaseOrderApplication.abortPurchaseOrder(id, jobPageId);
return success();
}
public String showRevokeDetail(){
SDO sdo = this.getSDO();
String id = sdo.getId();
this.putAttribute("id",id);
return forward("showRevokeDetail");
}
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/SapPurchaseOrder.java
View file @ 693254e6
......@@ -181,6 +181,12 @@ public class SapPurchaseOrder extends FlowBillAbstractEntity {
@Column(name = "KNTTP")
private String knttp;
/**
* 撤审原因
*/
@Column(name = "revoke_reason")
private String revokeReason;
@Override
protected String getCodeRuleId() {
return "sapPurchaseOrder";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment