Skip to content

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

固定资产报废的Excel导入

parent 159e1653
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 29 deletions
huigou-xt/src/main/webapp/system/excelimport/AssignCodeImp.js
View file @ 601d9e32
...@@ -89,8 +89,8 @@ $.extend(ExcelImpManager.prototype,{ ...@@ -89,8 +89,8 @@ $.extend(ExcelImpManager.prototype,{
param:function(){ param:function(){
debugger debugger
//截断事件发送请求，为全局code赋值 //截断事件发送请求，为全局code赋值
let code = prompt("请输入编码"); //let code = prompt("请输入编码");
Public.syncAjax(web_app.name + '/globalCode/revampGlobalCode.ajax',{dictionaryCode:code}) //Public.syncAjax(web_app.name + '/globalCode/revampGlobalCode.ajax',{dictionaryCode:code})
// UICtrl.showDialog({ // UICtrl.showDialog({
// title: $.i18nProp('编码详情'), // title: $.i18nProp('编码详情'),
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedRetirement/sapFixedRetirementList.js
View file @ 601d9e32
...@@ -9,12 +9,13 @@ function initUI() { ...@@ -9,12 +9,13 @@ function initUI() {
} }
function loadGrid() { function loadGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({ var toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: addHandler, addHandler: addHandler,
// exportExcelHandler:exportExcelHandler, // exportExcelHandler:exportExcelHandler,
// exportModelHandler:{id:'exportModelHandler',img:'fa-cloud-download',text:'导出模板',click:exportModelHandler}, // exportModelHandler:{id:'exportModelHandler',img:'fa-cloud-download',text:'导出模板',click:exportModelHandler},
// impExcelDataHandler:{id:'impExcelDataHandler',img:'fa-table',text:'导入数据',click:impExcelDataHandler} impExcelDataHandler:{id:'impExcelData',img:'fa-table',text:'导入数据',click:impExcelDataHandler},
}); });
gridManager = UICtrl.grid("#maingrid", { gridManager = UICtrl.grid("#maingrid", {
...@@ -100,32 +101,20 @@ function exportModelHandler() { ...@@ -100,32 +101,20 @@ function exportModelHandler() {
// return; // return;
// } // }
var templetName='固定资产报废'; var templetName='固定资产报废';
var templateId="ea17de07deae11eeb82b00ffd30dba71"; var templateId="ea17de07deae11eeb82b00ffd30dba71";
var url=web_app.name+'/excelImport/exportExcelTemplate.ajax'; var url=web_app.name+'/excelImport/exportExcelTemplate.ajax';
UICtrl.downFileByAjax(url,{id:" ",templateCode:"sapFixedRetirementData"},templetName); UICtrl.downFileByAjax(url,{id:" ",templateCode:"sapFixedRetirementData"},templetName);
} }
//从EXCEL导入数据 //从EXCEL导入数据
function impExcelDataHandler(){ function impExcelDataHandler(){
ExcelImpManager.showImpDialog('导入', 'sapFixedRetirementData', Public.getUUID(), saveUpLoadGrid);
}
UICtrl.showAjaxDialog({ function saveUpLoadGrid() {
title: '导入Excel', var batchNumber=$('#batchNumber').val();
width: getDefaultDialogWidth(), Public.ajax(web_app.name + '/sapFixedRetirement/importExcelData.ajax'
top:20, , {batchNumber: batchNumber}, function (data) {
height: 450, reloadGrid();
parent:options.parent, });
url: web_app.name + '/excelImport/forwardAssignCodeImpPage.load',
param:{code:"sapFixedRetirementData",batchNumber:""},
init:function(div){
var _manager = new ExcelImpManager(div,{code:"sapFixedRetirementData"});
_manager.init();
},
ok:false,
close: function () {
// if ($.isFunction(options.closeFunction)) {
// options.closeFunction.call(this)
// }
}
})
} }
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedRetirement/sapFixedRetirementList.jsp
View file @ 601d9e32
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html> <html>
<head> <head>
<x:base include="layout,dialog,grid,tree,combox,commonTree"/> <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'/> <x:script src='/biz/topsun/sap/fixedAssets/sapFixedRetirement/sapFixedRetirementList.js'/>
</head> </head>
<body> <body>
<div class="container-fluid"> <div class="container-fluid">
...@@ -14,6 +16,9 @@ ...@@ -14,6 +16,9 @@
<div position="center" title="固定资产报废"> <div position="center" title="固定资产报废">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/> <x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm"> <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:hidden name="templetId" value="sapFixedRetirementData"/>
<x:hidden name="batchNumber" value=""/>
<x:hidden name="fullId"/>
<x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/> <x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/>
<x:inputC name="reason" required="false" label="原因" labelCol="1"/> <x:inputC name="reason" required="false" label="原因" labelCol="1"/>
<x:selectC name="status" label="审批状态" labelCol="1" fieldCol="2" dictionary="bizBillStatus"/> <x:selectC name="status" label="审批状态" labelCol="1" fieldCol="2" dictionary="bizBillStatus"/>
......
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/SapFixedRetirementApplication.java
View file @ 601d9e32
...@@ -5,6 +5,7 @@ import com.huigou.topsun.sap.fixedAssets.domain.SapRetirement; ...@@ -5,6 +5,7 @@ import com.huigou.topsun.sap.fixedAssets.domain.SapRetirement;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssetsMoveQueryRequest; import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssetsMoveQueryRequest;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedRetirementQueryRequest; import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedRetirementQueryRequest;
import java.lang.reflect.InvocationTargetException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -24,4 +25,5 @@ public interface SapFixedRetirementApplication { ...@@ -24,4 +25,5 @@ public interface SapFixedRetirementApplication {
void deleteByIds(List<String> ids); void deleteByIds(List<String> ids);
String importExcelData(String batchNumber) ;
} }
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedRetirementApplicationImpl.java
View file @ 601d9e32
package com.huigou.topsun.sap.fixedAssets.application.impl; package com.huigou.topsun.sap.fixedAssets.application.impl;
import com.huigou.cache.DictUtil; import com.huigou.cache.DictUtil;
import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.data.query.model.QueryDescriptor; import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.data.query.model.QueryModel; import com.huigou.data.query.model.QueryModel;
import com.huigou.topsun.base.coderule.application.CodeRuleApplication;
import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssetsMoveApplication; import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssetsMoveApplication;
import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssetsMoveItemApplication; import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssetsMoveItemApplication;
import com.huigou.topsun.sap.fixedAssets.application.SapFixedRetirementApplication; import com.huigou.topsun.sap.fixedAssets.application.SapFixedRetirementApplication;
import com.huigou.topsun.sap.fixedAssets.application.SapFixedRetirementItemApplication; import com.huigou.topsun.sap.fixedAssets.application.SapFixedRetirementItemApplication;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssetsMove; import com.huigou.topsun.sap.fixedAssets.domain.*;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssetsMoveItem;
import com.huigou.topsun.sap.fixedAssets.domain.SapRetirement;
import com.huigou.topsun.sap.fixedAssets.domain.SapRetirementItem;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssetsMoveQueryRequest; import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedAssetsMoveQueryRequest;
import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedRetirementQueryRequest; import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedRetirementQueryRequest;
import com.huigou.topsun.sap.fixedAssets.repository.SapFixedAssetsMoveRepository; import com.huigou.topsun.sap.fixedAssets.repository.SapFixedAssetsMoveRepository;
import com.huigou.topsun.sap.fixedAssets.repository.SapFixedRetirementItemRepository;
import com.huigou.topsun.sap.fixedAssets.repository.SapFixedRetirementRepository; import com.huigou.topsun.sap.fixedAssets.repository.SapFixedRetirementRepository;
import com.huigou.topsun.sap.fixedAssets.repository.TmpFixedRetirementDataRepository;
import com.huigou.uasp.bmp.common.BizBillStatus; import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bmp.doc.attachment.application.AttachmentApplication; import com.huigou.uasp.bmp.doc.attachment.application.AttachmentApplication;
import com.huigou.uasp.bmp.doc.attachment.domain.model.Attachment; import com.huigou.uasp.bmp.doc.attachment.domain.model.Attachment;
import com.huigou.uasp.bpm.FlowBroker; import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.util.ApplicationContextWrapper;
import com.huigou.util.ClassHelper; import com.huigou.util.ClassHelper;
import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -40,7 +46,13 @@ public class SapFixedRetirementApplicationImpl extends FlowBroker implements Sap ...@@ -40,7 +46,13 @@ public class SapFixedRetirementApplicationImpl extends FlowBroker implements Sap
@Autowired @Autowired
private SapFixedRetirementItemApplication sapFixedRetirementItemApplication; private SapFixedRetirementItemApplication sapFixedRetirementItemApplication;
@Autowired @Autowired
private TmpFixedRetirementDataRepository tmpFixedRetirementDataRepository;
@Autowired
private SapFixedRetirementItemRepository sapFixedRetirementItemRepository;
@Autowired
private AttachmentApplication attachmentApplication; private AttachmentApplication attachmentApplication;
@Autowired
private CodeRuleApplication codeRuleApplication;
@Override @Override
public Map<String, Object> getFixedRetirementList(SapFixedRetirementQueryRequest queryRequest) { public Map<String, Object> getFixedRetirementList(SapFixedRetirementQueryRequest queryRequest) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sapFixedRetirement"); QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sapFixedRetirement");
...@@ -132,4 +144,36 @@ public class SapFixedRetirementApplicationImpl extends FlowBroker implements Sap ...@@ -132,4 +144,36 @@ public class SapFixedRetirementApplicationImpl extends FlowBroker implements Sap
// } // }
return fixedRetirement.getId(); return fixedRetirement.getId();
} }
@Override
public String importExcelData(String batchNumber) {
List<TmpFixedRetirementData> dataList=tmpFixedRetirementDataRepository.findByBatchNumber(batchNumber);
try {
if (dataList.size()>0){
SapRetirement fixedRetirement = new SapRetirement();
fixedRetirement.setReason("导入");
fixedRetirement.setStatusId(3);
fixedRetirement.setFillinDate(new Date());
Operator operator = getOperator();
fixedRetirement.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
// String billCode= codeRuleApplication.getNextCode("","sapRetirement","");
Object codeGenerator = ApplicationContextWrapper.getBean("codeGenerator");
Method method = codeGenerator.getClass().getMethod("getNextCode", new Class[]{String.class});
String code = (String) method.invoke(codeGenerator, new Object[]{"sapRetirement"});
fixedRetirement.setBillCode(code);
sapFixedRetirementRepository.save(fixedRetirement);
for (TmpFixedRetirementData data : dataList) {
SapRetirementItem sapRetirementItem = new SapRetirementItem();
ClassHelper.copyProperties(data, sapRetirementItem);
sapRetirementItem.setSapRetirementId(fixedRetirement.getId());
sapFixedRetirementItemRepository.save(sapRetirementItem);
}
}
}catch(Exception ex){
ex.printStackTrace();
}
return "";
}
} }
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/controller/SapFixedRetirementController.java
View file @ 601d9e32
...@@ -11,6 +11,7 @@ import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedRetirementQueryReq ...@@ -11,6 +11,7 @@ import com.huigou.topsun.sap.fixedAssets.domain.query.SapFixedRetirementQueryReq
import com.huigou.uasp.annotation.ControllerMapping; import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus; import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.client.CommonController; import com.huigou.uasp.client.CommonController;
import com.huigou.uasp.tool.dataimport.application.ExcelImportApplication;
import com.huigou.util.CommonUtil; import com.huigou.util.CommonUtil;
import com.huigou.util.SDO; import com.huigou.util.SDO;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -35,6 +36,9 @@ public class SapFixedRetirementController extends CommonController { ...@@ -35,6 +36,9 @@ public class SapFixedRetirementController extends CommonController {
@Resource @Resource
private SapFixedRetirementApplication sapFixedRetirementApplication; private SapFixedRetirementApplication sapFixedRetirementApplication;
private ExcelImportApplication excelImportApplication;
public String forwardSapFixedRetirementList(){ public String forwardSapFixedRetirementList(){
return forward("sapFixedRetirementList"); return forward("sapFixedRetirementList");
} }
...@@ -58,6 +62,7 @@ public class SapFixedRetirementController extends CommonController { ...@@ -58,6 +62,7 @@ public class SapFixedRetirementController extends CommonController {
sapRetirement.setAttbizId(CommonUtil.createGUID()); // 自动生成附件id sapRetirement.setAttbizId(CommonUtil.createGUID()); // 自动生成附件id
Operator operator = getOperator(); Operator operator = getOperator();
sapRetirement.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName())); sapRetirement.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
// ExcelImportTemplate excelImportTemplate=excelImportApplication.loadExcelImportTemplateByCode("sapFixedRetirementData");
return forward("sapFixedRetirementDetail",sapRetirement); return forward("sapFixedRetirementDetail",sapRetirement);
} }
...@@ -78,4 +83,13 @@ public class SapFixedRetirementController extends CommonController { ...@@ -78,4 +83,13 @@ public class SapFixedRetirementController extends CommonController {
sapFixedRetirementApplication.deleteByIds(ids); sapFixedRetirementApplication.deleteByIds(ids);
return success(); return success();
} }
/*
*导入数据
*/
public String importExcelData() {
SDO sdo = this.getSDO();
String batchNumber = sdo.getString("batchNumber");
sapFixedRetirementApplication.importExcelData(batchNumber);
return success();
}
} }
topsun/src/main/resources/config/topsun/sap/fixedAssets/fixedRetirement.xml 0 → 100644
View file @ 601d9e32
<?xml version="1.0" encoding="UTF-8" ?>
<query-mappings>
<query name="sapFixedRetirement" label="固定资产报废" table="sap_retirement">
<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_retirement_id,
ti.anln1,ti.bukrs,ti.kostl,
ti.bldat,ti.budat,ti.bzdat,ti.sgtxt,ti.anbtr,ti.prozs,ti.xa
from sap_retirement t left join sap_retirement_item ti on t.id = ti.sap_retirement_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
topsun/src/main/resources/config/topsun/sap/fixedAssets/fixedRetirementItem.xml 0 → 100644
View file @ 601d9e32
<?xml version="1.0" encoding="UTF-8" ?>
<query-mappings>
<query name="sapFixedRetirementItems" label="固定资产报废明细" table="sap_retirement_item">
<sql-query>
select t.* from sap_retirement_item t
</sql-query>
<condition column="sap_retirement_item_id" name="sapFixedRetirementId" 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