Skip to content

T
topsun-bpm
Commit 6b061492 authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

描述修改

parent 6ca949a3
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 42 deletions
topsun-xt/src/main/webapp/HomePage.jsp
View file @ 6b061492
......@@ -45,7 +45,7 @@
<div class="col-sm-6 col-xs-12">
<div class="box box-success">
<div class="box-header with-border">
<h3 class="box-title">非产品/非本成品类物料任务</h3>
<h3 class="box-title">非产品/非半成品类物料任务</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" title="刷新" onclick="reloadSpecialTaskGrid()"><i class="fa fa-repeat"></i></button>
<button type="button" class="btn btn-box-tool" title="更多" onclick="showSpecialTask(1)"><i class="fa fa-bars"></i></button>
......
topsun-xt/src/main/webapp/biz/topsun/sap/base/bsnMessageList.js
View file @ 6b061492
......@@ -71,7 +71,7 @@ function doView(id,businessId,url) {
var signal = (url.indexOf("?") >= 0) ? "&" : "?";
UICtrl.addTabItem({
tabid: 'showNonProdApply'+id,
text: "非产品/非本成品类物料主数据"+title+"详情",
text: "非产品/非半成品类物料主数据"+title+"详情",
url: web_app.name+'/'+ url+signal+'bizId='+businessId+'&taskId='+id
//url: web_app.name + '/sapNonProdApply/showNonProdApply.job?isReadOnly=true&bizId='+id+"&isDetailPage=true"
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyClass.jsp
View file @ 6b061492
......@@ -12,7 +12,7 @@
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料分类信息维护" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料分类信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyCost.jsp
View file @ 6b061492
......@@ -11,7 +11,7 @@
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料成本信息维护" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料成本信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="meId"/> <!--状态-->
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDeptList.js
View file @ 6b061492
......@@ -88,7 +88,7 @@ function deleteHandler() {
function addHandler() {
UICtrl.addTabItem({
tabid: 'nonProdApply',
text: "非产品/非本成品类物料主数据维护申请",
text: "非产品/非半成品类物料主数据维护申请",
url: web_app.name + '/sapNonProdApply/forwardNonProdApplyDetail.job'
});
}
......@@ -96,7 +96,7 @@ function addHandler() {
function doView(id) {
UICtrl.addTabItem({
tabid: 'showNonProdApply'+id,
text: "非产品/非本成品类物料主数据维护申请详情",
text: "非产品/非半成品类物料主数据维护申请详情",
url: web_app.name + '/sapNonProdApply/showNonProdApply.job?bizId='+id+"&isDetailPage=true"
});
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDeptList.jsp
View file @ 6b061492
......@@ -14,7 +14,7 @@
<x:select name="yesorno" dictionary="yesorno"/>
</div>
<div id="layout">
<div position="center" title="非本成品类物料部门数据维护查询">
<div position="center" title="非半成品类物料部门数据维护查询">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="proofingApplyNo" required="false" label="申请单号" labelCol="1"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.jsp
View file @ 6b061492
......@@ -13,13 +13,13 @@
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<c:if test="${applyType==0}">
<x:billTitle title="非产品/非本成品类物料主数据维护申请表" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料主数据维护申请表" needStatus="false" needPerson="true"/>
</c:if>
<c:if test="${applyType==1}">
<x:billTitle title="非产品/非本成品类物料主数据变更申请表" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料主数据变更申请表" needStatus="false" needPerson="true"/>
</c:if>
<c:if test="${applyType==2}">
<x:billTitle title="非产品/非本成品类物料主数据扩展申请表" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料主数据扩展申请表" needStatus="false" needPerson="true"/>
</c:if>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyFinancial.jsp
View file @ 6b061492
......@@ -11,7 +11,7 @@
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料财务信息维护" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料财务信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js
View file @ 6b061492
......@@ -29,7 +29,7 @@ function loadNonProdApplyListGrid() {
UICtrl.addTabItem({
tabid: 'showNonProdApplyNext'+result.id,
text: "非产品/非本成品类物料主数据维护申请详情",
text: "非产品/非半成品类物料主数据维护申请详情",
url: web_app.name + url
});
}
......@@ -193,7 +193,7 @@ function deleteHandler() {
function addHandler() {
UICtrl.addTabItem({
tabid: 'nonProdApply',
text: "非产品/非本成品类物料主数据维护申请",
text: "非产品/非半成品类物料主数据维护申请",
url: web_app.name + '/sapNonProdApply/forwardNonProdApplyDetail.job'
});
}
......@@ -207,7 +207,7 @@ function doView(id,maintenanceType) {
}
UICtrl.addTabItem({
tabid: 'showNonProdApply'+id,
text: "非产品/非本成品类物料主数据"+title+"详情",
text: "非产品/非半成品类物料主数据"+title+"详情",
url: web_app.name + '/sapNonProdApply/showNonProdApply.job?isReadOnly=true&bizId='+id+"&isDetailPage=true"
});
}
......@@ -219,7 +219,7 @@ function modifyHandler(id,matnr) {
}
UICtrl.addTabItem({
tabid: 'nonProdApplyChange'+id,
text: "非产品/非本成品类物料主数据变更申请",
text: "非产品/非半成品类物料主数据变更申请",
url: web_app.name + '/sapNonProdApply/forwardNonProdApplyDetail.job?bizId='+id+"&modify=1"
});
}
......@@ -231,7 +231,7 @@ function extendedHandler(id,matnr) {
}
UICtrl.addTabItem({
tabid: 'nonProdApplyExtended',
text: "非产品/非本成品类物料主数据扩展申请",
text: "非产品/非半成品类物料主数据扩展申请",
url: web_app.name + '/sapNonProdApply/forwardNonProdApplyDetail.job?bizId='+id+"&extend=1"
});
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.jsp
View file @ 6b061492
......@@ -14,7 +14,7 @@
<x:select name="yesorno" dictionary="yesorno"/>
</div>
<div id="layout">
<div position="center" title="非本成品类物料主数据维护申请表查询">
<div position="center" title="非半成品类物料主数据维护申请表查询">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMRP.jsp
View file @ 6b061492
......@@ -12,7 +12,7 @@
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料MRP信息维护" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料MRP信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMass.jsp
View file @ 6b061492
......@@ -12,7 +12,7 @@
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料质量信息维护" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料质量信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @ 6b061492
......@@ -21,10 +21,10 @@
<x:billTitle title="非产品/非本成品类物料基本信息维护" needStatus="false" needPerson="true"/>
</c:if>
<c:if test="${applyType==1}">
<x:billTitle title="非产品/非本成品类物料变更基本信息维护" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料变更基本信息维护" needStatus="false" needPerson="true"/>
</c:if>
<c:if test="${applyType==2}">
<x:billTitle title="非产品/非本成品类物料扩展基本信息维护" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料扩展基本信息维护" needStatus="false" needPerson="true"/>
</c:if>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active" value=""/> <!--状态-->
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyProduce.jsp
View file @ 6b061492
......@@ -12,7 +12,7 @@
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料生产信息维护" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料生产信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyPurchase.jsp
View file @ 6b061492
......@@ -11,7 +11,7 @@
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料采购信息维护" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料采购信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplySale.jsp
View file @ 6b061492
......@@ -12,7 +12,7 @@
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料销售信息维护" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料销售信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyStore.jsp
View file @ 6b061492
......@@ -12,7 +12,7 @@
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料存储信息维护" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料存储信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyWarehouse.jsp
View file @ 6b061492
......@@ -12,7 +12,7 @@
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料仓库信息维护" needStatus="false" needPerson="true"/>
<x:billTitle title="非产品/非半成品类物料仓库信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active" value=""/> <!--状态-->
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @ 6b061492
......@@ -323,11 +323,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
String result = defaultHttpClient.execute(mapList, url);
List<Map<String, Object>> resultList = objectMapper.readValue(result, new TypeReference<List<Map<String, Object>>>() {
});
Map<String, Object> returnMap = resultList.get(0);
//推送SAP成功后，SAP会发给mes，并把消息返回。取数组下标1的是SAP创建成功返回消息。
if ("2".equals(returnMap.get("TYPE"))){
returnMap = resultList.get(1);
}
Map<String, Object> returnMap = resultList.get(1);
mapCopy(backMap,returnMap);
// resultMap.put("businessType", busiType);
// resultMap.put("parameter", JSON.toJSONString(map));
......@@ -347,6 +343,9 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
backStr="传输失败:" + backMap.get("MESSAGE");
backMap.put("MESSAGE",backStr);
nonProdApplyBaseInfoRepository.save(baseInfo);
//失败后创建者发送待办消息
Operator operator = operatorApplication.createOperatorByPersonMemberId(baseInfo.getPersonMemberId());
saveBsnMessageData(baseInfo,applyDept,operator,backMap.get("MESSAGE").toString());
//throw new RuntimeException(backStr);
}
} catch (Exception e) {
......@@ -357,8 +356,6 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
} finally {
sapMutualEpLogApplication.saveSapMutualEpLog(backMap);
// String createdById = "5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0";
Operator operator = operatorApplication.createOperatorByPersonMemberId(baseInfo.getPersonMemberId());
saveBsnMessageData(baseInfo,applyDept,operator,backMap.get("MESSAGE").toString());
return backStr;
}
......
topsun/src/main/resources/config/bpm/topsun/sapNonProdApplyProc.bpmn
View file @ 6b061492
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
<process id="sapNonProdApplyProc" name="非产品/非本成品类物料主数据维护" isExecutable="true">
<process id="sapNonProdApplyProc" name="非产品/非半成品类物料主数据维护" isExecutable="true">
<extensionElements>
<activiti:executionListener event="start" delegateExpression="#{nonProdApplyApplication}"></activiti:executionListener>
<activiti:executionListener event="end" delegateExpression="#{nonProdApplyApplication}"></activiti:executionListener>
</extensionElements>
<startEvent id="startevent1" name="Start"></startEvent>
<endEvent id="endevent1" name="End"></endEvent>
<userTask id="Apply" name="非产品/非本成品类物料主数据维护申请" activiti:formKey="sapNonProdApply/showNonProdApply.job">
<userTask id="Apply" name="非产品/非半成品类物料主数据维护申请" activiti:formKey="sapNonProdApply/showNonProdApply.job">
<extensionElements>
<activiti:taskListener event="all" delegateExpression="#{nonProdApplyApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{nonProdApplyApplication}"></activiti:taskListener>
</extensionElements>
</userTask>
<userTask id="Approve" name="非产品/非本成品类物料主数据维护审批" activiti:assignee="${assignee} " activiti:formKey="sapNonProdApply/showNonProdApply.job">
<userTask id="Approve" name="非产品/非半成品类物料主数据维护审批" activiti:assignee="${assignee} " activiti:formKey="sapNonProdApply/showNonProdApply.job">
<extensionElements>
<activiti:taskListener event="all" delegateExpression="#{nonProdApplyApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{nonProdApplyApplication}"></activiti:taskListener>
......
topsun/src/main/resources/config/bpm/topsun/sapNonProdExtendProc.bpmn
View file @ 6b061492
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
<process id="sapNonProdExtendProc" name="非产品/非本成品类物料主数据扩展" isExecutable="true">
<process id="sapNonProdExtendProc" name="非产品/非半成品类物料主数据扩展" isExecutable="true">
<extensionElements>
<activiti:executionListener event="start" delegateExpression="#{nonProdApplyApplication}"></activiti:executionListener>
<activiti:executionListener event="end" delegateExpression="#{nonProdApplyApplication}"></activiti:executionListener>
</extensionElements>
<startEvent id="startevent1" name="Start"></startEvent>
<endEvent id="endevent1" name="End"></endEvent>
<userTask id="Apply" name="非产品/非本成品类物料主数据扩展申请" activiti:formKey="sapNonProdApply/showNonProdApply.job">
<userTask id="Apply" name="非产品/非半成品类物料主数据扩展申请" activiti:formKey="sapNonProdApply/showNonProdApply.job">
<extensionElements>
<activiti:taskListener event="all" delegateExpression="#{nonProdApplyApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{nonProdApplyApplication}"></activiti:taskListener>
</extensionElements>
</userTask>
<userTask id="Approve" name="非产品/非本成品类物料主数据扩展审批" activiti:assignee="${assignee} " activiti:formKey="sapNonProdApply/showNonProdApply.job">
<userTask id="Approve" name="非产品/非半成品类物料主数据扩展审批" activiti:assignee="${assignee} " activiti:formKey="sapNonProdApply/showNonProdApply.job">
<extensionElements>
<activiti:taskListener event="all" delegateExpression="#{nonProdApplyApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{nonProdApplyApplication}"></activiti:taskListener>
......
topsun/src/main/resources/config/bpm/topsun/sapNonProdModifyProc.bpmn
View file @ 6b061492
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
<process id="sapNonProdModifyProc" name="非产品/非本成品类物料主数据变更" isExecutable="true">
<process id="sapNonProdModifyProc" name="非产品/非半成品类物料主数据变更" isExecutable="true">
<extensionElements>
<activiti:executionListener event="start" delegateExpression="#{nonProdApplyApplication}"></activiti:executionListener>
<activiti:executionListener event="end" delegateExpression="#{nonProdApplyApplication}"></activiti:executionListener>
</extensionElements>
<startEvent id="startevent1" name="Start"></startEvent>
<endEvent id="endevent1" name="End"></endEvent>
<userTask id="Apply" name="非产品/非本成品类物料主数据变更申请" activiti:formKey="sapNonProdApply/showNonProdApply.job">
<userTask id="Apply" name="非产品/非半成品类物料主数据变更申请" activiti:formKey="sapNonProdApply/showNonProdApply.job">
<extensionElements>
<activiti:taskListener event="all" delegateExpression="#{nonProdApplyApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{nonProdApplyApplication}"></activiti:taskListener>
</extensionElements>
</userTask>
<userTask id="Approve" name="非产品/非本成品类物料主数据变更审批" activiti:assignee="${assignee} " activiti:formKey="sapNonProdApply/showNonProdApply.job">
<userTask id="Approve" name="非产品/非半成品类物料主数据变更审批" activiti:assignee="${assignee} " activiti:formKey="sapNonProdApply/showNonProdApply.job">
<extensionElements>
<activiti:taskListener event="all" delegateExpression="#{nonProdApplyApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{nonProdApplyApplication}"></activiti:taskListener>
......
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