Skip to content

T
topsun-bpm
Commit 05fa5b26 authored by wanghang's avatar wanghang
Browse files
Options

非产品数据维护申请

parent 885d3f3c
Hide whitespace changes
Inline Side-by-side
Showing with 197 additions and 99 deletions
topsun-xt/src/main/webapp/biz/topsun/proofing/technologyAndBom/technologyAndBom.js
View file @ 05fa5b26
//是否开启联动事件
var isDetail=false,isComplete=null;
//定义生成表格的参数对象
var bomObj={
parms:{},
......@@ -23,7 +24,21 @@ var technologyObj={
required: true
}
}
]
],
linkage:function (data){
debugger
let result = data.Rows.length>0?data.Rows[0].technologyId:-1; // 获取选中行
processObj.parms = { technologyId: result };
processBomObj.parms = { technologyId: result };
if(processObj.gridManager==null){
loadProofingApplyGrid(processObj);
loadProofingApplyGrid(processBomObj);
}else {
reloadGrid(processObj);
reloadGrid(processBomObj);
}
}
}
var processObj={
parms:{},
......@@ -146,19 +161,15 @@ function loadProofingApplyGrid(obj) {
height: 400,
heightDiff: -8,
checkbox: true,
async: false,
fixedCellHeight: true,
selectRowButtonOnly: true,
onAfterShowData :function(data) {
debugger
console.log(obj.gridManager)
console.log(data)
console.log("1执行了")
// 确保 onAfterShowData 执行完成后才执行的代码
onSuccess: function (data){
if(obj.linkage!=null){
obj.linkage(data)
}
}
});
UICtrl.setSearchAreaToggle(obj.gridManager);
return obj;
}
......@@ -179,6 +190,8 @@ function showTable(params) {
// 根据key来确定是"apply"还是"make"
let a=key.includes("Apply")?"proofingApply":"proofingMake";
technologyObj.parms = { [a+"Id"]: value };
let promise = new Promise(function(resolve, reject) {
if (technologyObj.gridManager != null) {
reloadGrid(technologyObj);
......@@ -212,40 +225,11 @@ function showTable(params) {
//根据产品编号展示产品的艺表格
function showTechnologyTable(productId){
isDetail=false;
if(technologyObj.gridManager!=null){
technologyObj.parms={productId:productId}
technologyObj.parms = {productId: productId};
if(technologyObj.gridManager==null) {
loadProofingApplyGrid(technologyObj);
}{
reloadGrid(technologyObj);
let result = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
processObj.parms = { technologyId: result.technologyId };
processBomObj.parms = { technologyId: result.technologyId };
reloadGrid(processObj);
reloadGrid(processObj);
//产品编号每次发生变动后删除残留的工序数据
if(processObj.gridManager!=null){
processObj.parms={technologyId:-1};//手动切换gridManager
reloadGrid(processObj);
}
if(processBomObj.gridManager!=null){
processBomObj.parms={a:-1};//手动切换gridManager
reloadGrid(processBomObj);
}
}else {
technologyObj.parms={productId:productId};
loadProofingApplyGrid(technologyObj);
debugger
setTimeout(function() {
let result = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
processObj.parms = { technologyId: result.technologyId };
processBomObj.parms = { technologyId: result.technologyId };
loadProofingApplyGrid(processObj);
loadProofingApplyGrid(processBomObj);
}, 2000);
}
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.js
View file @ 05fa5b26
var gridManager = null;
$(document).ready(function () {
initialize();
});
function initialize(){
let isDetailPage = ($("#isDetailPage").val() === "true");
if (isDetailPage) {
$("#jobPageTop").hide();
}
}
/**
* 流程引擎回调设置打样的id
* @param value 打样申请的id
*/
function setId(id) {
$("#id").val(id);
}
/**
* 流程引擎获取打样申请id的回掉方法。
* @return 打样申请的id
*/
function getId() {
return $("#id").val() || "";
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.jsp
View file @ 05fa5b26
......@@ -4,31 +4,31 @@
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
<x:script src='/biz/topsun/sap/statsIndicators/statsIndicators.js'/>
<x:script src='/biz/topsun/sap/nonProdApply/nonProdApplyDetail.js'/>
</head>
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:billTitle title="非产品/非本成品类物料主数据维护申请表" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id"/>
<x:hidden name="billCode"/>
<x:hidden name="fillinDate" type="datetime"/>
<%-- <x:hidden name="billCode"/>--%>
<%-- <x:hidden name="fillinDate" type="datetime"/>--%>
<x:hidden name="fullId"/>
<x:hidden name="organId"/>
<x:hidden name="organName"/>
<x:hidden name="deptId"/>
<x:hidden name="deptName"/>
<%-- <x:hidden name="deptName"/>--%>
<x:hidden name="positionId"/>
<x:hidden name="positionName"/>
<x:hidden name="personMemberId"/>
<x:hidden name="personMemberName"/>
<%-- <x:hidden name="personMemberName"/>--%>
<x:title title="申请人填写区域" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="applicationNo" label="申请单编号" labelCol="1" readonly="true" fieldCol="2"/>
<x:inputC name="applicant" label="申请人" labelCol="1" fieldCol="2"/>
<x:inputC name="department" label="申请部门" labelCol="1" fieldCol="2"/>
<x:inputC name="applicationDate" label="申请日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
<x:inputC name="billCode" label="申请单编号" labelCol="1" readonly="true" fieldCol="2"/>
<x:inputC name="personMemberName" label="申请人" readonly="true" labelCol="1" fieldCol="2"/>
<x:inputC name="deptName" label="申请部门" readonly="true" labelCol="1" fieldCol="2"/>
<x:inputC name="fillinDate" label="申请日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
......@@ -46,15 +46,14 @@
<x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
<x:inputC name="material" label="材质" labelCol="1" fieldCol="2"/>
<x:inputC name="layout" label="版式" labelCol="1" fieldCol="2"/>
<x:inputC name="design" label="版式" labelCol="1" fieldCol="2"/>
<x:inputC name="size" label="尺码" labelCol="1" fieldCol="2"/>
<x:inputC name="brand" label="品牌" labelCol="1" fieldCol="2"/>
<x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="2"/>
<x:selectC name="itemAttributes" label="物品属性" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
</div>
<div class="hg-form-row">
<x:checkboxListC name="businessUsage" label="业务状态" dictionary="serviceusage" labelCol="1"
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11"/>
</div>
<div class="hg-form-row">
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js
View file @ 05fa5b26
var gridManager = null;
$(document).ready(function () {
debugger
initializateUI()
loadNonProdApplyListGrid();
// loadNonProdApplyListGrid();
// console.log(gridManager)
})
function initializateUI() {
UICtrl.layout("#layout", {leftWidth: 3});
......@@ -22,20 +22,20 @@ function loadNonProdApplyListGrid() {
{display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "维护类型", name: "maintenanceType", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "维护类型", name: "maintenanceTypeTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "批准人", name: "approver", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "批准日期", name: "approvalDate", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "通用品名", name: "genericName", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "适用标准", name: "applicableStandard", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "基本计量单位", name: "baseUnit", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "基本计量单位", name: "baseUnitTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "规格", name: "specifications", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "材质", name: "material", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "版式", name: "layout", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "版式", name: "design", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "尺码", name: "size", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "品牌", name: "brand", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "用途", name: "materialUsage", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "物品属性", name: "itemAttributes", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "业务用途", name: "business_usage", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "物品属性", name: "itemAttributesTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "业务用途", name: "businessUsageTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "文本说明", name: "textDescription", width: 140, minWidth: 60, type: "string", align: "left"},
],
......@@ -48,15 +48,25 @@ function loadNonProdApplyListGrid() {
height: "100%",
heightDiff: -8,
checkbox: true,
async: false,
fixedCellHeight: true,
selectRowButtonOnly: true,
onDblClickRow: function (data, rowindex, rowobj) {
doView(data.id);
},
onAfterShowData: function (data){
console.log(data)
}
});
UICtrl.setSearchAreaToggle(gridManager);
}
function a() {
debugger
loadNonProdApplyListGrid();
console.log(gridManager)
}
function query(obj) {
var param = $(obj).formToJSON();
UICtrl.gridSearch(gridManager, param);
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.jsp
View file @ 05fa5b26
......@@ -8,6 +8,7 @@
</head>
<body>
<div class="container-fluid">
<div onclick="a()">a</div>
<div class="ui-hide">
<x:select name="processType" dictionary="processType"/>
<x:select name="yesorno" dictionary="yesorno"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp 0 → 100644
View file @ 05fa5b26
<%@ 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"/>
<x:script src='/biz/topsun/sap/statsIndicators/statsIndicators.js'/>
</head>
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:billTitle title="非产品/非本成品类物料主数据维护申请表" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id"/>
<%-- <x:hidden name="billCode"/>--%>
<%-- <x:hidden name="fillinDate" type="datetime"/>--%>
<x:hidden name="fullId"/>
<x:hidden name="organId"/>
<x:hidden name="organName"/>
<x:hidden name="deptId"/>
<%-- <x:hidden name="deptName"/>--%>
<x:hidden name="positionId"/>
<x:hidden name="positionName"/>
<x:hidden name="personMemberId"/>
<%-- <x:hidden name="personMemberName"/>--%>
<x:title title="基本信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="billCode" label="申请单编号" labelCol="1" readonly="true" fieldCol="2"/>
<x:inputC name="approvalStatus" label="批准状态" readonly="true" labelCol="1" fieldCol="2"/>
<x:inputC name="personMemberName" label="填写人" readonly="true" labelCol="1" fieldCol="2"/>
<x:inputC name="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType"/>
</div>
</div>
<x:title title="维护基本信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="" label="物品编码" labelCol="1" fieldCol="5"/>
<x:selectC name="itemAttributes" label="物品类型" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
<x:inputC name="" label="物料组" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="集团级删除" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="产品组" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="项目类别组" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="汉语品名" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="批次管理" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="包装物料组" labelCol="1" fieldCol="2"/>
<x:inputC name="applicableStandard" label="适用标准" labelCol="1" fieldCol="5"/>
<x:inputC name="" label="英语品名" labelCol="1" fieldCol="2"/>
<x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="" label="存储条件" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="毛重" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="重量单位" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="体积" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="体积单位" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="有效时间标识" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="总有效期" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="旧料号" labelCol="1" fieldCol="2"/>
<x:inputC name="design" label="版式" labelCol="1" fieldCol="2"/>
<x:inputC name="size" label="尺码" labelCol="1" fieldCol="2"/>
<x:inputC name="brand" label="品牌" labelCol="1" fieldCol="2"/>
<x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="最小货架寿命" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="工厂" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="库存地点" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="销售组织" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="分销渠道" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="仓库号" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="存储类型" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="文本说明" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11"/>
</div>
<div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div>
</div>
</form>
</body>
</html>
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingTechnologyRelevancyController.java
View file @ 05fa5b26
......@@ -107,14 +107,15 @@ public class ProofingTechnologyRelevancyController extends CommonController {
if(!StringUtil.isBlank(proofingApplyProcessMaterialQueryRequest.getProofingApplyTechnologyId())){
return toResult(proofingApplyProcessMaterialApplication.slicedProofingApplyProcessMaterial(proofingApplyProcessMaterialQueryRequest));
}else if(!StringUtil.isBlank(technologyId)){
return toResult(tempData());
return toResult(tempData(technologyId));
}else if(!StringUtil.isBlank(proofingMakeProcessMaterialQueryRequest.getProofingMakeTechnologyId())){
return toResult(proofingMakeProcessMaterialApplication.slicedProofingMakeProcessMaterial(proofingMakeProcessMaterialQueryRequest));
}
return toResult(null);
}
public Map<String,Object> tempData(){
public Map<String,Object> tempData(String id){
if ("-1".equals(id))return null;
Map<String, Object> map = new HashMap<>();
List<ProcessMaterialItem> list = new ArrayList<>();
for (int i = 0; i < 5; i++) {
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java
View file @ 05fa5b26
package com.huigou.topsun.sap.nonProdApply.application.impl;
import com.huigou.cache.DictUtil;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.data.query.model.QueryModel;
import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyApplication;
import com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo;
import com.huigou.topsun.sap.nonProdApply.domain.query.NonProdApplyBaseInfoQueryRequest;
......@@ -99,7 +101,13 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
@Override
public Map<String, Object> slicedNonProdApplyBaseInfoQuery(NonProdApplyBaseInfoQueryRequest query) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedNonProdApplyBaseInfoQuery");
return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor, query);
QueryModel model = this.sqlExecutorDao.getQueryModel(queryDescriptor, query);
model.putDictionary("maintenanceType", DictUtil.getDictionary("maintainType"));
model.putDictionary("baseUnit", DictUtil.getDictionary("measuringUnit"));
model.putDictionary("itemAttributes", DictUtil.getDictionary("suppliesType"));
model.putDictionary("businessUsage", DictUtil.getDictionary("serviceusage"));
return this.sqlExecutorDao.executeSlicedQuery(model);
}
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java
View file @ 05fa5b26
......@@ -25,28 +25,10 @@ public class NonProdApplyController extends CommonController {
protected String getPagePath() {
return "/biz/topsun/sap/nonProdApply/";
}
@Autowired
NonProdApplyApplication nonProdApplyApplication;
public static String generateApplicationNo() {
String dateStamp =getCurrentDate("yyyyMMdd");
// 生成10位随机数
String randomNumber = String.format("%010d", (int) (Math.random() * 10000000000L));
// 组合申请单编号
String applicationNumber = dateStamp + "-" + "M" + "-" + randomNumber;
return applicationNumber;
}
public static String getCurrentDate(String format) {
Date date = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat(format);
String formattedDate = dateFormat.format(date);
return formattedDate;
}
public String forwardNonProdApplyList(){
return forward("nonProdApplyList");
}
......@@ -58,8 +40,6 @@ public class NonProdApplyController extends CommonController {
nonProdApplyBaseInfo.setStatusId(BizBillStatus.APPLYING.getId());
Operator operator = getOperator();//获取当前操作员的详情信息
nonProdApplyBaseInfo.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
this.putAttribute("applicationNo",generateApplicationNo());
this.putAttribute("applicationDate",getCurrentDate("yyyy/MM/dd"));
return forward("nonProdApplyDetail",nonProdApplyBaseInfo);
}
......@@ -81,7 +61,7 @@ public class NonProdApplyController extends CommonController {
String isDetailPage = sdo.getString("isDetailPage");
if("true".equals(isDetailPage)) this.putAttribute("isDetailPage","true");
NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyApplication.loadNonProdApplyBaseInfoById(id);
return forward("statsIndicators", nonProdApplyBaseInfo);
return forward("nonProdApplyDetail", nonProdApplyBaseInfo);
}
public String deleteNonProdApply(){
......@@ -91,4 +71,7 @@ public class NonProdApplyController extends CommonController {
return success();
}
}
\ No newline at end of file
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/NonProdApplyBaseInfo.java
View file @ 05fa5b26
......@@ -72,7 +72,7 @@ public class NonProdApplyBaseInfo extends FlowBillAbstractEntity {
/**
* 版式
*/
private String layout;
private String design;
/**
* 尺码
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/query/NonProdApplyBaseInfoQueryRequest.java
View file @ 05fa5b26
......@@ -56,7 +56,7 @@ public class NonProdApplyBaseInfoQueryRequest extends FlowBillSuperQueryRequest
/**
* 版式
*/
private String layout;
private String design;
/**
* 尺码
......
topsun/src/main/resources/config/bpm/topsun/sapNonProdApplyProc.bpmn
View file @ 05fa5b26
<?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="sapStatsIndicatorsProc" name="统计指标" isExecutable="true">
<process id="sapNonProdApplyProc" name="非产品/非本成品类物料主数据维护" isExecutable="true">
<extensionElements>
<activiti:executionListener event="start" delegateExpression="#{sapStatsIndicatorsApplication}"></activiti:executionListener>
<activiti:executionListener event="end" delegateExpression="#{sapStatsIndicatorsApplication}"></activiti:executionListener>
<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="sapStatsIndicators/showStatsIndicators.job">
<userTask id="Apply" name="非产品/非本成品类物料主数据维护申请" activiti:formKey="sapNonProdApply/showNonProdApply.job">
<extensionElements>
<activiti:taskListener event="all" delegateExpression="#{sapStatsIndicatorsApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{sapStatsIndicatorsApplication}"></activiti:taskListener>
<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="sapStatsIndicators/showStatsIndicators.job">
<userTask id="Approve" name="非产品/非本成品类物料主数据维护审批" activiti:assignee="${assignee} " activiti:formKey="sapNonProdApply/showNonProdApply.job">
<extensionElements>
<activiti:taskListener event="all" delegateExpression="#{sapStatsIndicatorsApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{sapStatsIndicatorsApplication}"></activiti:taskListener>
<activiti:taskListener event="all" delegateExpression="#{nonProdApplyApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{nonProdApplyApplication}"></activiti:taskListener>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" activiti:collection="handlerList" activiti:elementVariable="assignee">
<completionCondition>${chiefApprovePassed}</completionCondition>
......@@ -40,8 +40,8 @@
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${!approvePassed}]]></conditionExpression>
</sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_sapStatsIndicatorsProc">
<bpmndi:BPMNPlane bpmnElement="sapStatsIndicatorsProc" id="BPMNPlane_sapStatsIndicatorsProc">
<bpmndi:BPMNDiagram id="BPMNDiagram_sapNonProdApplyProc">
<bpmndi:BPMNPlane bpmnElement="sapNonProdApplyProc" id="BPMNPlane_sapNonProdApplyProc">
<bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
<omgdc:Bounds height="35.0" width="35.0" x="355.0" y="50.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
......
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