Skip to content

T
topsun-bpm
Commit 4682089d authored by wanghang's avatar wanghang
Browse files
Options

采购订单

parent 93f6728b
Show whitespace changes
Inline Side-by-side
Showing with 1480 additions and 660 deletions
.idea/mybatisx/templates.xml
View file @ 4682089d
......@@ -48,16 +48,16 @@
<option name="tableUIInfoList">
<list>
<TableUIInfo>
<option name="className" value="BsnMessageSponsor" />
<option name="tableName" value="bsn_message_sponsor" />
<option name="className" value="SapPurchaseItem" />
<option name="tableName" value="sap_purchase_item" />
</TableUIInfo>
<TableUIInfo>
<option name="className" value="BsnMessageExecute" />
<option name="tableName" value="bsn_message_execute" />
<option name="className" value="SapPurchaseOrder" />
<option name="tableName" value="sap_purchase_order" />
</TableUIInfo>
<TableUIInfo>
<option name="className" value="BsnMessageReject" />
<option name="tableName" value="bsn_message_reject" />
<option name="className" value="SapPurchaseOrderItem" />
<option name="tableName" value="sap_purchase_order_item" />
</TableUIInfo>
</list>
</option>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.js
View file @ 4682089d
......@@ -351,7 +351,7 @@ var tableArray = [
//创建表格（参数、列、插入的节点、数据源）
function loadGrid(obj) {
var toolbarOptions =null;
// if(obj.node=="reimbursementApplierGrid") {
// if(obj.node=="reimbursementApplierGrid") {//只有第一个表格含工具栏
toolbarOptions= UICtrl.getDefaultToolbarOptions({
addHandler: function () {
tableArray.forEach((item) => {
......@@ -381,7 +381,8 @@ function loadGrid(obj) {
fixedCellHeight: true,
selectRowButtonOnly: true,
onBeforeCheckRow: function (checked, data) {
//同时选定所有表格中的对应列
debugger
//同时选定或取消所有表格中的对应行
tableArray.forEach((item) => {
let rows = item.gridManager.rows;
let row = {};
......@@ -390,8 +391,29 @@ function loadGrid(obj) {
row = temp;
}
})
item.gridManager.select(row);
checked?item.gridManager.select(row):item.gridManager.unselect(row);
})
return false;//阻止默认事件、防止某个表格的对应行被多次选中
},
onBeforeCheckAllRow: function (a,b){
// console.log(b)
// $(b).addClass("l-checked")
// debugger
//同时全选、同时取消全选
// tableArray.forEach((item) => {
// let hrow=$(item.gridManager.element);//全选框
// console.log(hrow)
// console.log(item.gridManager.element)
//
// let checked= !hrow.hasClass("l-checked");
// $(hrow).toggleClass("l-checked",checked);
// let rows = item.gridManager.selected;
// rows.forEach((row) => {
// checked?item.gridManager.select(row):item.gridManager.unselect(row);
// })
// })
return false;//阻止默认事件
}
});
UICtrl.setSearchAreaToggle(obj.gridManager);
......@@ -492,9 +514,8 @@ function useArrayTable(func, ...data) {
return results;
}
//获取序号当前值
//获取最新子序号（维护实体的标识）
function getZepItemNo(){
debugger
let result =getTableDateAll(tableArray[tableArray.length-1]);
let zepItemNo="001";
if(result.length>0){
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ 4682089d
......@@ -203,8 +203,6 @@ function getExtendedData() {
debugger
let msg = "[";
let isUndefined = false
let deptStaffResult = DataUtil.getGridData({
gridManager: gridManager,
isAllData: true,
......@@ -228,9 +226,10 @@ function getExtendedData() {
function rejectForm() {
debugger
$('#auditForm').ajaxSubmit({
url: web_app.name + '/sapNonProdApplyNext/distributeSapNonProdApplyDept.ajax',
param: {},
url: web_app.name + '/sapNonProdApplyNext/rejectNonProdApplyDept.ajax',
param: {meId:getMeId()},
success: function (data) {
Public.successTip("已驳回！");
_self.close();
......@@ -244,7 +243,7 @@ function rejectForm() {
* 根据选择的驳回的部门生成输入框
*/
function loadRejectReasonBox() {
$('input[name="bu2"]').change(function () {
$('input[name="auditDept"]').change(function () {
let val = $(this).val()
let textData = $(this).parent().text().trim()
if (this.checked) {
......@@ -255,10 +254,10 @@ function loadRejectReasonBox() {
// 元素不存在
let box = `<div id="id_${val}">
<div class="col-xs-4 col-sm-2" style="height:60px;">
<label class="hg-form-label" name="text_${val}" title="[${textData}]驳回原因">[${textData}]驳回原因&nbsp;:</label>
<label class="hg-form-label" name="${val}" title="[${textData}]驳回原因">[${textData}]驳回原因&nbsp;:</label>
</div>
<div class="col-xs-8 col-sm-10 col-warp col-white-bg" style="height:60px;">
<textarea name="text_${val}" label="[${textData}]驳回原因" id="text_${val}"></textarea>
<textarea name="${val}" label="[${textData}]驳回原因" id="text_${val}"></textarea>
</div>
</div>`;
$("#rejectReasonBox").append(box)
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @ 4682089d
......@@ -265,7 +265,7 @@
</div>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:checkboxListC name="bu2" label="驳回部门" list="bu" labelCol="2"
<x:checkboxListC name="auditDept" label="驳回部门" list="auditDeptMap" labelCol="2"
fieldCol="10"/>
</div>
<div id="rejectReasonBox"></div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.js 0 → 100644
View file @ 4682089d
var itemGridManager = null;
$(function () {
});
function getId() {
return $('#id').val();
}
function setId(value) {
$("#id").val(value);
}
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.jsp 0 → 100644
View file @ 4682089d
<%--采购申请--%>
<%@ page contentType="text/html; charset=utf-8" language="java" %>
<%@ 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,dateTime,combox,attachment,commonTree,comboDialog"/>
<x:script src="/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.js"/>
</head>
<body>
<div class="container-fluid">
<x:billTitle title="采购申请" needStatus="true" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id"/>
<x:hidden name="version"/>
<x:hidden name="billCode"/>
<x:hidden name="fillinDate"/>
<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:hidden name="statusId"/>
<x:hidden name="bsart"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="ebeln" label="采购订单号码" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="bsart" label="采购订单类型" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="batxt" label="采购订单类型描述" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="purchaseOrderId" label="id" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="ebelp" label="项目编号" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="pstyp" label="项目类别" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="ptext" label="项目类别描述" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="knttp" label="科目分配类别" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="knttx" label="科目分配类别描述" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="matnr" label="物料号" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="matkl" label="物料组" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="wgbez" label="物料组描述" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="menge" label="采购订单数量" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="meins" label="采购订单计量单位" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="msehl" label="单位描述" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="eindt" label="要求交货日期" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="werks" label="工厂" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="name1" label="名称" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="lgort" label="库存地点" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="lgobe" label="库存地点的描述" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="ekgrp" label="采购组" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="eknam" label="采购组描述" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="netpr" label="价格" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="peinh" label="价格单位" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="mwskz" label="税码" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="waers" label="币种" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="netwr" label="总价" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="retpo" label="退货项目" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="sakto" label="总账科目" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="kostl" label="成本中心" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="anln1" label="主资产号" readonly="false" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="anln2" label="资产次级编号" readonly="false" labelCol="1" fieldCol="2" required="true"/>
</div>
</div>
</form>
</div>
</body>
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.js 0 → 100644
View file @ 4682089d
var purchaseOrderGridManager = null;
$(document).ready(function () {
initUI();
initPurchaseListGrid();
}
);
function initUI() {
UICtrl.initDefaultLayout();
}
function initPurchaseListGrid() {
// var toolbarOptions = UICtrl.getDefaultToolbarOptions({
// addHandler: addHandler,
// });
purchaseOrderGridManager = UICtrl.grid('#purchaseOrderGrid', {
columns: [
{display: "状态", name: "statusTextView", width: "100", align: "left", type: "string"}
, {display: "id", name: "id", width: "140", align: "left", type: "string", hide: true}
, {display: "需求跟踪编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "center"}
, {display: "采购申请类型描述", name: "batxt", width: 150, minWidth: 60, type: "string", align: "center"}
, {display: "采购申请编号", name: "banfn", width: 150, minWidth: 60, type: "string", align: "center"}
],
dataAction: 'server',
url: web_app.name + '/sapPurchaseOrder/slicedSapPurchaseOrderList.ajax?',
//parms: {requireItemId: $("#prepareItemId").val()},
toolbar: toolbarOptions,
width: '99.8%',
height: '100%',
pageSize: 100,
heightDiff: -4,
//sortName: 'lastModifiedDate',
//sortOrder: 'desc',
checkbox: true,
usePager: true,
rownumbers: true,
enabledEdit: false,
fixedCellHeight: true,
selectRowButtonOnly: true,
enableObjectBag: true,
onSuccess: function (data) {
if (data.error) {
Public.tip(data.error);
}
}
,
onDblClickRow: function (data, rowindex, rowobj) {
viewHandler(data.id);
},
onAfterShowData: function (currentData) {
}
}
);
UICtrl.setSearchAreaToggle(purchaseOrderGridManager);
}
/**
* 查看采购订单详情
* @param id 采购订单id
* @returns {boolean}
*/
function viewHandler(id) {
if (!id) {
var row = DataUtil.getSelectedRow(purchaseOrderGridManager);
if (!row) {
return row;
}
id = row.id;
}
UICtrl.addTabItem({
tabid: 'viewPurchase' + id,
text: '查看采购订单',
url: web_app.name + '/sapPurchaseOrder/showSapPurchaseOrderDetail.job?bizId=' + id
});
}
//
// function addHandler() {
// UICtrl.addTabItem({
// tabid: 'addPurchase',
// text: '新增采购审批',
// url: web_app.name + '/sapPurchaseOrder/forwardSapPurchaseOrderDetail.job'
// });
// }
function reloadPurchaseGrid() {
var params = $("#queryMainForm").formToJSON();
UICtrl.gridSearch(purchaseOrderGridManager, params);
}
function query(obj) {
var param = $(obj).formToJSON();
UICtrl.gridSearch(purchaseOrderGridManager, param);
}
function resetForm(obj) {
$(obj).formClean();
}
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.jsp 0 → 100644
View file @ 4682089d
<%@ 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,dateTime,combox,attachment,commonTree,comboDialog"/>
<script src='<c:url value="/lib/jquery/jquery.comboDialog.js"/>' type="text/javascript"></script>
<script src='<c:url value="/lib/jquery/jquery.commonTree.js"/>' type="text/javascript"></script>
<script src='<c:url value="/lib/jquery/jquery.flexField.js"/>' type="text/javascript"></script>
<script src='<c:url value="/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.js"/>' type="text/javascript"></script>
</head>
<body>
<div class="container-fluid">
<div id="layout">
<div position="center" title="">
<x:title title="搜索" hideTable="queryMainForm"/>
<form class="hg-form ui-show" method="post" action="" id="queryMainForm">
<div class="hg-form-row">
<x:inputC name="billCode" label="需求跟踪编号" labelCol="1"/>
</div>
<x:searchButtons/>
</form>
<x:title title="采购审批明细" hideTable="#purchaseOrderGrid" name="list"/>
<div id="purchaseOrderGrid" style="margin:2px;"></div>
</div>
</div>
</div>
</body>
</html>
topsun/src/main/java/com/huigou/topsun/base/DefinitionHomepageTaskData.java
View file @ 4682089d
......@@ -30,16 +30,17 @@ public class DefinitionHomepageTaskData extends BaseApplication {
public Map<String, Object> replaceQueryTrackingTasks(){
// 当前登录用户是否以任务发起人的身份发起过任务
List<BsnMessageSponsor> messageSponsors = bsnMessageApplication.queryFinishBsnMessageSponsor();
if (!messageSponsors.isEmpty()) {
if (messageSponsors!=null&&!messageSponsors.isEmpty()) {
// 若有发起过任务且所有的执行人执行完毕，则由系统创建一份审批任务给当前用户
for (BsnMessageSponsor sponsor : messageSponsors) {
List<BsnMessageExecute> executes = new ArrayList<>();
//验证状态防止多次创建任务
if (sponsor.getStatus() == 0) {
// 封装审批任务
BsnMessageExecute execute = new BsnMessageExecute();
execute.setCreateDate(new Date());
execute.setUpdateDate(new Date());
execute.setTaskExecute(this.getOperator().getUserId());
execute.setTaskDescribe("[完成]-待审核");
execute.setTaskDescribe("各单位已完成[发起人审核]");
execute.setBusinessCode("system");
execute.setActive(ActiveStatus.UNFINISHED.getValue());
executes.add(execute);
......
topsun/src/main/java/com/huigou/topsun/base/WorkflowApplicationImplOverride.java deleted 100644 → 0
View file @ 93f6728b
package com.huigou.topsun.base;
import com.huigou.topsun.base.bsnMessage.appliction.BsnMessageApplication;
import com.huigou.topsun.base.bsnMessage.domain.ActiveStatus;
import com.huigou.topsun.base.bsnMessage.domain.BsnMessageExecute;
import com.huigou.topsun.base.bsnMessage.domain.BsnMessageSponsor;
import com.huigou.uasp.bmp.opm.application.OrgApplication;
import com.huigou.uasp.bpm.BatchAdvanceParameter;
import com.huigou.uasp.bpm.TaskStatus;
import com.huigou.uasp.bpm.engine.application.ActApplication;
import com.huigou.uasp.bpm.engine.application.ProcUnitHandlerApplication;
import com.huigou.uasp.bpm.engine.application.impl.WorkflowApplicationImpl;
import com.huigou.uasp.bpm.engine.domain.model.CoordinationTask;
import com.huigou.uasp.bpm.engine.domain.model.ProcUnit;
import com.huigou.uasp.bpm.engine.domain.model.ProcUnitHandler;
import com.huigou.uasp.bpm.engine.domain.query.ProcunitHandlerQueryRequest;
import com.huigou.uasp.bpm.engine.domain.query.TaskDetail;
import com.huigou.util.SDO;
import org.activiti.engine.*;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Comment;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 优先注入此类替换huigou包下该类型bean
*/
@Primary
@Service
public class WorkflowApplicationImplOverride extends WorkflowApplicationImpl {
@Autowired
BsnMessageApplication bsnMessageApplication;
@Override
public Map<String, Object> queryTrackingTasks() {
//当前登录用户是否以任务发起人的身份发起过任务
List<BsnMessageSponsor> messageSponsors = bsnMessageApplication.queryFinishBsnMessageSponsor();
if(!messageSponsors.isEmpty()) {
//若有发起过任务且所有的执行人执行完毕，则由系统创建一份审批任务给当前用户
for (BsnMessageSponsor sponsor : messageSponsors) {
List<BsnMessageExecute> executes = new ArrayList<>();
if(sponsor.getStatus()==0){
//封装审批任务
BsnMessageExecute execute = new BsnMessageExecute();
execute.setCreateDate(new Date());
execute.setTaskExecute(this.getOperator().getUserId());
execute.setTaskDescribe("[完成]-待审核");
execute.setBusinessCode("system");
execute.setActive(ActiveStatus.UNFINISHED.getValue());
executes.add(execute);
sponsor.setStatus(1);//发起人审核
sponsor.setExecutes(executes);
//在同一个任务流程下创建一份发起人自己的审批任务
bsnMessageApplication.saveBsnMessageSponsor(sponsor);
}
}
}
//获取任务执行人为当前用户的任务
return this.bsnMessageApplication.queryExecuteBsnMessage();
}
public WorkflowApplicationImplOverride() {
super();
}
@Override
public OrgApplication getOrgApplication() {
return super.getOrgApplication();
}
@Override
public ActApplication getActApplication() {
return super.getActApplication();
}
@Override
public void setRepositoryService(RepositoryService repositoryService) {
super.setRepositoryService(repositoryService);
}
@Override
public RepositoryService getRepositoryService() {
return super.getRepositoryService();
}
@Override
public void setFormService(FormService formService) {
super.setFormService(formService);
}
@Override
public FormService getFormService() {
return super.getFormService();
}
@Override
public void setRuntimeService(RuntimeService runtimeService) {
super.setRuntimeService(runtimeService);
}
@Override
public RuntimeService getRunTimeService() {
return super.getRunTimeService();
}
@Override
public void setTaskService(TaskService taskService) {
super.setTaskService(taskService);
}
@Override
public TaskService getTaskService() {
return super.getTaskService();
}
@Override
public void setManagementService(ManagementService managementService) {
super.setManagementService(managementService);
}
@Override
public void setHistoryService(HistoryService historyService) {
super.setHistoryService(historyService);
}
@Override
public HistoryService getHistoryService() {
return super.getHistoryService();
}
@Override
public ProcUnitHandlerApplication getProcUnitHandlerService() {
return super.getProcUnitHandlerService();
}
@Override
public void deploy(String procId, String fileName) {
super.deploy(procId, fileName);
}
@Override
public ProcessInstance startAndAdvanceProcessInstanceByKey(String processDefinitionKey, String businessKey, Map<String, Object> variables) {
return super.startAndAdvanceProcessInstanceByKey(processDefinitionKey, businessKey, variables);
}
@Override
public ProcessInstance startAndAdvanceProcessInstanceByKeyInNewTransaction(String processDefinitionKey, String businessKey, Map<String, Object> variables) {
return super.startAndAdvanceProcessInstanceByKeyInNewTransaction(processDefinitionKey, businessKey, variables);
}
@Override
public ProcessInstance startProcessInstanceByKey(String processDefinitionKey, String businessKey, Map<String, Object> variables) {
return super.startProcessInstanceByKey(processDefinitionKey, businessKey, variables);
}
@Override
public ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables) {
return super.startProcessInstanceByKey(processDefinitionKey, variables);
}
@Override
public void saveBizData(String bizId, String taskId) {
super.saveBizData(bizId, taskId);
}
@Override
public Boolean showQueryHandlers(String bizId, String processDefinitionKey, String procUnitId, Integer groupId, String procUnitHandlerId) {
return super.showQueryHandlers(bizId, processDefinitionKey, procUnitId, groupId, procUnitHandlerId);
}
@Override
public Map<String, Object> queryHandlers(String bizId, String taskId) {
return super.queryHandlers(bizId, taskId);
}
@Override
public void advance(String taskId, Map<String, Object> variables) {
super.advance(taskId, variables);
}
@Override
public void batchAdvance(List<BatchAdvanceParameter> batchAdvanceParameters) {
super.batchAdvance(batchAdvanceParameters);
}
@Override
public void completeTask(String taskId) {
super.completeTask(taskId);
}
@Override
public void deleteTask(String taskId) {
super.deleteTask(taskId);
}
@Override
public void updateTaskDescription(String taskId, String description) {
super.updateTaskDescription(taskId, description);
}
@Override
public void updateTasksDescription(Map<String, Object> params) {
super.updateTasksDescription(params);
}
@Override
public void completeMendTask(String bizId, String taskId) {
super.completeMendTask(bizId, taskId);
}
@Override
public void completeReplenishTask(String bizId, String taskId) {
super.completeReplenishTask(bizId, taskId);
}
@Override
public void abortTask(String taskId) {
super.abortTask(taskId);
}
@Override
public void abortProcessInstance(String processInstanceId) {
super.abortProcessInstance(processInstanceId);
}
@Override
public void abortProcessInstanceByBizId(String bizId) {
super.abortProcessInstanceByBizId(bizId);
}
@Override
public void abortProcessInstanceByBizCode(String bizCode) {
super.abortProcessInstanceByBizCode(bizCode);
}
@Override
public void suspendTask(String taskId) {
super.suspendTask(taskId);
}
@Override
public void recoverTask(String taskId) {
super.recoverTask(taskId);
}
@Override
public void sleep(String taskId) {
super.sleep(taskId);
}
@Override
public void deleteProcessInstance(String processInstanceId, String deleteReason) {
super.deleteProcessInstance(processInstanceId, deleteReason);
}
@Override
public void recallProcessInstance(String processInstanceId, String taskId) {
super.recallProcessInstance(processInstanceId, taskId);
}
@Override
public void back(String taskId, String destActivityId, String backToProcUnitHandlerId) {
super.back(taskId, destActivityId, backToProcUnitHandlerId);
}
@Override
public void backToApplyActivity(String taskId, String processInstanceId) {
super.backToApplyActivity(taskId, processInstanceId);
}
@Override
public List<ActivityImpl> queryBackActivity(String taskId) {
return super.queryBackActivity(taskId);
}
@Override
public void withdrawTask(String taskId, String previousId) {
super.withdrawTask(taskId, previousId);
}
@Override
public void withdrawTaskByBizId(String taskId, String bizId) {
super.withdrawTaskByBizId(taskId, bizId);
}
@Override
public void transmit(String catalogId, String taskId, String procUnitHandlerId, String executorId, Integer sendMessage) {
super.transmit(catalogId, taskId, procUnitHandlerId, executorId, sendMessage);
}
@Override
public void assign(String taskId, String procUnitHandlerId, List<String> personMemberIds) {
super.assign(taskId, procUnitHandlerId, personMemberIds);
}
@Override
public void claim(String taskId, String personMemberId) {
super.claim(taskId, personMemberId);
}
@Override
public void makeACopyForEvent(String taskId, List<String> executorIds) {
super.makeACopyForEvent(taskId, executorIds);
}
@Override
public void makeACopyFor(String taskId, List<String> executorIds) {
super.makeACopyFor(taskId, executorIds);
}
@Override
public void makeACopyFor(String taskId, List<String> executorIds, String description) {
super.makeACopyFor(taskId, executorIds, description);
}
@Override
public void createNoticeTask(String procUnitName, String description, List<String> executorIds) {
super.createNoticeTask(procUnitName, description, executorIds);
}
@Override
public void createNoticeTask(String procUnitName, String description, List<String> executorIds, String formKey, String businessKey) {
super.createNoticeTask(procUnitName, description, executorIds, formKey, businessKey);
}
@Override
public void doCreateCoordinationTask(CoordinationTask coordinationTask) {
super.doCreateCoordinationTask(coordinationTask);
}
@Override
public void createCoordinationTask(CoordinationTask coordinationTask) {
super.createCoordinationTask(coordinationTask);
}
@Override
public List<ProcUnit> getAllProcessDefinitions() {
return super.getAllProcessDefinitions();
}
@Override
public List<ProcUnit> getUserTaskActivitiesByProcessDefinitionId(String processDefinitionId) {
return super.getUserTaskActivitiesByProcessDefinitionId(processDefinitionId);
}
@Override
public TaskDetail queryTaskDetail(String taskId) {
return super.queryTaskDetail(taskId);
}
@Override
public Map<String, Object> queryTasks(SDO params) {
return super.queryTasks(params);
}
@Override
public List<?> queryFlowChartProcedure(String bizId) {
return super.queryFlowChartProcedure(bizId);
}
@Override
public Map<String, Object> queryFlowChart(String bizId, String ownerOrgId, String isShowAllRules) {
return super.queryFlowChart(bizId, ownerOrgId, isShowAllRules);
}
@Override
public Map<String, Object> getProcedureInfo(String bizId, String procUnitHandlerId) {
return super.getProcedureInfo(bizId, procUnitHandlerId);
}
@Override
public Map<String, Object> queryApprovalHistoryByBizId(String bizId) {
return super.queryApprovalHistoryByBizId(bizId);
}
@Override
public Map<String, Object> queryBackTasksByBizCode(String bizCode, String procUnitId, Integer groupId) {
return super.queryBackTasksByBizCode(bizCode, procUnitId, groupId);
}
@Override
public Map<String, Object> queryBackTasksByBizId(String bizId, String procUnitId, Integer groupId) {
return super.queryBackTasksByBizId(bizId, procUnitId, groupId);
}
@Override
public Map<String, Object> queryBackProcUnit(String procInstId, String approvalRuleId, Integer groupId) {
return super.queryBackProcUnit(procInstId, approvalRuleId, groupId);
}
@Override
public Map<String, Object> queryCounterSignHandlers(String bizId, String procUnitId) {
return super.queryCounterSignHandlers(bizId, procUnitId);
}
@Override
public void saveCounterSignHandlers(String bizId, String procUnitId, Long version, String currentProcUnitHandlerId, List<String> minusSignIds, List<ProcUnitHandler> countersigns) {
super.saveCounterSignHandlers(bizId, procUnitId, version, currentProcUnitHandlerId, minusSignIds, countersigns);
}
@Override
public List<ProcUnitHandler> queryAssistHandlers(String bizId, String procUnitId, String chiefId) {
return super.queryAssistHandlers(bizId, procUnitId, chiefId);
}
@Override
public void assist(String bizId, String taskId, String procUnitHandlerId, List<String> deletedIds, List<String> executorIds, List<Integer> sendMessages) {
super.assist(bizId, taskId, procUnitHandlerId, deletedIds, executorIds, sendMessages);
}
@Override
public List<Map<String, Object>> queryUIElmentPermissionsByProcUnitHandlerId(String id) {
return super.queryUIElmentPermissionsByProcUnitHandlerId(id);
}
@Override
public void updateHistoricTaskInstanceStatus(String taskId, String status) {
super.updateHistoricTaskInstanceStatus(taskId, status);
}
@Override
public void updateTaskExtensionStatus(String taskId, TaskStatus taskStatus) {
super.updateTaskExtensionStatus(taskId, taskStatus);
}
@Override
public void launchMendTask(String bizId, String procUnitId) {
super.launchMendTask(bizId, procUnitId);
}
@Override
public void mend(String bizId, String procUnitId, String currentProcUnitHandlerId, Long version, List<ProcUnitHandler> countersigns) {
super.mend(bizId, procUnitId, currentProcUnitHandlerId, version, countersigns);
}
@Override
public void replenish(String backToTaskId, String currentTaskId, String procUnitHandlerId) {
super.replenish(backToTaskId, currentTaskId, procUnitHandlerId);
}
@Override
public String saveComment(String procUnitHandlerId, String bizId, String message) {
return super.saveComment(procUnitHandlerId, bizId, message);
}
@Override
public List<Comment> queryProcUnitHandlerComments(String procUnitHandlerId) {
return super.queryProcUnitHandlerComments(procUnitHandlerId);
}
@Override
public List<ActivityImpl> queryProcessInstanceActiveActivities(String procInstId) {
return super.queryProcessInstanceActiveActivities(procInstId);
}
@Override
public void handTasks(String fromPersonId, String toPsmId) {
super.handTasks(fromPersonId, toPsmId);
}
@Override
public void collectTask(String taskId) {
super.collectTask(taskId);
}
@Override
public void cancelCollectionTask(String taskId) {
super.cancelCollectionTask(taskId);
}
@Override
public Map<String, Object> queryCurrentOperatorTaskStatistics() {
return super.queryCurrentOperatorTaskStatistics();
}
@Override
public String findBpmnDelegateClassCanonicalName(String taskId) {
return super.findBpmnDelegateClassCanonicalName(taskId);
}
@Override
public Boolean checkAssistantPassRule(String processDefinitionKey, String taskDefinitionKey, String bizId, String procUnitHandlerId) {
return super.checkAssistantPassRule(processDefinitionKey, taskDefinitionKey, bizId, procUnitHandlerId);
}
@Override
public Map<String, Object> loadRuntimeTaskByBizId(String bizId) {
return super.loadRuntimeTaskByBizId(bizId);
}
@Override
public Map<String, Object> slicedQueryProcunitHandler(ProcunitHandlerQueryRequest queryRequest) {
return super.slicedQueryProcunitHandler(queryRequest);
}
}
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/appliction/BsnMessageApplication.java
View file @ 4682089d
......@@ -28,19 +28,39 @@ public interface BsnMessageApplication {
public void saveBsnMessageSponsor(List<BsnMessageSponsor> all);
public String saveBsnMessageSponsor(BsnMessageSponsor entity);
public void saveBsnMessageExecute(List<BsnMessageExecute> all);
public void saveBsnMessageExecute(BsnMessageExecute entity);
public String saveBsnMessageExecute(BsnMessageExecute entity);
public void saveBsnMessageReject(List<BsnMessageReject> all);
public void saveBsnMessageReject(BsnMessageReject entity);
public void deleteBsnMessageSponsor(BsnMessageSponsor entity);
/**
* 根据任务发布id获取旗下任务执行信息
* @param msId
* @return
*/
List<BsnMessageExecute> getExecuteByMsId(String msId);
BsnMessageExecute getExecuteByMeId(String id);
/**
* 根据任务执行id获取驳回信息
* @param meId
* @return
*/
List<BsnMessageReject> getRejectByMeId(String meId);
// List<BsnMessageSponsor> getSponsorsBy();
/**
* 获取同一份任务流程的其他执行部门
* 根据表单号获取任务发布信息及其下的执行单位信息
* @param bid
* @return
*/
BsnMessageSponsor getSponsorByBId(String bid);
/**
* 获取同一份任务流程的其他执行部门,且排除自己
* @param meId
* @return
*/
......
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/appliction/impl/BsnMessageApplicationImpl.java
View file @ 4682089d
......@@ -10,18 +10,14 @@ import com.huigou.topsun.base.bsnMessage.repository.BsnMessageSponsorRepository;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.data.domain.Sort;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 采购编号及合同编号编码规则
*
* @ClassName: CodeRuleApplicationImpl
* @author
* @date 2018-06-20 15:20
* @version V1.0
* 专项任务整合及输出
*/
@Service("bsnMessageApplication")
public class BsnMessageApplicationImpl extends BaseApplication implements BsnMessageApplication {
......@@ -41,16 +37,17 @@ public class BsnMessageApplicationImpl extends BaseApplication implements BsnMes
queryModel.setSql(queryDescriptor.getSql());
queryModel.setPageIndex(1);
queryModel.setPageSize(10);
queryModel.setSortFieldName("createDate");
queryModel.setSortFieldName("updateDate");
queryModel.setSortOrder("desc");
queryModel.putParam("taskExecute", this.getOperator().getUserId());
queryModel.putParam("taskExecute",this.getOperator().getUserId());
queryModel.putParam("addText", "[驳回]");
return this.sqlExecutorDao.executeSlicedQuery(queryModel);
}
@Override
public List<BsnMessageSponsor> queryFinishBsnMessageSponsor() {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "queryFinishBsnMessageSponsor");
return this.sqlExecutorDao.queryToList(queryDescriptor.getSql(), BsnMessageSponsor.class, this.getOperator().getUserId());
return this.sqlExecutorDao.queryToList(queryDescriptor.getSql(), BsnMessageSponsor.class,this.getOperator().getUserId());
}
......@@ -61,7 +58,7 @@ public class BsnMessageApplicationImpl extends BaseApplication implements BsnMes
public String saveBsnMessageSponsor(BsnMessageSponsor entity){
String keyId = messageSponsorRepository.save(entity).getId();
if(!entity.getExecutes().isEmpty()){
if(isNotEmpty(entity.getExecutes())){
entity.getExecutes().forEach(item->item.setMessageSponsorId(keyId));
messageExecuteRepository.save(entity.getExecutes());
}
......@@ -72,8 +69,13 @@ public class BsnMessageApplicationImpl extends BaseApplication implements BsnMes
public void saveBsnMessageExecute(List<BsnMessageExecute> all){
messageExecuteRepository.save(all);
}
public void saveBsnMessageExecute(BsnMessageExecute entity){
messageExecuteRepository.save(entity);
public String saveBsnMessageExecute(BsnMessageExecute entity){
String keyId = messageExecuteRepository.save(entity).getId();
if(isNotEmpty(entity.getRejects())){
entity.getRejects().forEach(item->item.setBsnExecuteId(keyId));
messageRejectRepository.save(entity.getRejects());
}
return keyId;
}
public void saveBsnMessageReject(List<BsnMessageReject> all){
messageRejectRepository.save(all);
......@@ -82,6 +84,14 @@ public class BsnMessageApplicationImpl extends BaseApplication implements BsnMes
messageRejectRepository.save(entity);
}
@Override
public void deleteBsnMessageSponsor(BsnMessageSponsor entity) {
if(isNotEmpty(entity.getExecutes())){
messageExecuteRepository.delete(entity.getExecutes());
}
messageSponsorRepository.delete(entity);
}
@Override
public List<BsnMessageExecute> getExecuteByMsId(String msId) {
return messageExecuteRepository.findAllByMessageSponsorId(msId);
......@@ -94,12 +104,29 @@ public class BsnMessageApplicationImpl extends BaseApplication implements BsnMes
@Override
public List<BsnMessageReject> getRejectByMeId(String meId) {
return messageRejectRepository.findAllByBsnExecuteId(meId);
Sort sort = new Sort(Sort.Direction.DESC, "rejectDate");
return messageRejectRepository.findAllByBsnExecuteId(meId,sort);
}
@Override
public List<BsnMessageExecute> getBrotherExecuteByMeId(String meId) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "queryBrotherExecute");
Map<String,Object> mapParam = new HashMap<>();
mapParam.put("meId",meId);
return this.sqlExecutorDao.queryToListByMapParam(queryDescriptor.getSql(), BsnMessageExecute.class, mapParam);
}
@Override
public BsnMessageSponsor getSponsorByBId(String bId) {
BsnMessageSponsor sponsor = messageSponsorRepository.findByBusinessId(bId);
if(sponsor!=null){
List<BsnMessageExecute> executeList =this.getExecuteByMsId(sponsor.getId());
sponsor.setExecutes(executeList);
}
return sponsor;
}
return null;
public boolean isNotEmpty(List<?> list) {
return list != null && !list.isEmpty();
}
}
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/domain/BsnMessageExecute.java
View file @ 4682089d
package com.huigou.topsun.base.bsnMessage.domain;
import lombok.Data;
import org.apache.http.annotation.Contract;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
*
* 任务执行实体
* @TableName bsn_message_execute
*/
@Table(name="bsn_message_execute")
......@@ -53,10 +56,10 @@ public class BsnMessageExecute implements Serializable {
private String businessCode;
/**
* 创建日期
* 更新日期
*/
@Column(name = "create_date")
private Date createDate;
@Column(name = "update_date")
private Date updateDate;
/**
* 完成日期
......@@ -69,7 +72,16 @@ public class BsnMessageExecute implements Serializable {
*/
private Integer active;
@Transient
private List<BsnMessageReject> rejects;
public void addReject(BsnMessageReject reject){
if(this.rejects==null){
this.rejects = new ArrayList<>();
}
rejects.add(reject);
}
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/domain/BsnMessageReject.java
View file @ 4682089d
......@@ -8,7 +8,7 @@ import java.io.Serializable;
import java.util.Date;
/**
*
* 驳回信息实体
* @TableName bsn_message_reject
*/
@Table(name="bsn_message_reject")
......@@ -26,8 +26,8 @@ public class BsnMessageReject implements Serializable {
name = "system-uuid",
strategy = "guid"
)
@Column(name = "detail_Id")
private String detailId;
@Column(name = "id")
private String id;
/**
*
......
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/domain/BsnMessageSponsor.java
View file @ 4682089d
......@@ -5,11 +5,12 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
*
* 任务启动/任务发布实体
* @TableName bsn_message_sponsor
*/
@Table(name="bsn_message_sponsor")
......@@ -65,7 +66,7 @@ public class BsnMessageSponsor implements Serializable {
private String executorUrl;
/**
* 完成状态（等待：0，审核：1）
* 完成状态（等待：0，审核：1,结束：2）
*/
private Integer status;
......@@ -73,5 +74,13 @@ public class BsnMessageSponsor implements Serializable {
@Transient
private List<BsnMessageExecute> executes;
public void addExecute(BsnMessageExecute execute){
if(this.executes==null){
this.executes = new ArrayList<>();
}
executes.add(execute);
}
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/domain/query/BsnMessageQueryRequest.java deleted 100644 → 0
View file @ 93f6728b
package com.huigou.topsun.base.bsnMessage.domain.query;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
*
* @TableName bsn_message
*/
@Data
public class BsnMessageQueryRequest extends QueryAbstractRequest {
/**
* id
*/
private String id;
/**
* 任务描述
*/
private String title;
/**
* 任务执行人
*/
private String listners;
/**
* 业务应用类型
*/
private String businessCode;
/**
* 业务表单id
*/
private String businessId;
/**
* 创建日期
*/
private Date createDate;
/**
* 完成日期
*/
private Date finishedDate;
/**
* 携带信息
*/
@Column(name = "reject_msg")
private String rejectMsg;
private String executorUrl;
/**
* 完成状态（默认为未完成：0，完成为：1，保存未分发：2）
*/
private Integer active;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/repository/BsnMessageRejectRepository.java
View file @ 4682089d
......@@ -2,12 +2,13 @@ package com.huigou.topsun.base.bsnMessage.repository;
import com.huigou.topsun.base.bsnMessage.domain.BsnMessageReject;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface BsnMessageRejectRepository extends JpaRepository<BsnMessageReject,String> {
List<BsnMessageReject> findAllByBsnExecuteId(String meId);
List<BsnMessageReject> findAllByBsnExecuteId(String meId, Sort sortOrder);
}
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/repository/BsnMessageSponsorRepository.java
View file @ 4682089d
......@@ -8,6 +8,6 @@ import java.util.List;
public interface BsnMessageSponsorRepository extends JpaRepository<BsnMessageSponsor,String> {
List<BsnMessageSponsor> findAllByBusinessId(String BusinessId);
BsnMessageSponsor findByBusinessId(String BusinessId);
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @ 4682089d
......@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.huigou.topsun.base.bsnMessage.appliction.BsnMessageApplication;
import com.huigou.topsun.base.bsnMessage.domain.ActiveStatus;
import com.huigou.topsun.base.bsnMessage.domain.BsnMessageExecute;
import com.huigou.topsun.base.bsnMessage.domain.BsnMessageReject;
import com.huigou.topsun.base.bsnMessage.domain.BsnMessageSponsor;
import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyDeptApplication;
......@@ -19,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class NonProdApplyDeptApplicationImpl extends BaseApplication implements NonProdApplyDeptApplication {
......@@ -44,6 +46,14 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
throw new RuntimeException("JSON转换失败："+e);
}
/**
* 删除表单对应已存在任务
*/
BsnMessageSponsor sponsor = bsnMessageApplication.getSponsorByBId(nonProdApplyDept.getApplyDeptId());
if(sponsor!=null){
bsnMessageApplication.deleteBsnMessageSponsor(sponsor);
}
//封装分发数据
BsnMessageSponsor bsnMessageSponsor = new BsnMessageSponsor();
bsnMessageSponsor.setTaskSponsor(this.getOperator().getUserId());
......@@ -53,23 +63,21 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
bsnMessageSponsor.setBusinessId(nonProdApplyDept.getApplyDeptId());
bsnMessageSponsor.setStatus(0);
List<BsnMessageExecute> executeList = new ArrayList<>();
for (Map<String, String> stringMap : deptStaffList) {
BsnMessageExecute messageExecute = new BsnMessageExecute();
String userCode = stringMap.get("userCode");
String deptName = stringMap.get("deptName");
String deptCode = stringMap.get("deptCode");
messageExecute.setTaskExecute(userCode);
String[] split = userCode.split("@");
messageExecute.setTaskExecute(split[0]);
messageExecute.setBusinessCode(deptCode);
messageExecute.setActive(ActiveStatus.SAVED.getValue());
messageExecute.setCreateDate(new Date());
messageExecute.setUpdateDate(new Date());
messageExecute.setTaskDescribe(deptName+"部门数据维护");
executeList.add(messageExecute);
bsnMessageSponsor.addExecute(messageExecute);
}
bsnMessageSponsor.setExecutes(executeList);
String keyId = bsnMessageApplication.saveBsnMessageSponsor(bsnMessageSponsor);
String keyId = bsnMessageApplication.saveBsnMessageSponsor(bsnMessageSponsor);
map.put("applyDeptId",nonProdApplyDept.getApplyDeptId());
map.put("keyId",keyId);
return map;
......@@ -92,15 +100,34 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
@Override
public void rejectNonProdApplyDept(SDO sdo) {
String septString = sdo.getString("dept");
String meId = sdo.getString("meId");
//需要被驳回的部门
List<String> deptList = Arrays.asList(septString.split(","));
String bdid = sdo.getString("表单的id");
//更改状态此对象为驳回状态
SapNonProdApplyDept one = nonProdApplyDeptRepository.findOne(bdid);
one.setStatus(ActiveStatus.REJECTED.getValue());
nonProdApplyDeptRepository.save(one);
//获取此条数据的相关部门信息
// List<BsnMessage> allByBusinessId = bsnMessageRepository.findAllByBusinessId(bdid);
List<BsnMessageExecute> brotherExecuteAll = bsnMessageApplication.getBrotherExecuteByMeId(meId);
Map<String, BsnMessageExecute> executeMap = new HashMap<>();
for (BsnMessageExecute execute : brotherExecuteAll) {
executeMap.put(execute.getTaskExecute(), execute);
}
// 遍历 SDO 对象中的 key
for (String key : sdo.getProperties().keySet()) {
// 如果存在对应的 BsnMessageExecute，进行操作
BsnMessageExecute execute = executeMap.get(key);
if (execute != null) {
//更改驳回状态
execute.setActive(ActiveStatus.REJECTED.getValue());
//更新时间
execute.setUpdateDate(new Date());
//封装驳回详细
BsnMessageReject reject = new BsnMessageReject();
reject.setRejectMsg(sdo.getString(key));
reject.setRejectDate(new Date());
reject.setBsnExecuteId(execute.getId());
execute.addReject(reject);
bsnMessageApplication.saveBsnMessageExecute(execute);
}
}
//当前审核任务回退
BsnMessageExecute systemExecute = bsnMessageApplication.getExecuteByMeId(meId);
systemExecute.setActive(ActiveStatus.SAVED.getValue());
bsnMessageApplication.saveBsnMessageExecute(systemExecute);
}
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyNextController.java
View file @ 4682089d
......@@ -3,6 +3,7 @@ package com.huigou.topsun.sap.nonProdApply.controller;
import com.huigou.cache.DictUtil;
import com.huigou.topsun.base.bsnMessage.appliction.BsnMessageApplication;
import com.huigou.topsun.base.bsnMessage.domain.ActiveStatus;
import com.huigou.topsun.base.bsnMessage.domain.BsnMessageExecute;
import com.huigou.topsun.base.bsnMessage.domain.BsnMessageReject;
import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyApplication;
......@@ -16,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import java.util.*;
import java.util.stream.Collectors;
@Controller
@ControllerMapping("/sapNonProdApplyNext")
......@@ -98,8 +100,13 @@ public class NonProdApplyNextController extends CommonController {
this.putAttribute("isReadOnly", "false");
SapNonProdApplyDept nonProdApplyDept = nonProdApplyDeptApplication.getNonProdApplyDeptById(bizId);
//测试数据
Map<String, String> map = DictUtil.getDictionary("serviceusage");
this.putAttribute("bu", map);
// Map<String, String> map = new HashMap<>();
//获取该业务流程下其他执行部门
List<BsnMessageExecute> executeAll = bsnMessageApplication.getBrotherExecuteByMeId(meId);
Map<String, String> map = executeAll.stream()
.collect(Collectors.toMap(BsnMessageExecute::getTaskExecute, BsnMessageExecute::getBusinessCode));
this.putAttribute("auditDeptMap", map);
return forward("nonProdApplyNext", nonProdApplyDept);
}
......@@ -135,14 +142,14 @@ public class NonProdApplyNextController extends CommonController {
// return null;
// }
public void rejectNonProdApplyDept() {
/**
* 驳回
* @return
*/
public String rejectNonProdApplyDept() {
SDO sdo = this.getSDO();
String septString = sdo.getString("dept");
String meId = sdo.getString("meId");//可以根据meId 获取msId ,根据msId获取所有的持有该任务的部门
//需要被驳回的部门
List<String> deptList = Arrays.asList(septString.split(","));
nonProdApplyDeptApplication.rejectNonProdApplyDept(sdo);
return success();
}
}
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java
View file @ 4682089d
......@@ -34,10 +34,6 @@ public class SapNonProdApplyDept implements Serializable {
@Column(name = "base_info_id")
private String baseInfoId;
/**
* 状态（0：未分发，1：待检查，2：已驳回，3：已完成）
*/
private int status;
/**
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/SapPurchaseOrderApplication.java 0 → 100644
View file @ 4682089d
package com.huigou.topsun.sap.purchaseOrder.application;
import com.huigou.topsun.sap.purchaseOrder.domain.SapPurchaseOrder;
import com.huigou.topsun.sap.purchaseOrder.domain.query.SapPurchaseOrderQueryRequest;
import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderVo;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2024/01/09/18:59
* @Description:
*/
public interface SapPurchaseOrderApplication {
public static final String QUERY_XML_FILE_PATH = "config/topsun/sap/sapPurchaseOrder/sapPurchaseOrder.xml";
String PROCESS_DEFINITION_KEY = "sapPurchaseOrderProc";
Map<String,Object> slicedSapPurchaseOrderList(SapPurchaseOrderQueryRequest queryRequest);
SapPurchaseOrder loadSapPurchaseOrder(String id);
void saveSapPurchaseOrderVo(SapPurchaseOrderVo sapPurchaseOrderVo);
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/SapPurchaseOrderItemApplication.java 0 → 100644
View file @ 4682089d
package com.huigou.topsun.sap.purchaseOrder.application;
import com.huigou.topsun.sap.purchaseOrder.domain.SapPurchaseOrderItem;
import com.huigou.topsun.sap.purchaseOrder.domain.query.SapPurchaseOrderItemQueryRequest;
import java.util.List;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2024/01/09/19:19
* @Description:
*/
public interface SapPurchaseOrderItemApplication {
public static final String QUERY_XML_FILE_PATH = "config/topsun/sap/sapPurchaseOrder/sapPurchaseOrderItem.xml";
void saveSapPurchaseOrderItems(String sapPurchaseOrderId, List<SapPurchaseOrderItem> sapPurchaseOrderItems);
void deleteByIds(List<String> ids);
Map<String, Object> querySapPurchaseOrderItems(SapPurchaseOrderItemQueryRequest queryRequest);
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java 0 → 100644
View file @ 4682089d
package com.huigou.topsun.sap.purchaseOrder.application.impl;
import cn.hutool.core.bean.BeanUtil;
import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.context.ThreadLocalUtil;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.data.query.model.QueryModel;
import com.huigou.topsun.sap.purchaseOrder.application.SapPurchaseOrderApplication;
import com.huigou.topsun.sap.purchaseOrder.application.SapPurchaseOrderItemApplication;
import com.huigou.topsun.sap.purchaseOrder.domain.SapPurchaseOrder;
import com.huigou.topsun.sap.purchaseOrder.domain.SapPurchaseOrderItem;
import com.huigou.topsun.sap.purchaseOrder.domain.query.SapPurchaseOrderQueryRequest;
import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderItemVo;
import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderVo;
import com.huigou.topsun.sap.purchaseOrder.repository.SapPurchaseOrderRepository;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bmp.operator.OperatorApplication;
import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.uasp.bpm.ProcessAction;
import com.huigou.uasp.bpm.ProcessStartModel;
import com.huigou.uasp.bpm.engine.application.WorkflowApplication;
import com.huigou.util.ClassHelper;
import com.huigou.util.Constants;
import com.huigou.util.SDO;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.runtime.ProcessInstance;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2024/01/09/18:59
* @Description:
*/
@Service("sapPurchaseOrderApplication")
public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPurchaseOrderApplication {
@Resource
private SapPurchaseOrderRepository sapPurchaseOrderRepository;
@Resource
private SapPurchaseOrderItemApplication sapPurchaseOrderItemApplication;
@Resource
private WorkflowApplication workflowApplication;
@Resource
private OperatorApplication operatorApplication;
// @Override
protected String saveBizAndOrderData() {
// super.saveBizAndOrderData();
SapPurchaseOrder sapPurchaseOrder = getBizEntity(SapPurchaseOrder.class);
if (sapPurchaseOrder.isNew()) {
sapPurchaseOrder.setStatusId(BizBillStatus.APPLYING.getId());
} else {
sapPurchaseOrder = (SapPurchaseOrder) commonDomainService.loadAndFillinProperties(sapPurchaseOrder);
}
sapPurchaseOrder = sapPurchaseOrderRepository.save(sapPurchaseOrder);
List<SapPurchaseOrderItem> sapPurchaseOrderItems = getBizEntities(SapPurchaseOrderItem.class, "sapPurchaseItems");
sapPurchaseOrderItemApplication.saveSapPurchaseOrderItems(sapPurchaseOrder.getId(),sapPurchaseOrderItems);
//String sapPurchaseVoJson = this.getSapPurchaseVoJson(sapPurchaseOrder);
return sapPurchaseOrder.getId();
}
@Override
protected Map<String, Object> getProcessBizParams(String bizId) {
// 返回业务数据给流程实例，
return ClassHelper.toMap(sapPurchaseOrderRepository.getOne(bizId));
}
@Override
protected void onEnd(DelegateExecution delegateExecution) {
super.onEnd(delegateExecution);
String bizId = delegateExecution.getProcessBusinessKey();
BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
SapPurchaseOrder sapPurchaseOrder = sapPurchaseOrderRepository.findOne(bizId);
sapPurchaseOrder.setStatusId(status.getId());
sapPurchaseOrderRepository.save(sapPurchaseOrder);
}
@Override
protected void onAbortProcessInstance(DelegateExecution delegateExecution) {
super.onAbortProcessInstance(delegateExecution);
String bizId = delegateExecution.getProcessBusinessKey();
SapPurchaseOrder sapPurchaseOrder = sapPurchaseOrderRepository.findOne(bizId);
sapPurchaseOrder.setStatusId(BizBillStatus.ABORTED.getId());
sapPurchaseOrderRepository.save(sapPurchaseOrder);
}
/**
* @param delegateTask
* @param destActivityId 回退到的目标节点id
*/
@Override
protected void onBack(DelegateTask delegateTask, String destActivityId) {
super.onBack(delegateTask, destActivityId);
if ("Apply".equalsIgnoreCase(destActivityId)) {
String bizId = delegateTask.getExecution().getProcessBusinessKey();
SapPurchaseOrder sapPurchaseOrder = sapPurchaseOrderRepository.findOne(bizId);
sapPurchaseOrder.setStatusId(BizBillStatus.APPLYING.getId());
sapPurchaseOrderRepository.save(sapPurchaseOrder);
}
}
@Override
public Map<String, Object> slicedSapPurchaseOrderList(SapPurchaseOrderQueryRequest queryRequest) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sapPurchaseOrderList");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
queryModel.putDictionary("status", BizBillStatus.getMap());
return this.sqlExecutorDao.executeSlicedQuery(queryModel);
}
@Override
public SapPurchaseOrder loadSapPurchaseOrder(String id) {
return sapPurchaseOrderRepository.findOne(id);
}
@Override
@Transactional
public void saveSapPurchaseOrderVo(SapPurchaseOrderVo sapPurchaseOrderVo) {
SapPurchaseOrder sapPurchaseOrder = new SapPurchaseOrder();
BeanUtil.copyProperties(sapPurchaseOrderVo,sapPurchaseOrder);
//初始化用户信息
String createdById = "5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0";
Operator operator = operatorApplication.createOperatorByPersonMemberId(createdById);
sapPurchaseOrder.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
Map<String, Object> formData = BeanUtil.beanToMap(sapPurchaseOrder);
String bizId = this.startProcessInstance(SapPurchaseOrderApplication.PROCESS_DEFINITION_KEY, formData);
sapPurchaseOrder.setId(bizId);
sapPurchaseOrder = this.sapPurchaseOrderRepository.save(sapPurchaseOrder);
List<SapPurchaseOrderItemVo> OrderItemVoList = sapPurchaseOrderVo.getItemVos();
List<SapPurchaseOrderItem> sapPurchaseOrderItems = new ArrayList<>();
OrderItemVoList.forEach(OrderItemVo->{
SapPurchaseOrderItem sapPurchaseOrderItem = new SapPurchaseOrderItem();
BeanUtil.copyProperties(OrderItemVo,sapPurchaseOrderItem);
sapPurchaseOrderItems.add(sapPurchaseOrderItem);
});
sapPurchaseOrderItemApplication.saveSapPurchaseOrderItems(sapPurchaseOrder.getId(),sapPurchaseOrderItems);
}
public String startProcessInstance(String processDefinitionKey,Map<String, Object> formData){
Map<String, Object> variables = new HashMap();
SDO localSdo = this.buildSDO(formData);
ThreadLocalUtil.putVariable(Constants.SDO, localSdo);
variables.put("startModel", ProcessStartModel.MANUAL.getId());
Operator operator = localSdo.getOperator();
variables.put("executorFullId", operator.getFullId());
variables.put("executorFullName", operator.getFullName());
ThreadLocalUtil.putOperator(operator);
ThreadLocalUtil.putVariable("client.ip", "127.0.0.1");
ProcessInstance processInstance = this.workflowApplication.startProcessInstanceByKey(processDefinitionKey, variables);
String businessKey = processInstance.getBusinessKey();
return businessKey;
}
private SDO buildSDO(Map<String, Object> formData) {
//String createdById = (String) formData.get("createdById");
//暂定管理员id
String createdById = "5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0";
Operator operator = operatorApplication.createOperatorByPersonMemberId(createdById);
SDO localSdo = new SDO();
// 将业务数据传递给工作流
formData.forEach(localSdo::putProperty);
// 将业务流程信息传递给工作流
localSdo.putProperty("processAction", ProcessAction.SAVE);
localSdo.putProperty("procUnitId", "Apply");
localSdo.setOperator(operator);
return localSdo;
}
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderItemApplicationImpl.java 0 → 100644
View file @ 4682089d
package com.huigou.topsun.sap.purchaseOrder.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.data.query.model.QueryModel;
import com.huigou.topsun.sap.purchaseOrder.application.SapPurchaseOrderItemApplication;
import com.huigou.topsun.sap.purchaseOrder.domain.SapPurchaseOrderItem;
import com.huigou.topsun.sap.purchaseOrder.domain.query.SapPurchaseOrderItemQueryRequest;
import com.huigou.topsun.sap.purchaseOrder.repository.SapPurchaseOrderItemRepository;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import com.huigou.util.StringUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2024/01/09/19:20
* @Description:
*/
@Service
public class SapPurchaseOrderItemApplicationImpl extends BaseApplication implements SapPurchaseOrderItemApplication {
@Resource
private SapPurchaseOrderItemRepository sapPurchaseOrderItemRepository;
@Override
public void saveSapPurchaseOrderItems(String sapPurchaseOrderId, List<SapPurchaseOrderItem> sapPurchaseOrderItems) {
sapPurchaseOrderItems.forEach(sapPurchaseOrderItem -> {
sapPurchaseOrderItem.setPurchaseOrderId(sapPurchaseOrderId);
sapPurchaseOrderItemRepository.save(sapPurchaseOrderItem);
});
}
@Override
public void deleteByIds(List<String> ids) {
ids.forEach(id->{
sapPurchaseOrderItemRepository.delete(id);
});
}
@Override
public Map<String, Object> querySapPurchaseOrderItems(SapPurchaseOrderItemQueryRequest queryRequest) {
Map<String, Object> map = new HashMap<>();
if (StringUtil.isNotBlank(queryRequest.getSapPurchaseOrderId())){
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sapPurchaseOrderItems");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
}
return map;
}
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/controller/SapPurchaseOrderController.java 0 → 100644
View file @ 4682089d
package com.huigou.topsun.sap.purchaseOrder.controller;
import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.topsun.sap.purchaseOrder.application.SapPurchaseOrderApplication;
import com.huigou.topsun.sap.purchaseOrder.domain.SapPurchaseOrder;
import com.huigou.topsun.sap.purchaseOrder.domain.query.SapPurchaseOrderQueryRequest;
import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderVo;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.annotation.SkipAuth;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2024/01/09/18:58
* @Description:
*/
@Controller
@ControllerMapping("/sapPurchaseOrder")
public class SapPurchaseOrderController extends CommonController {
@Resource
private SapPurchaseOrderApplication sapPurchaseOrderApplication;
@Override
protected String getPagePath() {
return "/biz/topsun/sap/purchaseOrder/";
}
@SkipAuth
@RequestMapping( value = "/getSapPurchaseOrder")
@ResponseBody
public HashMap<String, Object> getSapPurchaseOrder(@RequestBody SapPurchaseOrderVo sapPurchaseOrderVo){
//SDO sdo = this.getSDO();
this.sapPurchaseOrderApplication.saveSapPurchaseOrderVo(sapPurchaseOrderVo);
HashMap<String, Object> messageMap = new HashMap<>();
messageMap.put("Message_Status","S");
messageMap.put("Message_Text","成功");
return messageMap;
}
public String forwardSapPurchaseOrderList(){
return forward("sapPurchaseOrderList");
}
public String slicedSapPurchaseOrderList(){
SDO sdo = this.getSDO();
SapPurchaseOrderQueryRequest queryRequest = sdo.toQueryRequest(SapPurchaseOrderQueryRequest.class);
Map<String, Object> map = sapPurchaseOrderApplication.slicedSapPurchaseOrderList(queryRequest);
return toResult(map);
}
public String forwardSapPurchaseOrderDetail(){
this.putAttribute("processDefinitionKey", SapPurchaseOrderApplication.PROCESS_DEFINITION_KEY);
// 新增的时候procUnitId一定要设置成Apply，不然jsp页面的所有表单元素是readonly状态
this.putAttribute("procUnitId", "Apply");
SapPurchaseOrder sapPurchase = new SapPurchaseOrder();
sapPurchase.setStatusId(BizBillStatus.APPLYING.getId());
/**
* 设置jsp页面初始化填充数据，如果不设置， 那么在jsp页面上填写完表单之后立即提交申请TaskDescription获取不到时间和相关人员信息
*/
Operator operator = getOperator();
sapPurchase.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
return forward("sapPurchaseOrderDetail",sapPurchase);
}
public String showSapPurchaseOrderDetail(){
SDO sdo = this.getSDO();
String id = sdo.getBizId();
SapPurchaseOrder sapPurchaseOrder = sapPurchaseOrderApplication.loadSapPurchaseOrder(id);
return forward("sapPurchaseOrderDetail",sapPurchaseOrder);
}
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/controller/SapPurchaseOrderItemController.java 0 → 100644
View file @ 4682089d
package com.huigou.topsun.sap.purchaseOrder.controller;
import com.huigou.topsun.sap.purchaseOrder.application.SapPurchaseOrderItemApplication;
import com.huigou.topsun.sap.purchaseOrder.domain.query.SapPurchaseOrderItemQueryRequest;
import com.huigou.topsun.sap.purchaseOrder.repository.SapPurchaseOrderItemRepository;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import org.springframework.stereotype.Controller;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2023/12/27/17:24
* @Description:
*/
@Controller
@ControllerMapping("/sapPurchaseOrderItem")
public class SapPurchaseOrderItemController extends CommonController {
@Resource
private SapPurchaseOrderItemApplication sapPurchaseOrderItemApplication;
@Resource
private SapPurchaseOrderItemRepository sapPurchaseOrderItemRepository;
public String querySapPurchaseOrderItems(){
SDO sdo = this.getSDO();
SapPurchaseOrderItemQueryRequest queryRequest = sdo.toQueryRequest(SapPurchaseOrderItemQueryRequest.class);
Map<String, Object> map = sapPurchaseOrderItemApplication.querySapPurchaseOrderItems(queryRequest);
return toResult(map);
}
public String deleteSapPurchaseOrderItem(){
SDO sdo = this.getSDO();
List<String> ids = sdo.getIds();
sapPurchaseOrderItemApplication.deleteByIds(ids);
return success();
}
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/SapPurchaseOrder.java 0 → 100644
View file @ 4682089d
package com.huigou.topsun.sap.purchaseOrder.domain;
import com.huigou.data.domain.model.FlowBillAbstractEntity;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
*
* @TableName sap_purchase_order
*/
@Table(name="sap_purchase_order")
@Entity
@Data
public class SapPurchaseOrder extends FlowBillAbstractEntity {
/**
* 采购订单号码
*/
@Column(name = "EBELN")
private String ebeln;
/**
* 采购订单类型
*/
@Column(name = "BSART")
private String bsart;
/**
* 采购订单类型描述
*/
@Column(name = "BATXT")
private String batxt;
@Override
protected String getCodeRuleId() {
return "sapPurchaseOrder";
}
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/SapPurchaseOrderItem.java 0 → 100644
View file @ 4682089d
package com.huigou.topsun.sap.purchaseOrder.domain;
import com.huigou.data.domain.model.AbstractEntity;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
*
* @TableName sap_purchase_order_item
*/
@Table(name="sap_purchase_order_item")
@Entity
@Data
public class SapPurchaseOrderItem extends AbstractEntity {
/**
*
*/
@Column(name = "purchase_order_id")
private String purchaseOrderId;
/**
* 项目编号
*/
@Column(name = "EBELP")
private String ebelp;
/**
* 项目类别
*/
@Column(name = "PSTYP")
private String pstyp;
/**
* 项目类别描述
*/
@Column(name = "PTEXT")
private String ptext;
/**
* 科目分配类别
*/
@Column(name = "KNTTP")
private String knttp;
/**
* 科目分配类别描述
*/
@Column(name = "KNTTX")
private String knttx;
/**
* 物料号
*/
@Column(name = "MATNR")
private String matnr;
/**
* 物料描述
*/
@Column(name = "TXZ01")
private String txz01;
/**
* 物料组
*/
@Column(name = "MATKL")
private String matkl;
/**
* 物料组描述
*/
@Column(name = "WGBEZ")
private String wgbez;
/**
* 采购订单数量
*/
@Column(name = "MENGE")
private String menge;
/**
* 采购订单计量单位
*/
@Column(name = "MEINS")
private String meins;
/**
* 单位描述
*/
@Column(name = "MSEHL")
private String msehl;
/**
* 要求交货日期
*/
@Column(name = "EINDT")
private Date eindt;
/**
* 工厂
*/
@Column(name = "WERKS")
private String werks;
/**
* 名称
*/
@Column(name = "NAME1")
private String name1;
/**
* 库存地点
*/
@Column(name = "LGORT")
private String lgort;
/**
* 库存地点的描述
*/
@Column(name = "LGOBE")
private String lgobe;
/**
* 采购组
*/
@Column(name = "EKGRP")
private String ekgrp;
/**
* 采购组描述
*/
@Column(name = "EKNAM")
private String eknam;
/**
* 价格
*/
@Column(name = "NETPR")
private BigDecimal netpr;
/**
* 价格单位
*/
@Column(name = "PEINH")
private Integer peinh;
/**
* 税码
*/
@Column(name = "MWSKZ")
private String mwskz;
/**
* 币种
*/
@Column(name = "WAERS")
private String waers;
/**
* 总价
*/
@Column(name = "NETWR")
private BigDecimal netwr;
/**
* 退货项目
*/
@Column(name = "RETPO")
private String retpo;
/**
* 总账科目
*/
@Column(name = "SAKTO")
private String sakto;
/**
* 成本中心
*/
@Column(name = "KOSTL")
private String kostl;
/**
* 主资产号
*/
@Column(name = "ANLN1")
private String anln1;
/**
* 资产次级编号
*/
@Column(name = "ANLN2")
private String anln2;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/query/SapPurchaseOrderItemQueryRequest.java 0 → 100644
View file @ 4682089d
package com.huigou.topsun.sap.purchaseOrder.domain.query;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
/**
* @Auther: xin.lu
* @Date: 2023/12/27/10:45
* @Description:
*/
@Data
public class SapPurchaseOrderItemQueryRequest extends QueryAbstractRequest {
/**
* 采购订单id
*/
private String sapPurchaseOrderId;
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/query/SapPurchaseOrderQueryRequest.java 0 → 100644
View file @ 4682089d
package com.huigou.topsun.sap.purchaseOrder.domain.query;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
import javax.persistence.Column;
/**
* @Auther: xin.lu
* @Date: 2024/01/09/19:13
* @Description:
*/
@Data
public class SapPurchaseOrderQueryRequest extends QueryAbstractRequest {
/**
* 采购订单号码
*/
private String ebeln;
/**
* 采购订单类型
*/
private String bsart;
/**
* 采购订单类型描述
*/
private String batxt;
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/vo/SapPurchaseOrderItemVo.java 0 → 100644
View file @ 4682089d
package com.huigou.topsun.sap.purchaseOrder.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.persistence.Column;
import java.math.BigDecimal;
import java.util.Date;
/**
*
* @TableName sap_purchase_approval_item
*/
@Data
public class SapPurchaseOrderItemVo {
/**
* 项目编号
*/
private String ebelp;
/**
* 项目类别
*/
private String pstyp;
/**
* 项目类别描述
*/
private String ptext;
/**
* 科目分配类别
*/
private String knttp;
/**
* 科目分配类别描述
*/
private String knttx;
/**
* 物料号
*/
private String matnr;
/**
* 物料描述
*/
private String txz01;
/**
* 物料组
*/
private String matkl;
/**
* 物料组描述
*/
private String wgbez;
/**
* 采购订单数量
*/
private String menge;
/**
* 采购订单计量单位
*/
private String meins;
/**
* 单位描述
*/
private String msehl;
/**
* 要求交货日期
*/
private Date eindt;
/**
* 工厂
*/
private String werks;
/**
* 名称
*/
private String name1;
/**
* 库存地点
*/
private String lgort;
/**
* 库存地点的描述
*/
private String lgobe;
/**
* 采购组
*/
private String ekgrp;
/**
* 采购组描述
*/
private String eknam;
/**
* 价格
*/
private BigDecimal netpr;
/**
* 价格单位
*/
private Integer peinh;
/**
* 税码
*/
private String mwskz;
/**
* 币种
*/
private String waers;
/**
* 总价
*/
private BigDecimal netwr;
/**
* 退货项目
*/
private String retpo;
/**
* 总账科目
*/
private String sakto;
/**
* 成本中心
*/
private String kostl;
/**
* 主资产号
*/
private String anln1;
/**
* 资产次级编号
*/
private String anln2;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/vo/SapPurchaseOrderVo.java 0 → 100644
View file @ 4682089d
package com.huigou.topsun.sap.purchaseOrder.domain.vo;
import lombok.Data;
import javax.persistence.Column;
import java.io.Serializable;
import java.util.List;
/**
* @Auther: xin.lu
* @Date: 2024/01/10/9:22
* @Description:
*/
@Data
public class SapPurchaseOrderVo implements Serializable {
/**
* 采购订单号码
*/
private String ebeln;
/**
* 采购订单类型
*/
private String bsart;
/**
* 采购订单类型描述
*/
private String batxt;
private List<SapPurchaseOrderItemVo> itemVos;
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/repository/SapPurchaseOrderItemRepository.java 0 → 100644
View file @ 4682089d
package com.huigou.topsun.sap.purchaseOrder.repository;
import com.huigou.topsun.sap.purchaseOrder.domain.SapPurchaseOrderItem;
import org.springframework.data.jpa.repository.JpaRepository;
/**
* @Auther: xin.lu
* @Date: 2024/01/09/19:01
* @Description:
*/
public interface SapPurchaseOrderItemRepository extends JpaRepository<SapPurchaseOrderItem,String> {
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/repository/SapPurchaseOrderRepository.java 0 → 100644
View file @ 4682089d
package com.huigou.topsun.sap.purchaseOrder.repository;
import com.huigou.topsun.sap.purchaseOrder.domain.SapPurchaseOrder;
import org.springframework.data.jpa.repository.JpaRepository;
/**
* @Auther: xin.lu
* @Date: 2024/01/09/19:00
* @Description:
*/
public interface SapPurchaseOrderRepository extends JpaRepository<SapPurchaseOrder,String> {
}
topsun/src/main/resources/config/bpm/topsun/sap/sapPurchaseOrder/sapPurchaseOrderProc.bpmn 0 → 100644
View file @ 4682089d
<?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="sapPurchaseOrderProc" name="采购审批" isExecutable="true">
<extensionElements>
<activiti:executionListener event="start" delegateExpression="#{sapPurchaseOrderApplication}"></activiti:executionListener>
<activiti:executionListener event="end" delegateExpression="#{sapPurchaseOrderApplication}"></activiti:executionListener>
</extensionElements>
<startEvent id="startevent1" name="Start"></startEvent>
<endEvent id="endevent1" name="End"></endEvent>
<userTask id="Apply" name="采购订单申请" activiti:formKey="sapPurchaseOrder/showSapPurchaseOrderDetail.job">
<extensionElements>
<activiti:taskListener event="all" delegateExpression="#{sapPurchaseOrderApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{sapPurchaseOrderApplication}"></activiti:taskListener>
</extensionElements>
</userTask>
<userTask id="Approve" name="采购订单审批" activiti:assignee="${assignee} " activiti:formKey="sapPurchaseOrder/showSapPurchaseOrderDetail.job">
<extensionElements>
<activiti:taskListener event="all" delegateExpression="#{sapPurchaseOrderApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{sapPurchaseOrderApplication}"></activiti:taskListener>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" activiti:collection="handlerList" activiti:elementVariable="assignee">
<completionCondition>${chiefApprovePassed}</completionCondition>
</multiInstanceLoopCharacteristics>
</userTask>
<sequenceFlow id="flow1" sourceRef="startevent1" targetRef="Apply"></sequenceFlow>
<sequenceFlow id="flow2" sourceRef="Apply" targetRef="Approve"></sequenceFlow>
<exclusiveGateway id="ApproveFinished" name="审批结束"></exclusiveGateway>
<sequenceFlow id="flow3" name="审批通过" sourceRef="ApprovePassed" targetRef="ApproveFinished">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${approvePassed}]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="flow4" name="审批结束" sourceRef="ApproveFinished" targetRef="endevent1">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${approveFinished}]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="flow5" name="审批未结束" sourceRef="ApproveFinished" targetRef="Approve">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${!approveFinished}]]></conditionExpression>
</sequenceFlow>
<exclusiveGateway id="ApprovePassed" name="审批通过"></exclusiveGateway>
<sequenceFlow id="flow6" sourceRef="Approve" targetRef="ApprovePassed"></sequenceFlow>
<sequenceFlow id="flow9" name="审批未通过" sourceRef="ApprovePassed" targetRef="Apply">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${!approvePassed}]]></conditionExpression>
</sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_sapPurchaseOrderProc">
<bpmndi:BPMNPlane bpmnElement="sapPurchaseOrderProc" id="BPMNPlane_sapPurchaseOrderProc">
<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>
<bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
<omgdc:Bounds height="35.0" width="35.0" x="355.0" y="550.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="Apply" id="BPMNShape_Apply">
<omgdc:Bounds height="55.0" width="161.0" x="292.0" y="140.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="Approve" id="BPMNShape_Approve">
<omgdc:Bounds height="55.0" width="161.0" x="292.0" y="240.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="ApproveFinished" id="BPMNShape_ApproveFinished">
<omgdc:Bounds height="40.0" width="40.0" x="352.0" y="440.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="ApprovePassed" id="BPMNShape_ApprovePassed">
<omgdc:Bounds height="40.0" width="40.0" x="352.0" y="349.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
<omgdi:waypoint x="372.0" y="85.0"></omgdi:waypoint>
<omgdi:waypoint x="372.0" y="140.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2">
<omgdi:waypoint x="372.0" y="195.0"></omgdi:waypoint>
<omgdi:waypoint x="372.0" y="240.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3">
<omgdi:waypoint x="372.0" y="389.0"></omgdi:waypoint>
<omgdi:waypoint x="372.0" y="440.0"></omgdi:waypoint>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="48.0" x="320.0" y="396.0"></omgdc:Bounds>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4">
<omgdi:waypoint x="372.0" y="480.0"></omgdi:waypoint>
<omgdi:waypoint x="372.0" y="550.0"></omgdi:waypoint>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="48.0" x="382.0" y="489.0"></omgdc:Bounds>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow5" id="BPMNEdge_flow5">
<omgdi:waypoint x="392.0" y="460.0"></omgdi:waypoint>
<omgdi:waypoint x="519.0" y="459.0"></omgdi:waypoint>
<omgdi:waypoint x="519.0" y="317.0"></omgdi:waypoint>
<omgdi:waypoint x="519.0" y="267.0"></omgdi:waypoint>
<omgdi:waypoint x="489.0" y="267.0"></omgdi:waypoint>
<omgdi:waypoint x="453.0" y="267.0"></omgdi:waypoint>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="60.0" x="459.0" y="411.0"></omgdc:Bounds>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
<omgdi:waypoint x="372.0" y="295.0"></omgdi:waypoint>
<omgdi:waypoint x="372.0" y="349.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow9" id="BPMNEdge_flow9">
<omgdi:waypoint x="352.0" y="369.0"></omgdi:waypoint>
<omgdi:waypoint x="231.0" y="369.0"></omgdi:waypoint>
<omgdi:waypoint x="231.0" y="167.0"></omgdi:waypoint>
<omgdi:waypoint x="292.0" y="167.0"></omgdi:waypoint>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="60.0" x="257.0" y="376.0"></omgdc:Bounds>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>
\ No newline at end of file
topsun/src/main/resources/config/topsun/base/bsnMessage.xml
View file @ 4682089d
......@@ -3,19 +3,18 @@
<query name="queryExecuteBsnMessage" label="bsn业务人员表" table="bsn_message_execute">
<sql-query>
SELECT t.id,t.message_sponsor_id,t.task_execute,t.business_code,t.create_date,t.finished_date,t.active,
CASE WHEN t.active = 3 THEN CONCAT(t.task_describe, '[驳回]') ELSE t.task_describe END AS task_describe,
SELECT t.id,t.message_sponsor_id,t.task_execute,t.business_code,t.update_date,t.finished_date,t.active,
CASE WHEN t.active = 3 THEN CONCAT(t.task_describe, :addText) ELSE t.task_describe END AS task_describe,
t2.title,
t2.executor_url,
t2.business_id
FROM bsn_message_execute t
LEFT JOIN bsn_message_sponsor t2 ON t2.id = t.message_sponsor_id
WHERE t.active IN (0, 3)
WHERE t.active IN (0, 3) and task_execute = :taskExecute
</sql-query>
<condition column="taskExecute" name="taskExecute" type="java.lang.String" symbol="=" alias="t"/>
</query>
<query name="queryFinishBsnMessageSponsor" label="bsn业务人员表" table="bsn_message">
<query name="queryFinishBsnMessageSponsor" label="bsn业务人员表" table="bsn_message_sponsor">
<sql-query>
SELECT t.*
FROM bsn_message_sponsor t
......@@ -28,4 +27,16 @@
)
</sql-query>
</query>
<query name="queryBrotherExecute" label="bsn业务人员表" table="bsn_message">
<sql-query>
SELECT *
FROM `bsn_message_execute`
WHERE message_sponsor_id = (
SELECT message_sponsor_id
FROM `bsn_message_execute`
WHERE id = :meId
) AND id != :meId
</sql-query>
</query>
</query-mappings>
\ No newline at end of file
topsun/src/main/resources/config/topsun/sap/sapPurchaseOrder/sapPurchaseOrder.xml 0 → 100644
View file @ 4682089d
<?xml version="1.0" encoding="UTF-8" ?>
<query-mappings>
<query name="sapPurchaseOrderList" label="SAP采购审批" table="sap_purchase_order">
<sql-query>
select t.* from sap_purchase_order t
</sql-query>
<condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
</query>
</query-mappings>
\ No newline at end of file
topsun/src/main/resources/config/topsun/sap/sapPurchaseOrder/sapPurchaseOrderItem.xml 0 → 100644
View file @ 4682089d
<?xml version="1.0" encoding="UTF-8" ?>
<query-mappings>
<query name="sapPurchaseOrderItems" label="SAP采购申请明细" table="sap_purchase_order_item">
<sql-query>
select t.* from sap_purchase_order_item t
</sql-query>
<condition column="purchase_order_Id" name="purchaseOrderId" type="java.lang.String" symbol="=" alias="t"/>
</query>
</query-mappings>
\ No newline at end of file
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