Commit 0f40f43f authored by 刘学辉's avatar 刘学辉

Merge remote-tracking branch 'origin/dev' into dev

parents d22c9e23 fa3d3767
var gridManager = null;
$(document).ready(function () {
initialize();
loadGrid();
bindEvent();
});
function initialize(){
UICtrl.layout("#layout", {leftWidth: 3});
}
function bindEvent(){
}
function loadGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: function () {
UICtrl.addGridRow(gridManager);
},
deleteHandler: function () {
var _grid = UICtrl.getGridManager('#maingrid');
DataUtil.delSelectedRows({
action: 'sapFixedAssetsMoveItem/deleteSapFixedAssetsMoveItems.ajax',
param: {},
gridManager: _grid,
idFieldName: 'id',
onSuccess: function () {
reloadGrid();
}
});
}
});
gridManager = UICtrl.grid("#maingrid", {
columns: [
{
display: "主资产号", name: "anln1", width: 140, minWidth: 60, type: "string", align: "left",
/*editor: {
required: true, type: "select",
data: {
type: 'system',
name: "querySapFixedAssets",
back: {
anln1: "anln1",
}
},
}*/
editor: {
type: "text"
}
},
{
display: "公司代码", name: "bukrs", width: 140, minWidth: 60, type: "string", align: "left",
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {paramValue: "BUKRS"}
},
back: {
BUKRS: "bukrs",
}
},
}
},
{
display: "成本中心", name: "kostl", width: 140, minWidth: 60, type: "string", align: "left",
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "queryCostCenter",
back: {
kostl: "kostl",
}
},
}
},
],
dataAction: "server",
url: web_app.name + '/sapFixedAssetsMoveItem/querySapFixedAssetsMoveItems.ajax',
pageSize: 10,
usePager: true,
parms:{sapFixedAssetsMoveId:getId()},
toolbar: toolbarOptions,
enabledEdit: true,
width: "100%",
height: "100%",
heightDiff: -8,
checkbox: true,
fixedCellHeight: true,
selectRowButtonOnly: true,
});
UICtrl.setSearchAreaToggle(gridManager);
}
/**
* 流程引擎回调设置打样的id
* @param value 打样申请的id
*/
function setId(id) {
$("#id").val(id);
var _grid=UICtrl.getGridManager('#maingrid');
_grid.options.parms.sapFixedAssetsMoveId = id;
}
/**
* 流程引擎获取打样申请id的回掉方法。
* @return 打样申请的id
*/
function getId() {
return $("#id").val() || "";
}
function reloadGrid() {
gridManager.loadData();
}
function getExtendedData(processAction) {
//回退、打回、转交时,不需要验证必填项是否已经填写;
if (processAction == ProcessAction.BACK
|| processAction == ProcessAction.REPLENISH
|| processAction == ProcessAction.TRANSMIT) {
//不验证
$('#submitForm').attr('check', false);
}
var extendedData = {};
var _grid = UICtrl.getGridManager('#maingrid');
if (_grid) {
var datas = DataUtil.getGridData({
gridManager: _grid,
isAllData: true
});
if (!datas) {
return false;
}
extendedData.items = Public.encodeJSONURI(datas);
}
return extendedData;
}
<%@ 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/fixedAssets/sapFixedAssetsMove/sapFixedAssetsMoveDetail.js'/>
</head>
<body>
<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"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="tel" required="true" label="联系方式" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="reason" required="true" label="原因" labelCol="2" fieldCol="6"/>
</div>
</div>
<div class="blank_div clearfix"></div>
<div id="maingrid" style="margin: 2px;">
</div>
</form>
</body>
</html>
var gridManager = null;
$(document).ready(function () {
initUI();
loadGrid();
})
function initUI() {
UICtrl.initDefaultLayout();
}
function loadGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: addHandler,
});
gridManager = UICtrl.grid("#maingrid", {
columns: [
{display: "单据编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "left"},
{display: "创建日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "联系电话", name: "tel", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "原因", name: "reason", width: 300, minWidth: 60, type: "string", align: "left"},
{display: "资产编号", name: "anln1", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "公司代码", name: "bukrs", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "成本中心", name: "kostl", width: 200, minWidth: 60, type: "string", align: "left"},
],
dataAction: "server",
url: web_app.name + '/sapFixedAssetsMove/slicedSapFixedAssetsMoveList.ajax',
pageSize: 20,
usePager: true,
toolbar: toolbarOptions,
width: "100%",
height: "100%",
heightDiff: -8,
checkbox: true,
fixedCellHeight: true,
selectRowButtonOnly: true,
onDblClickRow: function (data, rowindex, rowobj) {
doView(data.sapFixedAssetsMoveId);
},
});
UICtrl.setSearchAreaToggle(gridManager);
}
function query(obj) {
var param = $(obj).formToJSON();
UICtrl.gridSearch(gridManager, param);
}
function reloadGrid() {
gridManager.loadData();
}
function resetForm(obj) {
$(obj).formClean();
}
//删除按钮
function deleteHandler() {
DataUtil.del({
action: 'sapFixedAssetsMove/deleteSapFixedAssetsMove.ajax',
gridManager: gridManager, idFieldName: 'id',
onSuccess: function () {
reloadGrid();
}
});
}
function addHandler() {
UICtrl.addTabItem({
tabid: 'addSapFixedAssetsMove',
text: "固定资产转移",
url: web_app.name + '/sapFixedAssetsMove/forwardSapFixedAssetsMoveDetail.job'
});
}
function doView(id) {
UICtrl.addTabItem({
tabid: 'viewSapFixedAssetsMove'+id,
text: "固定资产转移",
url: web_app.name + '/sapFixedAssetsMove/showFixedAssetsMove.job?bizId='+id+"&isReadOnly=true"
});
}
<%@ 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,combox,commonTree"/>
<x:script src='/biz/topsun/sap/fixedAssets/sapFixedAssetsMove/sapFixedAssetsMoveList.js'/>
</head>
<body>
<div class="container-fluid">
<div class="ui-hide">
</div>
<div id="layout">
<div position="center" title="固定资产转移">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/>
<x:searchButtons/>
</form>
<div class="blank_div clearfix"></div>
<div id="maingrid" style="margin: 2px;"></div>
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
......@@ -119,6 +119,8 @@ function loadStatsIndicatorsDetailListGrid() {
*/
function setId(id) {
$("#id").val(id);
var _grid=UICtrl.getGridManager('#statsIndicatorsDetailGrid');
_grid.options.parms.statsIndicatorsId = id;
}
/**
......
package com.huigou.topsun.sap.fixedAssets.application;
import com.huigou.context.Operator;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssetsMove;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssetsMoveQueryRequest;
import com.huigou.topsun.sap.fixedAssets.domain.vo.SapFixedAssetsMoveVo;
import java.util.List;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2024/03/02/16:35
* @Description:
*/
public interface SapFixedAssetsMoveApplication {
public static final String QUERY_XML_FILE_PATH = "config/topsun/sap/fixedAssets/fixedAssetsMove.xml";
String PROCESS_DEFINITION_KEY = "sapFixedAssetsMoveProc";
Map<String, Object> getFixedAssetsMoveList(SapFixedAssetsMoveQueryRequest sapFixedAssetsVo);
SapFixedAssetsMove getFixedAssetsMoveById(String id);
void deleteByIds(List<String> ids);
}
package com.huigou.topsun.sap.fixedAssets.application;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssetsMoveItem;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssetsMoveQueryRequest;
import java.util.List;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2024/03/02/16:35
* @Description:
*/
public interface SapFixedAssetsMoveItemApplication {
public static final String QUERY_XML_FILE_PATH = "config/topsun/sap/fixedAssets/fixedAssetsMoveItem.xml";
void saveSapFixedAssetsMoveItemItems(String sapFixedAssetsMoveId, List<SapFixedAssetsMoveItem> items);
Map<String,Object> querySapFixedAssetsMoveItems(SapFixedAssetsMoveQueryRequest queryRequest);
void deleteByIds(List<String> ids);
List<SapFixedAssetsMoveItem> findBySapFixedAssetsMoveId(String sapFixedAssetsMoveId);
}
package com.huigou.topsun.sap.fixedAssets.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.data.query.model.QueryModel;
import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssetsApplication;
import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssetsMoveApplication;
import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssetsMoveItemApplication;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssetsMove;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssetsMoveItem;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssetsMoveQueryRequest;
import com.huigou.topsun.sap.fixedAssets.repository.SapFixedAssetsMoveRepository;
import com.huigou.topsun.sap.purchase.domain.SapPurchaseItem;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.util.ClassHelper;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateTask;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2024/03/02/16:35
* @Description:
*/
@Service("sapFixedAssetsMoveApplication")
public class SapFixedAssetsMoveApplicationImpl extends FlowBroker implements SapFixedAssetsMoveApplication {
@Autowired
private SapFixedAssetsMoveRepository sapFixedAssetsMoveRepository;
@Autowired
private SapFixedAssetsMoveItemApplication sapFixedAssetsMoveItemApplication;
@Override
public Map<String, Object> getFixedAssetsMoveList(SapFixedAssetsMoveQueryRequest queryRequest) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sapFixedAssetsMove");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
return map;
}
@Override
public SapFixedAssetsMove getFixedAssetsMoveById(String id) {
return sapFixedAssetsMoveRepository.findOne(id);
}
@Override
public void deleteByIds(List<String> ids) {
ids.forEach(id->{
sapFixedAssetsMoveRepository.delete(id);
});
}
@Override
protected void onEnd(DelegateExecution delegateExecution) {
super.onEnd(delegateExecution);
String bizId = delegateExecution.getProcessBusinessKey();
BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
SapFixedAssetsMove fixedAssetsMove = sapFixedAssetsMoveRepository.findOne(bizId);
fixedAssetsMove.setStatusId(status.getId());
sapFixedAssetsMoveRepository.save(fixedAssetsMove);
}
@Override
protected void onAbortProcessInstance(DelegateExecution delegateExecution) {
super.onAbortProcessInstance(delegateExecution);
String bizId = delegateExecution.getProcessBusinessKey();
SapFixedAssetsMove fixedAssetsMove = sapFixedAssetsMoveRepository.findOne(bizId);
fixedAssetsMove.setStatusId(BizBillStatus.ABORTED.getId());
sapFixedAssetsMoveRepository.save(fixedAssetsMove);
}
@Override
protected void onBack(DelegateTask delegateTask, String destActivityId) {
super.onBack(delegateTask, destActivityId);
if ("Apply".equalsIgnoreCase(destActivityId)) {
String bizId = delegateTask.getExecution().getProcessBusinessKey();
SapFixedAssetsMove fixedAssetsMove = sapFixedAssetsMoveRepository.findOne(bizId);
fixedAssetsMove.setStatusId(BizBillStatus.APPLYING.getId());
sapFixedAssetsMoveRepository.save(fixedAssetsMove);
}
}
@Override
protected Map<String, Object> getProcessBizParams(String bizId) {
return ClassHelper.toMap(sapFixedAssetsMoveRepository.getOne(bizId));
}
@Override
protected String saveBizAndApprovalData() {
super.saveBizAndApprovalData();
SapFixedAssetsMove fixedAssetsMove = getBizEntity(SapFixedAssetsMove.class);
if (fixedAssetsMove.isNew()) {
fixedAssetsMove.setStatusId(BizBillStatus.APPLYING.getId());
} else {
fixedAssetsMove = (SapFixedAssetsMove) commonDomainService.loadAndFillinProperties(fixedAssetsMove);
}
fixedAssetsMove = sapFixedAssetsMoveRepository.save(fixedAssetsMove);
List<SapFixedAssetsMoveItem> items = getBizEntities(SapFixedAssetsMoveItem.class, "items");
sapFixedAssetsMoveItemApplication.saveSapFixedAssetsMoveItemItems(fixedAssetsMove.getId(),items);
return fixedAssetsMove.getId();
}
}
package com.huigou.topsun.sap.fixedAssets.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.data.query.model.QueryModel;
import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssetsMoveItemApplication;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssetsMoveItem;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssetsMoveQueryRequest;
import com.huigou.topsun.sap.fixedAssets.repository.SapFixedAssetsMoveItemRepository;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import com.huigou.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2024/03/02/16:36
* @Description:
*/
@Service("sapFixedAssetsMoveItemApplication")
public class SapFixedAssetsMoveItemApplicationImpl extends BaseApplication implements SapFixedAssetsMoveItemApplication {
@Autowired
private SapFixedAssetsMoveItemRepository sapFixedAssetsMoveItemRepository;
@Override
public void saveSapFixedAssetsMoveItemItems(String sapFixedAssetsMoveId, List<SapFixedAssetsMoveItem> items) {
for (SapFixedAssetsMoveItem item : items) {
item.setSapFixedAssetsMoveId(sapFixedAssetsMoveId);
sapFixedAssetsMoveItemRepository.save(item);
}
}
@Override
public Map<String, Object> querySapFixedAssetsMoveItems(SapFixedAssetsMoveQueryRequest queryRequest) {
Map<String, Object> map = new HashMap<>();
if (StringUtil.isNotBlank(queryRequest.getSapFixedAssetsMoveId())){
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sapFixedAssetsMoveItems");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
}
return map;
}
@Override
public void deleteByIds(List<String> ids) {
ids.forEach(id->{
sapFixedAssetsMoveItemRepository.delete(id);
});
}
@Override
public List<SapFixedAssetsMoveItem> findBySapFixedAssetsMoveId(String sapFixedAssetsMoveId) {
return sapFixedAssetsMoveItemRepository.findBySapFixedAssetsMoveId(sapFixedAssetsMoveId);
}
}
package com.huigou.topsun.sap.fixedAssets.controller;
import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssetsMoveApplication;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssetsMove;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssetsMoveQueryRequest;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import org.springframework.stereotype.Controller;
import javax.annotation.Resource;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2024/03/02/16:34
* @Description:
*/
@Controller
@ControllerMapping("/sapFixedAssetsMove")
public class SapFixedAssetsMoveController extends CommonController {
@Override
protected String getPagePath() {
return "/biz/topsun/sap/fixedAssets/sapFixedAssetsMove/";
}
@Resource
private SapFixedAssetsMoveApplication sapFixedAssetsMoveApplication;
public String forwardSapFixedAssetsMoveList(){
return forward("sapFixedAssetsMoveList");
}
public String slicedSapFixedAssetsMoveList(){
SDO sdo = this.getSDO();
SapFixedAssetsMoveQueryRequest queryRequest = sdo.toQueryRequest(SapFixedAssetsMoveQueryRequest.class);
Map<String, Object> map = sapFixedAssetsMoveApplication.getFixedAssetsMoveList(queryRequest);
return toResult(map);
}
public String forwardSapFixedAssetsMoveDetail(){
this.putAttribute("processDefinitionKey", SapFixedAssetsMoveApplication.PROCESS_DEFINITION_KEY);
// 新增的时候procUnitId一定要设置成Apply,不然jsp页面的所有表单元素是readonly状态
this.putAttribute("procUnitId", "Apply");
SapFixedAssetsMove sapFixedAssetsMove = new SapFixedAssetsMove();
sapFixedAssetsMove.setStatusId(BizBillStatus.APPLYING.getId());
/**
* 设置jsp页面初始化填充数据,如果不设置, 那么在jsp页面上填写完表单之后立即提交申请TaskDescription获取不到时间和相关人员信息
*/
Operator operator = getOperator();
sapFixedAssetsMove.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
return forward("sapFixedAssetsMoveDetail",sapFixedAssetsMove);
}
public String showFixedAssetsMove(){
SDO sdo = this.getSDO();
String id = sdo.getBizId();
SapFixedAssetsMove sapFixedAssetsMove = sapFixedAssetsMoveApplication.getFixedAssetsMoveById(id);
return forward("sapFixedAssetsMoveDetail",sapFixedAssetsMove);
}
}
package com.huigou.topsun.sap.fixedAssets.controller;
import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssetsMoveItemApplication;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssetsMoveQueryRequest;
import com.huigou.topsun.sap.purchase.application.SapPurchaseItemApplication;
import com.huigou.topsun.sap.purchase.domain.query.SapPurchaseItemQueryRequest;
import com.huigou.topsun.sap.purchase.repository.SapPurchaseItemRepository;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2024/03/02/16:34
* @Description:
*/
@Controller
@ControllerMapping("/sapFixedAssetsMoveItem")
public class SapFixedAssetsMoveItemController extends CommonController {
@Autowired
private SapFixedAssetsMoveItemApplication sapFixedAssetsMoveItemApplication;
public String querySapFixedAssetsMoveItems(){
SDO sdo = this.getSDO();
SapFixedAssetsMoveQueryRequest queryRequest = sdo.toQueryRequest(SapFixedAssetsMoveQueryRequest.class);
Map<String, Object> map = sapFixedAssetsMoveItemApplication.querySapFixedAssetsMoveItems(queryRequest);
return toResult(map);
}
public String deleteSapFixedAssetsMoveItems(){
SDO sdo = this.getSDO();
List<String> ids = sdo.getIds();
sapFixedAssetsMoveItemApplication.deleteByIds(ids);
return success();
}
}
package com.huigou.topsun.sap.fixedAssets.domain;
import com.huigou.data.domain.model.FlowBillAbstractEntity;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* SAP固定资产转移
*
* @TableName sap_fixed_assets_move
*/
@Table(name = "sap_fixed_assets_move")
@Entity
@Data
public class SapFixedAssetsMove extends FlowBillAbstractEntity {
/**
* 联系方式
*/
@Column(name = "tel")
private String tel;
/**
* 原因
*/
@Column(name = "reason")
private Integer reason;
@Override
protected String getCodeRuleId() {
return "sapFixedAssetsMove";
}
}
\ No newline at end of file
package com.huigou.topsun.sap.fixedAssets.domain;
import com.huigou.data.domain.model.AbstractEntity;
import com.huigou.data.domain.model.FlowBillAbstractEntity;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* SAP固定资产转移
*
* @TableName sap_fixed_assets_move_item
*/
@Table(name = "sap_fixed_assets_move_item")
@Entity
@Data
public class SapFixedAssetsMoveItem extends AbstractEntity {
/**
* SAP固定资产转移ID
*/
@Column(name = "sap_fixed_assets_move_id")
private String sapFixedAssetsMoveId;
/**
* 主资产号
*/
@Column(name = "anln1")
private String anln1;
/**
* 公司代码(必填)
*/
@Column(name = "bukrs")
private String bukrs;
/**
* 成本中心(必填)
*/
@Column(name = "kostl")
private String kostl;
}
\ No newline at end of file
package com.huigou.topsun.sap.fixedAssets.domain;
import com.huigou.data.domain.model.FlowBillAbstractEntity;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Auther: xin.lu
* @Date: 2024/03/03/10:45
* @Description:资产报废及处置
*/
@Table(name = "sap_retirement")
@Entity
@Data
public class SapRetirement extends FlowBillAbstractEntity {
/**
* 联系方式
*/
@Column(name = "tel")
private String tel;
/**
* 原因
*/
@Column(name = "reason")
private Integer reason;
@Override
protected String getCodeRuleId() {
return "sapRetirement";
}
}
package com.huigou.topsun.sap.fixedAssets.domain;
import com.huigou.data.domain.model.AbstractEntity;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.math.BigDecimal;
import java.util.Date;
/**
* SAP资产报废
*
* @TableName sap_retirement_item
*/
@Table(name = "sap_retirement_item")
@Entity
@Data
public class SapRetirementItem extends AbstractEntity {
/**
* SAP资产报废id
*/
@Column(name = "sap_retirement_item_id")
private String sapRetirementId;
/**
* 主资产号
*/
@Column(name = "anln1")
private String anln1;
/**
* 公司代码(必填)
*/
@Column(name = "bukrs")
private String bukrs;
/**
* 凭证日期
*/
@Column(name = "bldat")
private Date bldat;
/**
* 过账日期
*/
@Column(name = "BUDAT")
private Date budat;
/**
* 资产起息日
*/
@Column(name = "BZDAT")
private Date bzdat;
/**
* 文本
*/
@Column(name = "SGTXT")
private String sgtxt;
/**
* 报废金额
*/
@Column(name = "anbtr")
private BigDecimal anbtr;
/**
* 百分比
*/
@Column(name = "PROZS")
private BigDecimal prozs;
/**
* 购置业务年度
* 数据字典,可选:
* 上一年度购置的业务
* 当前年度购置的业务
*/
@Column(name = "xa")
private String xa;
}
\ No newline at end of file
package com.huigou.topsun.sap.fixedAssets.domain.query;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
/**
* @Auther: xin.lu
* @Date: 2024/03/02/16:38
* @Description:
*/
@Data
public class SapFixedAssetsMoveQueryRequest extends QueryAbstractRequest {
private String sapFixedAssetsMoveId;
}
package com.huigou.topsun.sap.fixedAssets.domain.vo;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther: xin.lu
* @Date: 2024/03/02/16:37
* @Description:
*/
@Data
public class SapFixedAssetsMoveVo implements Serializable {
}
package com.huigou.topsun.sap.fixedAssets.repository;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssetsMoveItem;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
* @Auther: xin.lu
* @Date: 2024/03/02/16:33
* @Description:
*/
public interface SapFixedAssetsMoveItemRepository extends JpaRepository<SapFixedAssetsMoveItem,String> {
List<SapFixedAssetsMoveItem> findBySapFixedAssetsMoveId(String sapFixedAssetsMoveId);
}
package com.huigou.topsun.sap.fixedAssets.repository;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssetsMove;
import org.springframework.data.jpa.repository.JpaRepository;
/**
* @Auther: xin.lu
* @Date: 2024/03/02/16:33
* @Description:
*/
public interface SapFixedAssetsMoveRepository extends JpaRepository<SapFixedAssetsMove,String> {
}
<?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="sapFixedAssetsMoveProc" name="固定资产转移" isExecutable="true">
<extensionElements>
<activiti:executionListener event="start" delegateExpression="#{sapFixedAssetsMoveApplication}"></activiti:executionListener>
<activiti:executionListener event="end" delegateExpression="#{sapFixedAssetsMoveApplication}"></activiti:executionListener>
</extensionElements>
<startEvent id="startevent1" name="Start"></startEvent>
<endEvent id="endevent1" name="End"></endEvent>
<userTask id="Apply" name="固定资产转移申请" activiti:formKey="sapFixedAssetsMove/showFixedAssetsMove.job">
<extensionElements>
<activiti:taskListener event="all" delegateExpression="#{sapFixedAssetsMoveApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{sapFixedAssetsMoveApplication}"></activiti:taskListener>
</extensionElements>
</userTask>
<userTask id="Approve" name="固定资产转移审批" activiti:assignee="${assignee} " activiti:formKey="sapFixedAssetsMove/showFixedAssetsMove.job">
<extensionElements>
<activiti:taskListener event="all" delegateExpression="#{sapFixedAssetsMoveApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{sapFixedAssetsMoveApplication}"></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_sapFixedAssetsMoveProc">
<bpmndi:BPMNPlane bpmnElement="sapFixedAssetsMoveProc" id="BPMNPlane_sapFixedAssetsMoveProc">
<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
<?xml version="1.0" encoding="UTF-8" ?>
<query-mappings>
<query name="sapFixedAssetsMove" label="固定资产转移" table="sap_fixed_assets_move">
<sql-query>
select
t.fillin_date,
t.bill_code,
t.status,
t.full_id,
t.organ_id,
t.organ_name,
t.dept_id,
t.dept_name,
t.position_id,
t.position_name,
t.person_member_id,
t.person_member_name,
t.version,
t.tel,
t.reason,
ti.id,
ti.sap_fixed_assets_move_id,
ti.anln1,
ti.bukrs,
ti.kostl
from sap_fixed_assets_move t left join sap_fixed_assets_move_item ti on t.id = ti.sap_fixed_assets_move_id where 1=1
</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
<?xml version="1.0" encoding="UTF-8" ?>
<query-mappings>
<query name="sapFixedAssetsMoveItems" label="固定资产转移明细" table="sap_fixed_assets_move_item">
<sql-query>
select t.* from sap_fixed_assets_move_item t
</sql-query>
<condition column="sap_fixed_assets_move_id" name="sapFixedAssetsMoveId" 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