Skip to content

T
topsun-bpm
Commit 2121aaa3 authored by 1650842865's avatar 1650842865
Browse files
Options

固定资产相关任务标题加上编码和描述；显示选择编码对应的描述

parent b10220dc
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 234 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssess/sapFixedAssessList.js
View file @ 2121aaa3
......@@ -43,6 +43,8 @@ function loadGrid() {
url: web_app.name + '/sapFixedAssess/slicedSapFixedAssessList.ajax',
pageSize: 20,
usePager: true,
sortName: 'fillinDate',
sortOrder: 'desc',
toolbar: toolbarOptions,
width: "100%",
height: "100%",
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsDetail.js
View file @ 2121aaa3
......@@ -16,7 +16,7 @@ function initializateUI() {
}
function bindQueryEvent() {
$('#kostl').searchbox({
$('#kostlName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
......@@ -25,10 +25,12 @@ function bindQueryEvent() {
},
onChange: function (value, data) {
$('#kostl').val(data.KOSTL);
$('#kostlv').val(data.LTEXT);
$('#kostlName').val(data.LTEXT);
$('#kostlv').val(data.KOSTL);
$('#kostlvName').val(data.LTEXT);
}
});
$('#kostlv').searchbox({
$('#kostlvName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
......@@ -36,10 +38,11 @@ function bindQueryEvent() {
}
},
onChange: function (value, data) {
$('#kostlv').val(data.LTEXT);
$('#kostlv').val(data.KOSTL);
$('#kostlvName').val(data.LTEXT);
}
});
$('#anlkl').searchbox({
$('#anlklName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
......@@ -49,6 +52,7 @@ function bindQueryEvent() {
},
onChange: function (value, data) {
$('#anlkl').val(data.ANLKL);
$('#anlklName').val(data.TXK20);
//当资产类别为Z701-Z703时，成本中心字段设置为灰色不允许填写，当资产类别为其他时成本中心字段设置为必输项。
if (data.ANLKL.indexOf("Z7")>=0){
disable();
......@@ -57,70 +61,44 @@ function bindQueryEvent() {
}
}
});
$('#bukrs').searchbox({
$('#bukrsName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "BUKRS"}
},
onChange: function (value, data) {
$('#bukrs').val(data.BUKRS);
$('#bukrsName').val(data.BUTXT);
}
});
$('#meins').searchbox({
$('#meinsName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "MEINS"}
},
onChange: function (value, data) {
$('#meins').val(data.MSEH3);
$('#meinsName').val(data.MSEHL);
}
});
}
function disable(){
UICtrl.setElRequiredFlag("#kostl",false);
UICtrl.setElRequiredFlag("#kostlv",false);
UICtrl.disable("#kostl")
UICtrl.disable("#kostlv")
UICtrl.setElRequiredFlag("#kostlName",false);
UICtrl.setElRequiredFlag("#kostlvName",false);
UICtrl.disable("#kostlName")
UICtrl.disable("#kostlvName")
$("#kostl").val("")
$("#kostlName").val("")
$("#kostlv").val("")
$("#kostlvName").val("")
}
function enable(){
UICtrl.setElRequiredFlag("#kostl",true);
UICtrl.setElRequiredFlag("#kostlv",true);
UICtrl.enable("#kostl")
UICtrl.enable("#kostlv")
}
function getFixedAssetsDetail(fixedAssetsAction) {
//采购订单保存时数据不进行必填验证，提交时数据才进行必填验证
var op = {};
var check = true;
if (fixedAssetsAction == "save") {
check = false;
}
op = {check: check};
var fixedAssets = $('#submitForm').formToJSON(op);
if (!fixedAssets) {
return false;
}
return fixedAssets;
}
function saveData(action) {
debugger
var fixedAssetsDetail = getFixedAssetsDetail("submit");
if (!fixedAssetsDetail) {
return;
}
Public.ajax(web_app.name + '/sapFixedAssets/saveFixedAssets.ajax?code=' + action,fixedAssetsDetail,
function (data) {
setId(data.id);
Public.successTip("数据保存成功");
renderingDictionaries(data);
}
);
UICtrl.setElRequiredFlag("#kostlName",true);
UICtrl.setElRequiredFlag("#kostlvName",true);
UICtrl.enable("#kostlName")
UICtrl.enable("#kostlvName")
}
function closeDispatchTabItem() {
......@@ -134,35 +112,3 @@ function setId(value) {
function getId() {
return $("#id").val();
}
/**
* 渲染带数据字典的select
* @param obj
*/
function renderingDictionaries(obj) {
console.log(obj)
//获取所有select的id名与对象匹配
$("select").each(function () {
var id = $(this).attr("id");
if (obj.hasOwnProperty(id)) {
var keyValuePairs = new Map();
$('#' + id + ' option').each(function () {
var value = $(this).val();
var text = $(this).text();
keyValuePairs.set(value, text);
});
// 获取 对应的文本值
var selectedValue = obj[id];
var selectedText = keyValuePairs.get(selectedValue);
// 将文本值赋值给目标元素
$('#' + id + '_text').val(selectedText);
$('#' + id).val(selectedValue);
console.log("select:" + id+"("+selectedText+":"+selectedValue+")")
}
});
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsDetail.jsp
View file @ 2121aaa3
......@@ -33,16 +33,21 @@
<x:hidden name="menge"/>
<x:hidden name="statusId"/>
<div class="hg-form-row">
<x:inputC name="bukrs" required="true" label="公司代码" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:inputC name="anlkl" required="true" label="资产分类" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:inputC name="bukrsName" required="true" label="公司代码" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:hidden name="bukrs"/>
<x:inputC name="anlklName" required="true" label="资产分类" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:hidden name="anlkl" />
<x:inputC name="anln1" required="false" readonly="true" label="主资产号" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="txt50" required="true" label="文本" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="txa50" required="true" label="规格型号" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="invnr" required="false" label="存货号" labelCol="2" maxLength="64" fieldCol="4" />
<%--<x:inputC name="menge" required="true" label="数量" labelCol="2" maxLength="64" fieldCol="4" />--%>
<x:inputC name="meins" required="true" label="基本计量单位" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:inputC name="kostl" required="true" label="成本中心" labelCol="2" wrapper="select" fieldCol="4"/>
<x:inputC name="kostlv" required="false" label="责任成本中心" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:inputC name="meinsName" required="true" label="基本计量单位" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:hidden name="meins" />
<x:inputC name="kostlName" required="true" label="成本中心" labelCol="2" wrapper="select" fieldCol="4"/>
<x:hidden name="kostl" />
<x:inputC name="kostlvName" required="false" label="责任成本中心" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:hidden name="kostlv" />
</div>
<div class="blank_div clearfix"></div>
</form>
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsList.js
View file @ 2121aaa3
......@@ -27,14 +27,19 @@ function loadCostCenterListGrid() {
{display: "创建标识", name: "zfiflg", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "主资产号", name: "anln1", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "资产分类", name: "anlkl", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "资产分类描述", name: "anlklName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "公司代码", name: "bukrs", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "公司描述", name: "bukrsName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "文本", name: "txt50", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "规格型号", name: "txa50", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "存货号", name: "invnr", width: 140, minWidth: 60, type: "string", align: "left"},
//{display: "数量", name: "menge", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "基本计量单位", name: "meins", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "基本计量单位", name: "meins", width: 60, minWidth: 60, type: "string", align: "left"},
{display: "基本计量单位描述", name: "meinsName", width: 60, minWidth: 60, type: "string", align: "left"},
{display: "成本中心", name: "kostl", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "成本中心名称", name: "kostlName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "责任成本中心", name: "kostlv", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "责任成本中心名称", name: "kostlvName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "填报日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "流程状态", name: "statusTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "人员名称", name: "personMemberName", width: 140, minWidth: 60, type: "string", align: "left"},
......@@ -46,6 +51,8 @@ function loadCostCenterListGrid() {
url: web_app.name + '/sapFixedAssets/slicedFixedAssetsList.ajax',
pageSize: 20,
usePager: true,
sortName: 'fillinDate',
sortOrder: 'desc',
toolbar: toolbarOptions,
width: "100%",
height: "100%",
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsMove/sapFixedAssetsMoveList.js
View file @ 2121aaa3
......@@ -15,6 +15,7 @@ function loadGrid() {
gridManager = UICtrl.grid("#maingrid", {
columns: [
{display: "单据编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "left"},
{display: "申请状态", name: "statusTextView", width: 60, 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"},
......@@ -28,6 +29,8 @@ function loadGrid() {
url: web_app.name + '/sapFixedAssetsMove/slicedSapFixedAssetsMoveList.ajax',
pageSize: 20,
usePager: true,
sortName: 'fillinDate',
sortOrder: 'desc',
toolbar: toolbarOptions,
width: "100%",
height: "100%",
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedRetirement/sapFixedRetirementList.js
View file @ 2121aaa3
......@@ -40,6 +40,8 @@ function loadGrid() {
url: web_app.name + '/sapFixedRetirement/slicedSapFixedRetirementList.ajax',
pageSize: 20,
usePager: true,
sortName: 'fillinDate',
sortOrder: 'desc',
toolbar: toolbarOptions,
width: "100%",
height: "100%",
......
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedAssessApplicationImpl.java
View file @ 2121aaa3
......@@ -12,6 +12,7 @@ import com.huigou.topsun.sap.fixedAssets.repository.*;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.util.ClassHelper;
import com.huigou.util.DateUtil;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateTask;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -40,20 +41,7 @@ public class SapFixedAssessApplicationImpl extends FlowBroker implements SapFixe
public Map<String, Object> getFixedAssessList(SapFixedAssessQueryRequest queryRequest) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sapFixedAssess");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
if (queryRequest.getStatus() != null) {
queryModel.addCriteria(" and t.status =:status");
queryModel.putParam("status", queryRequest.getStatus());
}
if (queryRequest.getBillCode() != null) {
queryModel.addCriteria(" and t.bill_code =:billCode");
queryModel.putParam("billCode", queryRequest.getBillCode());
}
if (queryRequest.getReason() != null) {
queryModel.addCriteria(" and t.reason like:reason");
queryModel.putLikeParam("reason", queryRequest.getReason());
}
queryModel.putDictionary("status", DictUtil.getDictionary("bizBillStatus"));
queryModel.addCriteria(" order by bill_code desc ");
queryModel.putDictionary("status", BizBillStatus.getMap());
Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
return map;
}
......@@ -69,6 +57,28 @@ public class SapFixedAssessApplicationImpl extends FlowBroker implements SapFixe
sapFixedAssessRepository.delete(id);
});
}
/**
* 设置任务名称
*/
@Override
protected void setTaskDescription(DelegateTask delegateTask) {
String bizId = delegateTask.getExecution().getProcessBusinessKey();
delegateTask.setDescription(this.getApprovalSubjectName(bizId));
}
/**
* 获取任务标题
*
* @param bizId
* @return
*/
private String getApprovalSubjectName(String bizId) {
SapFixedAssess fixedAssess = this.sapFixedAssessRepository.findOne(bizId);
//查询 单据日期
String fillinDateStr = DateUtil.getDateFormat("yyyy-MM-dd HH:mm:ss", fixedAssess.getFillinDate());
//设置标题
return String.format("%s-%s(%s)", "在建工程核算", fixedAssess.getBillCode(), fillinDateStr);
}
@Override
protected void onEnd(DelegateExecution delegateExecution) {
......
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedAssetsApplicationImpl.java
View file @ 2121aaa3
......@@ -13,9 +13,11 @@ import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssetsQueryRequest
import com.huigou.topsun.sap.fixedAssets.domain.vo.SapFixedAssetsReturnVo;
import com.huigou.topsun.sap.fixedAssets.domain.vo.SapFixedAssetsVo;
import com.huigou.topsun.sap.fixedAssets.repository.SapFixedAssetsRepository;
import com.huigou.topsun.sap.purchase.domain.SapPurchase;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.util.ClassHelper;
import com.huigou.util.DateUtil;
import com.huigou.util.StringUtil;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateTask;
......@@ -121,6 +123,29 @@ public class SapFixedAssetsApplicationImpl extends FlowBroker implements SapFixe
return sapFixedAssetsReturnVos;
}
/**
* 设置任务名称
*/
@Override
protected void setTaskDescription(DelegateTask delegateTask) {
String bizId = delegateTask.getExecution().getProcessBusinessKey();
delegateTask.setDescription(this.getApprovalSubjectName(bizId));
}
/**
* 获取任务标题
*
* @param bizId
* @return
*/
private String getApprovalSubjectName(String bizId) {
SapFixedAssets fixedAssets = this.sapFixedAssetsRepository.findOne(bizId);
//查询 单据日期
String fillinDateStr = DateUtil.getDateFormat("yyyy-MM-dd HH:mm:ss", fixedAssets.getFillinDate());
//设置标题
return String.format("%s-%s-%s(%s)", "固定资产", fixedAssets.getBillCode(),fixedAssets.getTxt50(), fillinDateStr);
}
@Override
protected void onAbortProcessInstance(DelegateExecution delegateExecution) {
super.onAbortProcessInstance(delegateExecution);
......
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedAssetsMoveApplicationImpl.java
View file @ 2121aaa3
......@@ -4,6 +4,7 @@ import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.data.query.model.QueryModel;
import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssetsMoveApplication;
import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssetsMoveItemApplication;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssess;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssetsMove;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssetsMoveItem;
import com.huigou.topsun.sap.fixedAssets.domain.TmpFixedAssessMoveData;
......@@ -13,6 +14,7 @@ import com.huigou.topsun.sap.fixedAssets.repository.TmpFixedAssessMoveDataReposi
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.util.ClassHelper;
import com.huigou.util.DateUtil;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateTask;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -38,6 +40,7 @@ public class SapFixedAssetsMoveApplicationImpl extends FlowBroker implements Sap
public Map<String, Object> getFixedAssetsMoveList(SapFixedAssetsMoveQueryRequest queryRequest) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sapFixedAssetsMove");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
queryModel.putDictionary("status",BizBillStatus.getMap());
Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
return map;
}
......@@ -60,6 +63,29 @@ public class SapFixedAssetsMoveApplicationImpl extends FlowBroker implements Sap
return dataList;
}
/**
* 设置任务名称
*/
@Override
protected void setTaskDescription(DelegateTask delegateTask) {
String bizId = delegateTask.getExecution().getProcessBusinessKey();
delegateTask.setDescription(this.getApprovalSubjectName(bizId));
}
/**
* 获取任务标题
*
* @param bizId
* @return
*/
private String getApprovalSubjectName(String bizId) {
SapFixedAssetsMove fixedAssetsMove = this.sapFixedAssetsMoveRepository.findOne(bizId);
//查询 单据日期
String fillinDateStr = DateUtil.getDateFormat("yyyy-MM-dd HH:mm:ss", fixedAssetsMove.getFillinDate());
//设置标题
return String.format("%s-%s(%s)", "固定资产转移", fixedAssetsMove.getBillCode(), fillinDateStr);
}
@Override
protected void onEnd(DelegateExecution delegateExecution) {
super.onEnd(delegateExecution);
......
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedRetirementApplicationImpl.java
View file @ 2121aaa3
......@@ -23,6 +23,7 @@ import com.huigou.uasp.bmp.doc.attachment.domain.model.Attachment;
import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.util.ApplicationContextWrapper;
import com.huigou.util.ClassHelper;
import com.huigou.util.DateUtil;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateTask;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -87,6 +88,29 @@ public class SapFixedRetirementApplicationImpl extends FlowBroker implements Sap
});
}
/**
* 设置任务名称
*/
@Override
protected void setTaskDescription(DelegateTask delegateTask) {
String bizId = delegateTask.getExecution().getProcessBusinessKey();
delegateTask.setDescription(this.getApprovalSubjectName(bizId));
}
/**
* 获取任务标题
*
* @param bizId
* @return
*/
private String getApprovalSubjectName(String bizId) {
SapRetirement sapRetirement = this.sapFixedRetirementRepository.findOne(bizId);
//查询 单据日期
String fillinDateStr = DateUtil.getDateFormat("yyyy-MM-dd HH:mm:ss", sapRetirement.getFillinDate());
//设置标题
return String.format("%s-%s(%s)", "资产报废及处置", sapRetirement.getBillCode(), fillinDateStr);
}
@Override
protected void onEnd(DelegateExecution delegateExecution) {
super.onEnd(delegateExecution);
......
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/domain/SapFixedAssets.java
View file @ 2121aaa3
......@@ -15,6 +15,7 @@ import java.math.BigDecimal;
*/
@Table(name = "sap_fixed_assets")
@Entity
@Data
public class SapFixedAssets extends FlowBillAbstractEntity {
/**
* BPM单号
......@@ -43,12 +44,18 @@ public class SapFixedAssets extends FlowBillAbstractEntity {
@Column(name = "anlkl")
private String anlkl;
@Column(name = "anlkl_name")
private String anlklName;
/**
* 公司代码（必填）
*/
@Column(name = "bukrs")
private String bukrs;
@Column(name = "bukrs_name")
private String bukrsName;
/**
* 文本（必填）
*/
......@@ -79,18 +86,33 @@ public class SapFixedAssets extends FlowBillAbstractEntity {
@Column(name = "meins")
private String meins;
@Column(name = "meins_name")
private String meinsName;
/**
* 成本中心（必填）
*/
@Column(name = "kostl")
private String kostl;
/**
* 成本中心（必填）
*/
@Column(name = "kostl_name")
private String kostlName;
/**
* 责任成本中心
*/
@Column(name = "kostlv")
private String kostlv;
/**
* 责任成本中心
*/
@Column(name = "kostlv_name")
private String kostlvName;
private static final long serialVersionUID = 1L;
/**
* ***********返回接收数据*****************
......@@ -117,140 +139,4 @@ public class SapFixedAssets extends FlowBillAbstractEntity {
return "sapFixedAssets";
}
public SapFixedAssets() {
}
public SapFixedAssets(String zfibpmnr, Integer zfiflg, String anln1, String anlkl, String bukrs, String txt50, String invnr, BigDecimal menge, String meins, String kostl, String kostlv) {
this.zfibpmnr = zfibpmnr;
this.zfiflg = zfiflg;
this.anln1 = anln1;
this.anlkl = anlkl;
this.bukrs = bukrs;
this.txt50 = txt50;
this.invnr = invnr;
this.menge = menge;
this.meins = meins;
this.kostl = kostl;
this.kostlv = kostlv;
}
public String getZfibpmnr() {
return zfibpmnr;
}
public void setZfibpmnr(String zfibpmnr) {
this.zfibpmnr = zfibpmnr;
}
public Integer getZfiflg() {
return zfiflg;
}
public void setZfiflg(Integer zfiflg) {
this.zfiflg = zfiflg;
}
public String getAnln1() {
return anln1;
}
public void setAnln1(String anln1) {
this.anln1 = anln1;
}
public String getAnlkl() {
return anlkl;
}
public void setAnlkl(String anlkl) {
this.anlkl = anlkl;
}
public String getBukrs() {
return bukrs;
}
public void setBukrs(String bukrs) {
this.bukrs = bukrs;
}
public String getTxt50() {
return txt50;
}
public void setTxt50(String txt50) {
this.txt50 = txt50;
}
public String getTxa50() {
return txa50;
}
public void setTxa50(String txa50) {
this.txa50 = txa50;
}
public String getInvnr() {
return invnr;
}
public void setInvnr(String invnr) {
this.invnr = invnr;
}
public BigDecimal getMenge() {
return menge;
}
public void setMenge(BigDecimal menge) {
this.menge = menge;
}
public String getMeins() {
return meins;
}
public void setMeins(String meins) {
this.meins = meins;
}
public String getKostl() {
return kostl;
}
public void setKostl(String kostl) {
this.kostl = kostl;
}
public String getKostlv() {
return kostlv;
}
public void setKostlv(String kostlv) {
this.kostlv = kostlv;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public String getMessageV1() {
return messageV1;
}
public void setMessageV1(String messageV1) {
this.messageV1 = messageV1;
}
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/domain/vo/SapFixedAssetsVo.java
View file @ 2121aaa3
......@@ -105,6 +105,16 @@ public class SapFixedAssetsVo implements Serializable {
private String personMemberName;
private String anlklName;
private String bukrsName;
private String meinsName;
private String kostlName;
private String kostlvName;
public static SapFixedAssets getSapFixedAssets(SapFixedAssetsVo sapFixedAssetsVo) {
return JSON.parseObject(JSON.toJSONString(sapFixedAssetsVo), SapFixedAssets.class);
}
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @ 2121aaa3
......@@ -113,7 +113,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
if (StringUtil.isNotBlank(sdo.getString("distribute"))){ //是否已分发
baseInfo.setDistribute(2);
} else {
baseInfo.setDistribute(sdo.getInteger("active"));
baseInfo.setDistribute(0);
}
if ("K".equals(businessCode)){ //首页进入的基本信息维护
baseInfo.setGenericName(sdo.getString("genericName"));
......
topsun/src/main/resources/config/topsun/sap/fixedAssets/fixedAssess.xml
View file @ 2121aaa3
......@@ -24,6 +24,8 @@
from sap_fixed_assess t left join sap_fixed_assess_item ti on t.id = ti.sap_fixed_assess_id where 1=1
</sql-query>
<condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
<condition column="reason" name="reason" type="java.lang.String" symbol="like" alias="t"/>
<condition column="status" name="status" type="java.lang.Integer" symbol="in" 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