统计指标过账明细导入

huigou-xt/src/main/webapp/system/excelimport/ExcelImportTemplate.js

@@ -289,5 +289,5 @@ function moveHandler(){
 function excelImpManager(){
 	var row = DataUtil.getUpdateRow(gridManager);
 	if (!row){ return; }
-	ExcelImpManager.showImpDialog('测试xx导入',row.code,'100');
+	ExcelImpManager.showImpDialog('测试导入',row.code,'100');
 }

topsun-xt/src/main/webapp/biz/topsun/sap/base/bsnMessageList.js

@@ -41,7 +41,7 @@ function loadBsnMessageListGrid() {
             doView(data.id,data.businessId,data.executorUrl);
         },
         onAfterShowData: function (data){
-            console.log(data)
+            //console.log(data)
         }
     });
     UICtrl.setSearchAreaToggle(gridManager);

topsun-xt/src/main/webapp/biz/topsun/sap/finaCustomer/finaCustomerList.js

@@ -61,7 +61,6 @@ function loadSuppliersDataListGrid() {
             doView(data.id,data.applyType);
         },
         onAfterShowData: function (data){
-            console.log(data)
         }
     });
     UICtrl.setSearchAreaToggle(gridManager);

topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsMove/sapFixedAssetsMoveDetail.jsp

@@ -22,6 +22,7 @@
     <x:hidden name="positionName"/>
     <x:hidden name="personMemberId"/>
     <x:hidden name="personMemberName"/>
+    <x:hidden name="statusId"/>
     <div class="hg-form-cols">
         <div class="hg-form-row">
             <x:inputC name="tel" required="true" label="联系方式" labelCol="2" maxLength="64" fieldCol="2"/>

topsun-xt/src/main/webapp/biz/topsun/sap/mutualEpLog/mutualEpLogList.js

@@ -38,7 +38,6 @@ function loadMutualEpLogDataListGrid() {
             doView(data.id);
         },
         onAfterShowData: function (data){
-            console.log(data)
         }
     });
     UICtrl.setSearchAreaToggle(gridManager);

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js

@@ -160,7 +160,6 @@ function loadNonProdApplyListGrid() {
             doView(data.id,data.maintenanceType);
         },
         onAfterShowData: function (data){
-            console.log(data)
         }
     });
     UICtrl.setSearchAreaToggle(gridManager);

topsun-xt/src/main/webapp/biz/topsun/sap/produceSupplierReview/produceSupplierReviewDetail.js

@@ -84,7 +84,6 @@ function loadGrid(obj) {
         fixedCellHeight: true,
         selectRowButtonOnly: true,
         onAfterEdit:function(...arg) {
-            console.log(arg, '------')
             countSum()
         },
     });

topsun-xt/src/main/webapp/biz/topsun/sap/statsIndicators/statsIndicators.js

@@ -6,10 +6,7 @@ $(document).ready(function () {
     bindEvent();
 });
 function initialize(){
-    let isDetailPage = ($("#isDetailPage").val() === "true");
-    if (isDetailPage) {
-        $("#jobPageTop").hide();
-    }
+    UICtrl.layout("#layout", {leftWidth: 3});
 }
 
 function bindEvent(){
@@ -49,7 +46,7 @@ function loadStatsIndicatorsDetailListGrid() {
             UICtrl.addGridRow(gridManager,{ zlenr: gridManager.getData().length + 1 });
         },
         deleteHandler: function () {
-            var _grid = UICtrl.getGridManager('#statsIndicatorsDetailGrid');
+            var _grid = UICtrl.getGridManager('#maingrid');
             DataUtil.delSelectedRows({
                 action: 'sapStatsIndicators/deleteStatsIndicatorDetails.ajax',
                 param: {},
@@ -59,9 +56,10 @@ function loadStatsIndicatorsDetailListGrid() {
                     reloadGrid();
                 }
             });
-        }
+        },
+        impExcelDataHandler:{id:'impExcelData',img:'fa-table',text:'导入数据',click:impExcelDataHandler},
     });
-    gridManager = UICtrl.grid("#statsIndicatorsDetailGrid", {
+    gridManager = UICtrl.grid("#maingrid", {
         columns: [
             {
                 display: "行号", name: "zlenr", width: 140, minWidth: 60, type: "string", align: "left",
@@ -142,10 +140,7 @@ function loadStatsIndicatorsDetailListGrid() {
         heightDiff: -8,
         checkbox: true,
         fixedCellHeight: true,
-        selectRowButtonOnly: true,
-        onDblClickRow: function (data, rowindex, rowobj) {
-            doView(data.statsIndicatorsDetailId);
-        }
+        selectRowButtonOnly: true
     });
     UICtrl.setSearchAreaToggle(gridManager);
 }
@@ -156,7 +151,7 @@ function loadStatsIndicatorsDetailListGrid() {
  */
 function setId(id) {
     $("#id").val(id);
-    var _grid=UICtrl.getGridManager('#statsIndicatorsDetailGrid');
+    var _grid=UICtrl.getGridManager('#maingrid');
     _grid.options.parms.statsIndicatorsId = id;
 }
 
@@ -181,7 +176,7 @@ function getExtendedData(processAction) {
         $('#submitForm').attr('check', false);
     }
     var extendedData = {};
-    var _grid = UICtrl.getGridManager('#statsIndicatorsDetailGrid');
+    var _grid = UICtrl.getGridManager('#maingrid');
     if (_grid) {
         var datas = DataUtil.getGridData({
             gridManager: _grid,
@@ -204,14 +199,25 @@ function getExtendedData(processAction) {
     return extendedData;
 }
 
-//获取最新子序号（维护实体的标识）
-function getZlenr(){
-    let result =gridManager.getData();
-    let zlenr="1";
-    if(result.length>0){
-        //获取上一个节点的子序值
-        let wornNo= parseInt(result[result.length-1]["zlenr"], 10);
-        zlenr=((wornNo + 1)).slice(-3);
-    }
-    return zlenr;
+
+//从EXCEL导入数据
+function impExcelDataHandler(){
+    ExcelImpManager.showImpDialog('导入', 'sapStatsIndicatorsDetail', Public.getUUID(), saveUpLoadGrid);
+}
+
+function saveUpLoadGrid() {
+    var batchNumber=$('#batchNumber').val();
+    Public.ajax(web_app.name + '/sapStatsIndicators/importExcelData.ajax'
+        , {batchNumber: batchNumber}, function (data) {
+            for (var row=0;row<data.length;row++) {
+                UICtrl.addGridRow(gridManager,{
+                    zlenr:data[row].zlenr,
+                    kostl:data[row].kostl,
+                    aufnr:data[row].aufnr,
+                    stagr:data[row].stagr,
+                    mbgbtr:data[row].mbgbtr,
+                    sgtxt:data[row].sgtxt,
+                });
+            }
+        });
 }
\ No newline at end of file

topsun-xt/src/main/webapp/biz/topsun/sap/statsIndicators/statsIndicators.jsp

@@ -3,11 +3,11 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <html>
 <head>
-    <x:base include="layout,dialog,grid,tree,combox,commonTree,date,selectOrg"/>
+    <x:base include="layout,dialog,grid,tree,combox,commonTree,date,attachment"/>
+    <x:script src="/system/excelimport/AssignCodeImp.js"/>
     <x:script src='/biz/topsun/sap/statsIndicators/statsIndicators.js'/>
 </head>
 <body>
-<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
 <x:billTitle title="统计指标过账" needStatus="false" needPerson="true"/>
 <form class="hg-form" method="post" action="" id="submitForm">
     <x:hidden name="id"/>
@@ -39,7 +39,7 @@
         </div>
     </div>
     <div class="blank_div clearfix"></div>
-    <div id="statsIndicatorsDetailGrid" style="margin: 2px;">
+    <div id="maingrid" style="margin: 2px;">
     </div>
 </form>
 </body>

topsun-xt/src/main/webapp/biz/topsun/sap/statsIndicators/statsIndicatorsList.js

@@ -56,7 +56,6 @@ function loadStatsIndicatorsListGrid() {
            let obj= gridManager.records;
             Object.keys(obj).forEach(function(key) {
                let node=null;
-                console.log(obj[key]);
                 if(obj[key].status!==3){
                     node="<div>待审批</div>";
                 }else if(obj[key].type!=="S"){

topsun/src/main/java/com/huigou/topsun/sap/statsIndicators/application/SapStatsIndicatorsApplication.java

 package com.huigou.topsun.sap.statsIndicators.application;
 
 import com.huigou.topsun.sap.statsIndicators.domain.SapStatsIndicators;
+import com.huigou.topsun.sap.statsIndicators.domain.TmpStatsIndicatorsDetailImportDate;
 import com.huigou.topsun.sap.statsIndicators.domain.query.SapStatsIndicatorsQueryRequest;
 
 import java.util.List;
@@ -22,4 +23,6 @@ public interface SapStatsIndicatorsApplication {
     void deleteStatsIndicatorsByIds(List<String> ids);
 
     void sendSapDate(String bizId);
+
+    List<TmpStatsIndicatorsDetailImportDate> importExcelData(String batchNumber);
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/statsIndicators/application/impl/SapStatsIndicatorsApplicationImpl.java

@@ -9,31 +9,26 @@ import com.huigou.data.domain.model.CommonDomainConstants;
 import com.huigou.data.query.model.QueryDescriptor;
 import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.sap.common.DefaultHttpClient;
-import com.huigou.topsun.sap.common.domain.Message;
 import com.huigou.topsun.sap.common.serializer.MessageCodec;
-import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursement;
 import com.huigou.topsun.sap.statsIndicators.application.SapStatsIndicatorsApplication;
 import com.huigou.topsun.sap.statsIndicators.domain.SapStatsIndicators;
 import com.huigou.topsun.sap.statsIndicators.domain.SapStatsIndicatorsDetail;
 import com.huigou.topsun.sap.statsIndicators.domain.SapStatsIndicatorsResult;
-import com.huigou.topsun.sap.statsIndicators.domain.query.SapStatsIndicatorsDetailQueryRequest;
+import com.huigou.topsun.sap.statsIndicators.domain.TmpStatsIndicatorsDetailImportDate;
 import com.huigou.topsun.sap.statsIndicators.domain.query.SapStatsIndicatorsQueryRequest;
 import com.huigou.topsun.sap.statsIndicators.repository.SapStatsIndicatorsDetailRepository;
 import com.huigou.topsun.sap.statsIndicators.repository.SapStatsIndicatorsRepository;
 import com.huigou.topsun.sap.statsIndicators.repository.SapStatsIndicatorsResultRepository;
+import com.huigou.topsun.sap.statsIndicators.repository.TmpStatsIndicatorsDetailImportDateRepository;
 import com.huigou.topsun.util.MyBaseUtil;
 import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.bpm.FlowBroker;
 import com.huigou.util.ClassHelper;
 
-import com.huigou.util.JSONUtil;
 import com.huigou.util.SDO;
-import com.mchange.v1.util.MapUtils;
 import lombok.SneakyThrows;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
-import org.apache.commons.beanutils.BeanMap;
-import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -41,18 +36,11 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
 
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 
 @Service("sapStatsIndicatorsApplication")
 public class SapStatsIndicatorsApplicationImpl extends FlowBroker implements SapStatsIndicatorsApplication {
@@ -68,6 +56,8 @@ public class SapStatsIndicatorsApplicationImpl extends FlowBroker implements Sap
     DefaultHttpClient defaultHttpClient;
     @Autowired
     MessageCodec messageCodec;
+    @Autowired
+    private TmpStatsIndicatorsDetailImportDateRepository importDateRepository;
 
 
     @SneakyThrows
@@ -272,4 +262,10 @@ public class SapStatsIndicatorsApplicationImpl extends FlowBroker implements Sap
             sapStatsIndicatorsResultRepository.save(sapStatsIndicatorsResult);
         }
     }
+
+    @Override
+    public List<TmpStatsIndicatorsDetailImportDate> importExcelData(String batchNumber) {
+        List<TmpStatsIndicatorsDetailImportDate>  dataList = importDateRepository.findByBatchNumber(batchNumber);
+        return dataList;
+    }
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/statsIndicators/application/impl/SapStatsIndicatorsDetailExcelImport.java

+package com.huigou.topsun.sap.statsIndicators.application.impl;
+
+import com.huigou.topsun.sap.statsIndicators.domain.TmpStatsIndicatorsDetailImportDate;
+import com.huigou.topsun.sap.statsIndicators.repository.TmpStatsIndicatorsDetailImportDateRepository;
+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("sapStatsIndicatorsDetailExcelImport")
+public class SapStatsIndicatorsDetailExcelImport implements ExcelImportInterface {
+
+
+    @Autowired
+    private TmpStatsIndicatorsDetailImportDateRepository tmpStatsIndicatorsDetailImportDateRepository;
+    @Override
+    public void executeImport(String batchNumber) {
+        List<TmpStatsIndicatorsDetailImportDate> importDateList = tmpStatsIndicatorsDetailImportDateRepository.findByBatchNumber(batchNumber);
+    }
+
+}

topsun/src/main/java/com/huigou/topsun/sap/statsIndicators/controller/SapStatsIndicatorsController.java

@@ -5,10 +5,12 @@ package com.huigou.topsun.sap.statsIndicators.controller;
 import com.huigou.cache.SystemCache;
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
+import com.huigou.topsun.sap.fixedAssets.domain.TmpFixedAssessMoveData;
 import com.huigou.topsun.sap.statsIndicators.application.SapStatsIndicatorsApplication;
 import com.huigou.topsun.sap.statsIndicators.application.SapStatsIndicatorsDetailApplication;
 
 import com.huigou.topsun.sap.statsIndicators.domain.SapStatsIndicators;
+import com.huigou.topsun.sap.statsIndicators.domain.TmpStatsIndicatorsDetailImportDate;
 import com.huigou.topsun.sap.statsIndicators.domain.query.SapStatsIndicatorsDetailQueryRequest;
 import com.huigou.topsun.sap.statsIndicators.domain.query.SapStatsIndicatorsQueryRequest;
 import com.huigou.uasp.annotation.ControllerMapping;
@@ -111,4 +113,11 @@ public class SapStatsIndicatorsController  extends CommonController {
         sapStatsIndicatorsApplication.sendSapDate(id);
         return success();
     }
+
+    public String importExcelData() {
+        SDO sdo = this.getSDO();
+        String batchNumber = sdo.getString("batchNumber");
+        List<TmpStatsIndicatorsDetailImportDate> dateList = sapStatsIndicatorsApplication.importExcelData(batchNumber);
+        return toResult(dateList);
+    }
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/statsIndicators/domain/TmpStatsIndicatorsDetailImportDate.java

+package com.huigou.topsun.sap.statsIndicators.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;
+
+/**
+ * @author xin.lu
+ * @Description: 统计指标过账明细导入
+ * @date 2024/12/1015:33
+ */
+@Table(name = "tmp_stats_indicators_detail")
+@Entity
+@Getter
+@Setter
+public class TmpStatsIndicatorsDetailImportDate extends AbstractPortalOrg {
+    /**
+     * 行号
+     */
+    @Column(name = "ZLENR")
+    private String zlenr;
+
+    /**
+     * 成本中心
+     */
+    @Column(name = "KOSTL")
+    private String kostl;
+
+    /**
+     * 订单
+     */
+    @Column(name = "AUFNR")
+    private String aufnr;
+
+    /**
+     * 统计指标
+     */
+    @Column(name = "STAGR")
+    private String stagr;
+
+    /**
+     * 统计指标数量
+     */
+    @Column(name = "MBGBTR")
+    private BigDecimal mbgbtr;
+
+    /**
+     * 行文本
+     */
+    @Column(name = "SGTXT")
+    private String sgtxt;
+}

topsun/src/main/java/com/huigou/topsun/sap/statsIndicators/repository/TmpStatsIndicatorsDetailImportDateRepository.java

+package com.huigou.topsun.sap.statsIndicators.repository;
+
+import com.huigou.topsun.sap.statsIndicators.domain.TmpStatsIndicatorsDetailImportDate;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+/**
+ * @author xin.lu
+ * @Description: TODO
+ * @date 2024/12/1015:36
+ */
+public interface TmpStatsIndicatorsDetailImportDateRepository extends JpaRepository<TmpStatsIndicatorsDetailImportDate,String> {
+    List<TmpStatsIndicatorsDetailImportDate> findByBatchNumber(String batchNumber);
+}