固定资产相关导入明细优化

topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.js

@@ -484,7 +484,8 @@ function loadGrid(obj) {
         onAfterEdit:function (item) {
             if(item.column.name == "waers"
                 || item.column.name == "kursf"
-                || item.column.name == "kzwi1"){
+                || item.column.name == "kzwi1"
+            || item.column.name == "ebelp"){
                 totalGrid();
             }
             if(item.column.name == "zepPtdamount1"

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

@@ -41,6 +41,22 @@ function loadGrid() {
     });
     gridManager = UICtrl.grid("#maingrid", {
         columns: [
+            {
+                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 {fieldName: "BUKRS"}
+                        },
+                        back: {
+                            BUKRS: "bukrs",
+                        }
+                    },
+                }
+            },
             {
                 display: "主资产号", name: "anln1", width: 140, minWidth: 60, type: "string", align: "left",
                 /*editor: {
@@ -54,23 +70,13 @@ function loadGrid() {
                     },
                 }*/
                 editor: {
-                    type: "text"
+                    type: "text",required: true
                 }
             },
             {
-                display: "公司代码", name: "bukrs", width: 140, minWidth: 60, type: "string", align: "left",
+                display: "申请日期", name: "adatu", width: 140, minWidth: 60, type: "date", align: "left",
                 editor: {
-                    required: true, type: "select",
-                    data: {
-                        type: 'system',
-                        name: "dictionary",
-                        getParam: function (item) {
-                            return {fieldName: "BUKRS"}
-                        },
-                        back: {
-                            BUKRS: "bukrs",
-                        }
-                    },
+                    type: "date"
                 }
             },
             {
@@ -145,6 +151,7 @@ function saveUpLoadGrid() {
                     anln1:data[row].anln1,
                     bukrs:data[row].bukrs,
                     kostl:data[row].kostl,
+                    adatu:data[row].adatu,
                 });
 
 

topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedRetirement/sapFixedRetirementDetail.js

@@ -184,7 +184,7 @@ function saveUpLoadGrid() {
             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
+                    ,bldat:data[row].bldat,budat:data[row].budat,bzdat:data[row].budat
                     ,sgtxt:data[row].sgtxt,xa:data[row].xa,prozs:data[row].prozs,anbtr:data[row].anbtr
                 });
 

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedRetirementExcelImport.java

 package com.huigou.topsun.sap.fixedAssets.application.impl;
 
+import com.huigou.cache.DictUtil;
 import com.huigou.topsun.sap.fixedAssets.domain.TmpFixedAssessData;
 import com.huigou.topsun.sap.fixedAssets.domain.TmpFixedRetirementData;
 import com.huigou.topsun.sap.fixedAssets.repository.TmpFixedRetirementDataRepository;
+import com.huigou.uasp.bmp.configuration.application.DictionaryApplication;
 import com.huigou.uasp.tool.dataimport.application.ExcelImportInterface;
 import com.huigou.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,10 +26,17 @@ public class SapFixedRetirementExcelImport implements ExcelImportInterface {
                 if (StringUtil.isNotBlank(tmpFixedRetirementData.getProzs()) && StringUtil.isNotBlank(tmpFixedRetirementData.getAnbtr())){
                     throw new RuntimeException("金额和百分比不能同时有值");
                 }
+
+                if (StringUtil.isBlank(tmpFixedRetirementData.getXa())){
+                    throw new RuntimeException("购置业务年度不能为空");
+                }else {
+                    String xa = DictUtil.getDictionaryDetailValue("sapFixedRetirementYear", tmpFixedRetirementData.getXa());
+                    if (StringUtil.isBlank(xa)){
+                        throw new RuntimeException("未找到购置业务年度“"+tmpFixedRetirementData.getXa()+"” 对应的字典编码");
+                    }
+                }
             }
         }
-        System.out.println("=========================");
-      //  orgSyncApplication.sync(SyncKind.PSM, portalPeoples);
     }
 
 }

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/domain/SapFixedAssetsMoveItem.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.Date;
 
 /**
  * SAP固定资产转移
@@ -35,6 +36,12 @@ public class SapFixedAssetsMoveItem extends AbstractEntity {
     @Column(name = "bukrs")
     private String bukrs;
 
+    /**
+     * 申请日期
+     */
+    @Column(name = "adatu")
+    private Date adatu;
+
     /**
      * 成本中心（必填）
      */

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/domain/TmpFixedAssessMoveData.java

@@ -32,6 +32,12 @@ public class TmpFixedAssessMoveData extends AbstractPortalOrg {
     @Column(name = "bukrs")
     private String bukrs;
 
+    /**
+     * 申请日期
+     */
+    @Column(name = "adatu")
+    private Date adatu;
+
     /**
      * 成本中心
      */