Skip to content

T
topsun-bpm
Commit 49afc6df authored by 刘学辉's avatar 刘学辉
Browse files
Options

固定资产报废和在建工程转固导入数据改到明细表导入

parent a48f6b39
Show whitespace changes
Inline Side-by-side
Showing with 225 additions and 69 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssess/sapFixedAssessDetail.js
View file @ 49afc6df
......@@ -36,7 +36,9 @@ function loadGrid() {
reloadGrid();
}
});
}
},
impExcelDataHandler:{id:'impExcelData',img:'fa-table',text:'导入数据',click:impExcelDataHandler},
});
gridManager = UICtrl.grid("#maingrid", {
columns: [
......@@ -64,7 +66,7 @@ function loadGrid() {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {paramValue: "BUKRS"}
return {fieldName: "BUKRS"}
},
back: {
BUKRS: "bukrs",
......@@ -72,19 +74,7 @@ function loadGrid() {
},
}
},
{
display: "成本中心", name: "kostl", width: 140, minWidth: 60, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "queryCostCenter",
back: {
kostl: "kostl",
}
},
}
},
{
display: "凭证日期", name: "bldat", width: 120, minWidth: 60, type: "date", align: "left",
editor: {required: false, type: "date"}
......@@ -98,27 +88,27 @@ function loadGrid() {
editor: {required: false, type: "date"}
},
{
display: "文本", name: "sgtxt", width: 180, minWidth: 60, type: "string", align: "left",
display: "文本", name: "sgtxt", width: 260, minWidth: 60, type: "string", align: "left",
editor: {required: false, type: "text"}
},
{
display: "报废金额", name: "anbtr", width: 100, minWidth: 60, type: "string", align: "left",
editor: {required: false, mask: 'nnnnnnnn.nn',type:"text"}
display: "接收方", name: "empge", width: 180, minWidth: 60, type: "string", align: "left",
editor: {required: false, type: "text"}
},
{
display: "百分比(%)", name: "prozs", width: 100, minWidth: 60, type: "string", align: "left",
editor: {required: false, mask: 'nn',type: "text"}
},
{
display: "购置业务年度", name: "xa", width: 160, minWidth: 60, type: "string", align: "left",
editor: {required: false, type: "text"}
},
display: "金额", name: "betrr", width: 100, minWidth: 60, type: "string", align: "left",
editor: {required: false, mask: 'nnnnnnnn.nn',type:"text"}
}
],
dataAction: "server",
url: web_app.name + '/sapFixedAssessItem/querySapFixedAssessItems.ajax',
pageSize: 10,
usePager: true,
parms:{sapRetirementId:getId()},
parms:{sapFixedAssessId:getId()},
toolbar: toolbarOptions,
enabledEdit: true,
width: "100%",
......@@ -157,6 +147,28 @@ function reloadGrid() {
gridManager.loadData();
}
//从EXCEL导入数据
function impExcelDataHandler(){
ExcelImpManager.showImpDialog('导入', 'sapFixedAssessData', Public.getUUID(), saveUpLoadGrid);
}
function saveUpLoadGrid() {
var batchNumber=$('#batchNumber').val();
Public.ajax(web_app.name + '/sapFixedAssess/importExcelData.ajax'
, {batchNumber: batchNumber}, function (data) {
for (var row=0;row<data.length;row++) {
//debugger
UICtrl.addGridRow(gridManager,{anln1:data[row].anln1,bukrs:data[row].bukrs
,bldat:data[row].bldat,budat:data[row].budat,bzdat:data[row].bzdat
,sgtxt:data[row].sgtxt,empge:data[row].empge,prozs:data[row].prozs,betrr:data[row].betrr
});
}
//reloadGrid();
});
}
function getExtendedData(processAction) {
//回退、打回、转交时，不需要验证必填项是否已经填写；
if (processAction == ProcessAction.BACK
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssess/sapFixedAssessDetail.jsp
View file @ 49afc6df
......@@ -4,6 +4,7 @@
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date,attachment"/>
<x:script src="/system/excelimport/AssignCodeImp.js"/>
<x:script src='/biz/topsun/sap/fixedAssets/sapFixedAssess/sapFixedAssessDetail.js'/>
</head>
<body>
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssess/sapFixedAssessList.js
View file @ 49afc6df
......@@ -12,10 +12,10 @@ function initUI() {
function loadGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: addHandler,
addHandler: addHandler
// exportExcelHandler:exportExcelHandler,
// exportModelHandler:{id:'exportModelHandler',img:'fa-cloud-download',text:'导出模板',click:exportModelHandler},
impExcelDataHandler:{id:'impExcelData',img:'fa-table',text:'导入数据',click:impExcelDataHandler},
// impExcelDataHandler:{id:'impExcelData',img:'fa-table',text:'导入数据',click:impExcelDataHandler},
});
gridManager = UICtrl.grid("#maingrid", {
......@@ -29,13 +29,15 @@ function loadGrid() {
{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"},
// {display: "成本中心", name: "kostl", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "凭证日期", name: "bldat", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "过账日期", name: "budat", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "资产起息日", name: "bzdat", width: 120, minWidth: 60, type: "string", align: "left"},
// {display: "报废金额", name: "anbtr", width: 100, minWidth: 60, type: "string", align: "left"},
// {display: "百分比", name: "prozs", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "购置业务年度", name: "xa", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "接收方", name: "empge", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "百分比", name: "prozs", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "金额", name: "betrr", width: 100, minWidth: 60, type: "string", align: "left"}
// {display: "购置业务年度", name: "xa", width: 120, minWidth: 60, type: "string", align: "left"},
],
dataAction: "server",
url: web_app.name + '/sapFixedAssess/slicedSapFixedAssessList.ajax',
......@@ -49,7 +51,7 @@ function loadGrid() {
fixedCellHeight: true,
selectRowButtonOnly: true,
onDblClickRow: function (data, rowindex, rowobj) {
doView(data.sapRetirementId);
doView(data.sapFixedAssessId);
},
});
UICtrl.setSearchAreaToggle(gridManager);
......@@ -81,7 +83,7 @@ function deleteHandler() {
function addHandler() {
UICtrl.addTabItem({
tabid: 'addSapFixedRetirement',
tabid: 'addSapFixedAssess',
text: "在建工程转固",
url: web_app.name + '/sapFixedAssess/forwardSapFixedAssessDetail.job'
});
......@@ -89,7 +91,7 @@ function addHandler() {
function doView(id) {
UICtrl.addTabItem({
tabid: 'viewSapFixedRetirement'+id,
tabid: 'viewSapFixedAssess'+id,
text: "在建工程转固",
url: web_app.name + '/sapFixedAssess/showFixedAssess.job?bizId='+id+"&isReadOnly=true"
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedRetirement/sapFixedRetirementDetail.js
View file @ 49afc6df
......@@ -36,7 +36,9 @@ function loadGrid() {
reloadGrid();
}
});
}
},
impExcelDataHandler:{id:'impExcelData',img:'fa-table',text:'导入数据',click:impExcelDataHandler},
});
gridManager = UICtrl.grid("#maingrid", {
columns: [
......@@ -64,7 +66,7 @@ function loadGrid() {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {paramValue: "BUKRS"}
return {fieldName: "BUKRS"}
},
back: {
BUKRS: "bukrs",
......@@ -72,7 +74,7 @@ function loadGrid() {
},
}
},
{
/*{
display: "成本中心", name: "kostl", width: 140, minWidth: 60, type: "string", align: "left",
editor: {
required: false, type: "select",
......@@ -84,7 +86,7 @@ function loadGrid() {
}
},
}
},
}, */
{
display: "凭证日期", name: "bldat", width: 120, minWidth: 60, type: "date", align: "left",
editor: {required: false, type: "date"}
......@@ -111,8 +113,9 @@ function loadGrid() {
},
{
display: "购置业务年度", name: "xa", width: 160, minWidth: 60, type: "string", align: "left",
editor: {required: false, type: "text"}
},
// editor: {required: false, type: "text"}
editor: {type:'dictionary',data:{name: 'sapFixedRetirementYear'} ,textField:'xaTextView',valueField:'xa'}
}
],
dataAction: "server",
url: web_app.name + '/sapFixedRetirementItem/querySapFixedRetirementItems.ajax',
......@@ -157,6 +160,27 @@ function reloadGrid() {
gridManager.loadData();
}
//从EXCEL导入数据
function impExcelDataHandler(){
ExcelImpManager.showImpDialog('导入', 'sapFixedRetirementData', Public.getUUID(), saveUpLoadGrid);
}
function saveUpLoadGrid() {
var batchNumber=$('#batchNumber').val();
Public.ajax(web_app.name + '/sapFixedRetirement/importExcelData.ajax'
, {batchNumber: batchNumber}, function (data) {
for (var row=0;row<data.length;row++) {
//debugger
UICtrl.addGridRow(gridManager,{anln1:data[row].anln1,bukrs:data[row].bukrs
,bldat:data[row].bldat,budat:data[row].budat,bzdat:data[row].bzdat
,sgtxt:data[row].sgtxt,xa:data[row].xa,prozs:data[row].prozs,anbtr:data[row].anbtr
});
}
//reloadGrid();
});
}
function getExtendedData(processAction) {
//回退、打回、转交时，不需要验证必填项是否已经填写；
if (processAction == ProcessAction.BACK
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedRetirement/sapFixedRetirementDetail.jsp
View file @ 49afc6df
......@@ -4,6 +4,7 @@
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date,attachment"/>
<x:script src="/system/excelimport/AssignCodeImp.js"/>
<x:script src='/biz/topsun/sap/fixedAssets/sapFixedRetirement/sapFixedRetirementDetail.js'/>
</head>
<body>
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedRetirement/sapFixedRetirementList.js
View file @ 49afc6df
......@@ -12,10 +12,9 @@ function initUI() {
function loadGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: addHandler,
addHandler: addHandler
// exportExcelHandler:exportExcelHandler,
// exportModelHandler:{id:'exportModelHandler',img:'fa-cloud-download',text:'导出模板',click:exportModelHandler},
impExcelDataHandler:{id:'impExcelData',img:'fa-table',text:'导入数据',click:impExcelDataHandler},
});
gridManager = UICtrl.grid("#maingrid", {
......@@ -29,7 +28,7 @@ function loadGrid() {
{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"},
// {display: "成本中心", name: "kostl", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "凭证日期", name: "bldat", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "过账日期", name: "budat", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "资产起息日", name: "bzdat", width: 120, minWidth: 60, type: "string", align: "left"},
......@@ -94,17 +93,7 @@ function doView(id) {
url: web_app.name + '/sapFixedRetirement/showFixedRetirement.job?bizId='+id+"&isReadOnly=true"
});
}
//导出模板
function exportModelHandler() {
// if(getTemplateId() == ''){
// Public.tip('请选择数据模板。');
// return;
// }
var templetName='固定资产报废';
var templateId="ea17de07deae11eeb82b00ffd30dba71";
var url=web_app.name+'/excelImport/exportExcelTemplate.ajax';
UICtrl.downFileByAjax(url,{id:" ",templateCode:"sapFixedRetirementData"},templetName);
}
//从EXCEL导入数据
function impExcelDataHandler(){
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedRetirement/sapFixedRetirementList.jsp
View file @ 49afc6df
......@@ -4,7 +4,6 @@
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,attachment"/>
<x:script src="/system/excelimport/AssignCodeImp.js"/>
<x:script src='/biz/topsun/sap/fixedAssets/sapFixedRetirement/sapFixedRetirementList.js'/>
</head>
......
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/SapFixedAssessApplication.java
View file @ 49afc6df
......@@ -2,6 +2,7 @@ package com.huigou.topsun.sap.fixedAssets.application;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssess;
import com.huigou.topsun.sap.fixedAssets.domain.SapRetirement;
import com.huigou.topsun.sap.fixedAssets.domain.TmpFixedAssessData;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssessQueryRequest;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedRetirementQueryRequest;
......@@ -24,5 +25,5 @@ public interface SapFixedAssessApplication {
void deleteByIds(List<String> ids);
String importExcelData(String batchNumber);
List<TmpFixedAssessData> importExcelData(String batchNumber);
}
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/SapFixedRetirementApplication.java
View file @ 49afc6df
......@@ -2,6 +2,7 @@ package com.huigou.topsun.sap.fixedAssets.application;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssetsMove;
import com.huigou.topsun.sap.fixedAssets.domain.SapRetirement;
import com.huigou.topsun.sap.fixedAssets.domain.TmpFixedRetirementData;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssetsMoveQueryRequest;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedRetirementQueryRequest;
......@@ -25,5 +26,5 @@ public interface SapFixedRetirementApplication {
void deleteByIds(List<String> ids);
String importExcelData(String batchNumber) ;
List<TmpFixedRetirementData> importExcelData(String batchNumber) ;
}
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedAssessApplicationImpl.java
View file @ 49afc6df
......@@ -40,8 +40,8 @@ public class SapFixedAssessApplicationImpl extends FlowBroker implements SapFixe
private SapFixedAssessRepository sapFixedAssessRepository;
@Autowired
private SapFixedAssessItemApplication sapFixedAssessItemApplication;
// @Autowired
// private TmpFixedAssessDataRepository tmpFixedAssessDataRepository;
@Autowired
private TmpFixedAssessDataRepository tmpFixedAssessDataRepository;
@Autowired
private SapFixedAssessItemRepository sapFixedAssessItemRepository;
@Autowired
......@@ -142,9 +142,9 @@ public class SapFixedAssessApplicationImpl extends FlowBroker implements SapFixe
@Override
public String importExcelData(String batchNumber) {
/* List<TmpFixedAssessData> dataList=tmpFixedAssessDataRepository.findByBatchNumber(batchNumber);
try {
public List<TmpFixedAssessData> importExcelData(String batchNumber) {
List<TmpFixedAssessData> dataList=tmpFixedAssessDataRepository.findByBatchNumber(batchNumber);
/*try {
if (dataList.size()>0){
SapAssess fixedAssess = new SapAssess();
fixedAssess.setReason("导入");
......@@ -169,6 +169,6 @@ public class SapFixedAssessApplicationImpl extends FlowBroker implements SapFixe
}catch(Exception ex){
ex.printStackTrace();
}*/
return "";
return dataList;
}
}
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedAssessExcelImport.java 0 → 100644
View file @ 49afc6df
package com.huigou.topsun.sap.fixedAssets.application.impl;
import com.huigou.topsun.sap.fixedAssets.domain.TmpFixedAssessData;
import com.huigou.topsun.sap.fixedAssets.domain.TmpFixedRetirementData;
import com.huigou.topsun.sap.fixedAssets.repository.TmpFixedAssessDataRepository;
import com.huigou.topsun.sap.fixedAssets.repository.TmpFixedRetirementDataRepository;
import com.huigou.uasp.tool.dataimport.application.ExcelImportInterface;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("sapFixedAssessExcelImport")
public class SapFixedAssessExcelImport implements ExcelImportInterface {
@Autowired
private TmpFixedAssessDataRepository tmpFixedAssessDataRepository;
@Override
public void executeImport(String batchNumer) {
List<TmpFixedAssessData> tmpFixedAssessList = tmpFixedAssessDataRepository.findByBatchNumber(batchNumer);
System.out.println("=========================");
// orgSyncApplication.sync(SyncKind.PSM, portalPeoples);
}
}
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedRetirementApplicationImpl.java
View file @ 49afc6df
......@@ -147,9 +147,9 @@ public class SapFixedRetirementApplicationImpl extends FlowBroker implements Sap
@Override
public String importExcelData(String batchNumber) {
public List<TmpFixedRetirementData> importExcelData(String batchNumber) {
List<TmpFixedRetirementData> dataList=tmpFixedRetirementDataRepository.findByBatchNumber(batchNumber);
try {
/* try {
if (dataList.size()>0){
SapRetirement fixedRetirement = new SapRetirement();
fixedRetirement.setReason("导入");
......@@ -173,7 +173,7 @@ public class SapFixedRetirementApplicationImpl extends FlowBroker implements Sap
}
}catch(Exception ex){
ex.printStackTrace();
}
return "";
}*/
return dataList;
}
}
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/controller/SapFixedAssessController.java
View file @ 49afc6df
......@@ -5,6 +5,7 @@ import com.huigou.context.OrgUnit;
import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssessApplication;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssess;
import com.huigou.topsun.sap.fixedAssets.domain.TmpFixedAssessData;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssessQueryRequest;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus;
......@@ -82,12 +83,13 @@ public class SapFixedAssessController extends CommonController {
return success();
}
/*
*导入数据
*返回导入数据
*/
public String importExcelData() {
SDO sdo = this.getSDO();
String batchNumber = sdo.getString("batchNumber");
sapFixedAssessApplication.importExcelData(batchNumber);
return success();
List<TmpFixedAssessData> dataList=sapFixedAssessApplication.importExcelData(batchNumber);
// return dataList;
return toResult(dataList);
}
}
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/controller/SapFixedRetirementController.java
View file @ 49afc6df
......@@ -6,6 +6,7 @@ import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssetsMoveApplicati
import com.huigou.topsun.sap.fixedAssets.application.SapFixedRetirementApplication;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssetsMove;
import com.huigou.topsun.sap.fixedAssets.domain.SapRetirement;
import com.huigou.topsun.sap.fixedAssets.domain.TmpFixedRetirementData;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssetsMoveQueryRequest;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedRetirementQueryRequest;
import com.huigou.uasp.annotation.ControllerMapping;
......@@ -89,7 +90,7 @@ public class SapFixedRetirementController extends CommonController {
public String importExcelData() {
SDO sdo = this.getSDO();
String batchNumber = sdo.getString("batchNumber");
sapFixedRetirementApplication.importExcelData(batchNumber);
return success();
List<TmpFixedRetirementData> dataList= sapFixedRetirementApplication.importExcelData(batchNumber);
return toResult(dataList);
}
}
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/domain/TmpFixedAssessData.java 0 → 100644
View file @ 49afc6df
package com.huigou.topsun.sap.fixedAssets.domain;
import com.huigou.topsun.common.AbstractPortalOrg;
import lombok.Getter;
import lombok.Setter;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.math.BigDecimal;
import java.util.Date;
/**
* 在建工程转固导入临时表。
*
* @author lxh
*/
@Table(name = "tmp_fixed_assess_data")
@Entity
@Getter
@Setter
public class TmpFixedAssessData extends AbstractPortalOrg {
/**
* 主资产号
*/
@Column(name = "anln1")
private String anln1;
@Column(name = "anln2")
private String anln2;
/**
* 公司代码（必填）
*/
@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 = "betrr")
private BigDecimal betrr;
/**
* 百分比
*/
@Column(name = "PROZS")
private BigDecimal prozs;
/**
* 接收方
*/
@Column(name = "empge")
private String empge;
}
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/repository/TmpFixedAssessDataRepository.java 0 → 100644
View file @ 49afc6df
package com.huigou.topsun.sap.fixedAssets.repository;
import com.huigou.topsun.sap.fixedAssets.domain.TmpFixedAssessData;
import com.huigou.topsun.sap.fixedAssets.domain.TmpFixedRetirementData;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
* @Auther: LXH
* @Date: 2024/03/14/11:13
* @Description:
*/
public interface TmpFixedAssessDataRepository extends JpaRepository<TmpFixedAssessData,String> {
List<TmpFixedAssessData> findByBatchNumber(String batchNumber);
void deleteByBatchNumber(String batchNumber);
}
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