MES-获取生产工单接口/获取设备台账接口

aucma-api/src/main/java/com/aucma/api/controller/SAPPortController.java

@@ -3,7 +3,9 @@ package com.aucma.api.controller;
 import com.aucma.api.domain.dto.SAPPortDto;
 import com.aucma.api.domain.dto.WERKSDto;
 import com.aucma.api.service.ISAPPortService;
+import com.aucma.base.domain.BaseDeviceLedger;
 import com.aucma.base.domain.BaseMaterialInfo;
+import com.aucma.base.domain.BaseOrderInfo;
 import com.aucma.common.core.controller.BaseController;
 import com.aucma.common.core.domain.AjaxResult;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +46,41 @@ public class SAPPortController extends BaseController {
         List<BaseMaterialInfo> materialVoList = sapPortService.getSAPMaterialData(sapPortDto);
         return AjaxResult.success(materialVoList);
     }
+    /**
+     *获取生产工单
+     * */
+    @PostMapping ("/getProduceWorkTickets")
+    public AjaxResult getProduceWorkTickets(@RequestBody Map paramMap){
+        SAPPortDto sapPortDto = new SAPPortDto();
+        sapPortDto.setStartDate(String.valueOf(paramMap.get("NDATE")));
+        sapPortDto.setEndDate(String.valueOf(paramMap.get("EDATE")));
+        HashMap<String,List<HashMap<String,String>>> werksMap = (HashMap<String,List<HashMap<String,String>>>)paramMap.get("WERKS");
+        WERKSDto werksDto = new WERKSDto();
+        werksDto.setItem(werksMap.get("item"));
+        sapPortDto.setFactoryCodes(werksDto);
+        sapPortService.getSapBaseOrderInfo(sapPortDto);
+        List<BaseOrderInfo> BaseOrderInfoVoList = sapPortService.getSapBaseOrderInfo(sapPortDto);
+
+        return AjaxResult.success(BaseOrderInfoVoList);
+    }
+    /**
+     * 获取设备台账
+     * @param paramMap
+     * @return
+     */
+    @PostMapping("/getDeviceLedger")
+    public AjaxResult getdeviceLedger(@RequestBody Map paramMap) {
+        SAPPortDto sapPortDto = new SAPPortDto();
+        sapPortDto.setStartDate(String.valueOf(paramMap.get("NDATE")));
+        sapPortDto.setEndDate(String.valueOf(paramMap.get("EDATE")));
+        HashMap<String,List<HashMap<String,String>>> werksMap = (HashMap<String,List<HashMap<String,String>>>)paramMap.get("WERKS");
+        WERKSDto werksDto = new WERKSDto();
+        werksDto.setItem(werksMap.get("item"));
+        sapPortDto.setFactoryCodes(werksDto);
+        List<BaseDeviceLedger> BaseDeviceLedgerVoList = sapPortService.getSapDeviceLedgers(sapPortDto);
+        return AjaxResult.success(BaseDeviceLedgerVoList);
+    }
+
 
 
 

aucma-api/src/main/java/com/aucma/api/service/ISAPPortService.java

@@ -1,7 +1,9 @@
 package com.aucma.api.service;
 
 import com.aucma.api.domain.dto.SAPPortDto;
+import com.aucma.base.domain.BaseDeviceLedger;
 import com.aucma.base.domain.BaseMaterialInfo;
+import com.aucma.base.domain.BaseOrderInfo;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -21,6 +23,11 @@ public interface ISAPPortService {
      */
     List<BaseMaterialInfo> getSAPMaterialData(SAPPortDto sapPortDto);
 
+    List<BaseOrderInfo> getSapBaseOrderInfo(SAPPortDto sapPortDto);
+    List<BaseDeviceLedger> getSapDeviceLedgers(SAPPortDto sapPortDto);
+
+
+
 
 
 

aucma-api/src/main/java/com/aucma/api/service/ISAPPutStorageService.java

@@ -3,7 +3,9 @@ package com.aucma.api.service;
 import com.aucma.api.domain.vo.SAPResultVo;
 import com.aucma.base.domain.BaseDeviceLedger;
 import com.aucma.base.domain.BaseMaterialInfo;
+import com.aucma.base.domain.BaseOrderInfo;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 
 /**
@@ -21,12 +23,17 @@ public interface ISAPPutStorageService {
     public ArrayList<BaseMaterialInfo> insertSAPMaterialInfo(SAPResultVo resultVo);
 
 
+    /**
+     * 转换生产工单实体类 保存数据
+     *
+     * */
+    public ArrayList<BaseOrderInfo> insertSAPBaseOrderInfo(SAPResultVo resultVo) throws ParseException;
     /**
      * 转设备台账实体类 保存数据
      * @param resultVo
      * @return
      */
-    public ArrayList<BaseDeviceLedger> insertSAPDeviceLedger(SAPResultVo resultVo);
+    public ArrayList<BaseDeviceLedger> insertSAPDeviceLedger(SAPResultVo resultVo) throws ParseException;
 
 
 }

aucma-api/src/main/java/com/aucma/api/service/impl/SAPPortServiceImpl.java

@@ -7,7 +7,9 @@ import com.aucma.api.domain.vo.SAPResultVo;
 import com.aucma.api.service.ISAPPortService;
 import com.aucma.api.service.ISAPPutStorageService;
 import com.aucma.api.utils.SAPConstants;
+import com.aucma.base.domain.BaseDeviceLedger;
 import com.aucma.base.domain.BaseMaterialInfo;
+import com.aucma.base.domain.BaseOrderInfo;
 import com.aucma.common.exception.base.BaseException;
 import com.aucma.common.utils.StringUtils;
 import com.aucma.common.utils.http.HttpUtils;
@@ -75,8 +77,94 @@ public class SAPPortServiceImpl implements ISAPPortService {
         return materialVos;
     }
 
+    @Override
+    public List<BaseOrderInfo> getSapBaseOrderInfo(SAPPortDto sapPortDto) {
+        String startDate = sapPortDto.getStartDate();
+        String endDate = sapPortDto.getEndDate();
+        WERKSDto werks = sapPortDto.getFactoryCodes();
+        String intervalDate = "(" + startDate + "——" + endDate + ")";
+        if (StringUtils.isEmpty(startDate) || StringUtils.isEmpty(endDate) || StringUtils.isNull(werks)) {
+             return null;
+        }
+        ArrayList<BaseOrderInfo> baseOrderInfoVos = new ArrayList<>();
+        String requestParam = null;
+        String result = null;
+        try{
+            // 创建ObjectMapper实例 对象转JSON字符串
+            ObjectMapper objectMapper = new ObjectMapper();
+            // 格式化输出
+//             objectMapper.configure(SerializationFeature.INDENT_OUTPUT, true);
+            requestParam = objectMapper.writeValueAsString(sapPortDto);
+            //发送post请求 调用获取工单接口
+            result = HttpUtils.sendHttpPost(SAPConstants.SAP_PREFIX_URL + SAPConstants.PRODUCTION_ORDERS_URL, requestParam);
+            // 处理接口返回消息
+            //  result = "{\"O_TAB\":{\"item\":[{\"MAKTX\":\"压缩机,GP14TG,R134a,ACC\",\"WERKS\":\"2004\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000125\"},{\"MAKTX\":\"压缩机,GP14TG,R134a,ACC\",\"WERKS\":\"2006\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000125\"},{\"MAKTX\":\"压缩机,NL7CLX,R404a,丹佛斯\",\"WERKS\":\"2004\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000126\"},{\"MAKTX\":\"压缩机,NL7CLX,R404a,丹佛斯\",\"WERKS\":\"2006\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000126\"},{\"MAKTX\":\"压缩机,HVY57AA,R600a,奥地利ACC\",\"WERKS\":\"2004\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000127\"},{\"MAKTX\":\"压缩机,HVY57AA,R600a,奥地利ACC\",\"WERKS\":\"2006\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000127\"},{\"MAKTX\":\"压缩机,HVY67AA,R600a,奥地利ACC\",\"WERKS\":\"2004\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000128\"},{\"MAKTX\":\"压缩机,HVY67AA,R600a,奥地利ACC\",\"WERKS\":\"2006\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000128\"},{\"MAKTX\":\"压缩机,MR22FB,R404a,ACC\",\"WERKS\":\"2004\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000129\"},{\"MAKTX\":\"压缩机,MR22FB,R404a,ACC\",\"WERKS\":\"2006\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000129\"},{\"MAKTX\":\"盖后加固体,BC/BD-127FA\",\"WERKS\":\"2004\",\"MTART\":\"HALB\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-06\",\"MATNR\":\"000000008106000102\"},{\"MAKTX\":\"SC-246,YZXGWB乳品\",\"WERKS\":\"2006\",\"MTART\":\"FERT\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-22\",\"MATNR\":\"000000009002003478\"},{\"MAKTX\":\"SD-460,YZXGW蒙牛冰品\",\"WERKS\":\"2004\",\"MTART\":\"FERT\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-22\",\"MATNR\":\"000000009000004735\"},{\"MAKTX\":\"BC-100E,特需\",\"WERKS\":\"2006\",\"MTART\":\"FERT\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-02\",\"MATNR\":\"000000009001002406\"},{\"MAKTX\":\"BD(C)-310T,特需\",\"WERKS\":\"2004\",\"MTART\":\"FERT\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-20\",\"MATNR\":\"000000009000000225\"}]},\"WERKS\":null,\"O_RETURN\":{\"item\":[{\"MESSAGE\":\"查询成功1！\",\"ID\":\" 0\",\"TYPE\":\"S\"}]}}";
+            ObjectMapper resultMapper = new ObjectMapper();
+            // 将 JSON 字符串转换为 Java 对象
+            SAPResultVo resultVo = resultMapper.readValue(result, SAPResultVo.class);
+            //判断返回数据是否正确
+            if (StringUtils.isNull(resultVo.getO_RETURN()) || !"0".equals(resultVo.getO_RETURN().getItem().get(0).get("ID"))){
+                throw new BaseException("处理接口返回消息错误！（ID不为0或O_RETURN为空）");
+            }
+            //转物料实体类 保存数据
+            baseOrderInfoVos = storageService.insertSAPBaseOrderInfo(resultVo);
+            //保存接口日志
+            PortLogUtils.savePortLog(werks.getItem().get(0).get("WERKS"), "获取SAP物料主数据" + intervalDate, "getSAPBaseOrderInfo", requestParam, result, null);
+        } catch (Exception e){
+            //保存接口日志
+            System.out.println(e.getMessage());
+            PortLogUtils.savePortLog(werks.getItem().get(0).get("WERKS"), "获取SAP物料主数据" + intervalDate, "getSAPBaseOrderInfo", requestParam, result, e.toString());
+
+        }
+
+         return baseOrderInfoVos ;
+
 
 
 
 
+
+    }
+
+    @Override
+    public List<BaseDeviceLedger> getSapDeviceLedgers(SAPPortDto sapPortDto) {
+        String startDate = sapPortDto.getStartDate();
+        String endDate = sapPortDto.getEndDate();
+        WERKSDto werks = sapPortDto.getFactoryCodes();
+        String intervalDate = "(" + startDate + "——" + endDate + ")";
+        if (StringUtils.isEmpty(startDate) || StringUtils.isEmpty(endDate) || StringUtils.isNull(werks)) {
+            return null;
+        }
+        ArrayList<BaseDeviceLedger> baseDeviceLedgersVos = new ArrayList<>();
+        String requestParam = null;
+        String result = null;
+        try {
+            // 创建ObjectMapper实例 对象转JSON字符串
+            ObjectMapper objectMapper = new ObjectMapper();
+            // 格式化输出
+            // objectMapper.configure(SerializationFeature.INDENT_OUTPUT, true);
+            requestParam = objectMapper.writeValueAsString(sapPortDto);
+            result = HttpUtils.sendHttpPost(SAPConstants.SAP_PREFIX_URL + SAPConstants.EQUIPMENT_URL, requestParam);
+            // 处理接口返回消息
+            //  result = "{\"O_TAB\":{\"item\":[{\"MAKTX\":\"压缩机,GP14TG,R134a,ACC\",\"WERKS\":\"2004\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000125\"},{\"MAKTX\":\"压缩机,GP14TG,R134a,ACC\",\"WERKS\":\"2006\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000125\"},{\"MAKTX\":\"压缩机,NL7CLX,R404a,丹佛斯\",\"WERKS\":\"2004\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000126\"},{\"MAKTX\":\"压缩机,NL7CLX,R404a,丹佛斯\",\"WERKS\":\"2006\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000126\"},{\"MAKTX\":\"压缩机,HVY57AA,R600a,奥地利ACC\",\"WERKS\":\"2004\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000127\"},{\"MAKTX\":\"压缩机,HVY57AA,R600a,奥地利ACC\",\"WERKS\":\"2006\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000127\"},{\"MAKTX\":\"压缩机,HVY67AA,R600a,奥地利ACC\",\"WERKS\":\"2004\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000128\"},{\"MAKTX\":\"压缩机,HVY67AA,R600a,奥地利ACC\",\"WERKS\":\"2006\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000128\"},{\"MAKTX\":\"压缩机,MR22FB,R404a,ACC\",\"WERKS\":\"2004\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000129\"},{\"MAKTX\":\"压缩机,MR22FB,R404a,ACC\",\"WERKS\":\"2006\",\"MTART\":\"ROH\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-21\",\"MATNR\":\"000000003000000129\"},{\"MAKTX\":\"盖后加固体,BC/BD-127FA\",\"WERKS\":\"2004\",\"MTART\":\"HALB\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-06\",\"MATNR\":\"000000008106000102\"},{\"MAKTX\":\"SC-246,YZXGWB乳品\",\"WERKS\":\"2006\",\"MTART\":\"FERT\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-22\",\"MATNR\":\"000000009002003478\"},{\"MAKTX\":\"SD-460,YZXGW蒙牛冰品\",\"WERKS\":\"2004\",\"MTART\":\"FERT\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-22\",\"MATNR\":\"000000009000004735\"},{\"MAKTX\":\"BC-100E,特需\",\"WERKS\":\"2006\",\"MTART\":\"FERT\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-02\",\"MATNR\":\"000000009001002406\"},{\"MAKTX\":\"BD(C)-310T,特需\",\"WERKS\":\"2004\",\"MTART\":\"FERT\",\"MEINS\":\"EA\",\"UDATE\":\"2019-08-20\",\"MATNR\":\"000000009000000225\"}]},\"WERKS\":null,\"O_RETURN\":{\"item\":[{\"MESSAGE\":\"查询成功1！\",\"ID\":\" 0\",\"TYPE\":\"S\"}]}}";
+            ObjectMapper resultMapper = new ObjectMapper();
+            // 将 JSON 字符串转换为 Java 对象
+            SAPResultVo resultVo = resultMapper.readValue(result, SAPResultVo.class);
+            //判断返回数据是否正确
+            if (StringUtils.isNull(resultVo.getO_RETURN()) || !"0".equals(resultVo.getO_RETURN().getItem().get(0).get("ID"))){
+                throw new BaseException("处理接口返回消息错误！（ID不为0或O_RETURN为空）");
+            }
+            //转物料实体类 保存数据
+            baseDeviceLedgersVos = storageService.insertSAPDeviceLedger(resultVo);
+            //保存接口日志
+            PortLogUtils.savePortLog(werks.getItem().get(0).get("IWERK"), "获取SAP物料主数据" + intervalDate, "getSAPBaseDeviceLedger", requestParam, result, null);
+        } catch (Exception e) {
+            //保存接口日志
+            System.out.println(e.getMessage());
+            PortLogUtils.savePortLog(werks.getItem().get(0).get("IWERK"), "获取SAP物料主数据" + intervalDate, "getSAPBaseDeviceLedger", requestParam, result, e.toString());
+        }
+        return baseDeviceLedgersVos;
+    }
+
+
 }

aucma-api/src/main/java/com/aucma/api/service/impl/SAPPutStorageServiceImpl.java

@@ -4,12 +4,17 @@ import com.aucma.api.domain.vo.SAPResultVo;
 import com.aucma.api.service.ISAPPutStorageService;
 import com.aucma.base.domain.BaseDeviceLedger;
 import com.aucma.base.domain.BaseMaterialInfo;
+import com.aucma.base.domain.BaseOrderInfo;
 import com.aucma.base.service.IBaseDeviceLedgerService;
 import com.aucma.base.service.IBaseMaterialInfoService;
+import com.aucma.base.service.IBaseOrderInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -27,6 +32,9 @@ public class SAPPutStorageServiceImpl implements ISAPPutStorageService {
     @Autowired
     private IBaseDeviceLedgerService baseDeviceLedgerService;
 
+    @Autowired
+    private IBaseOrderInfoService baseOrderInfoService;
+
     /**
      * 转物料实体类 保存数据
      * @param resultVo
@@ -48,14 +56,97 @@ public class SAPPutStorageServiceImpl implements ISAPPutStorageService {
         return baseMaterialInfoArrayList;
     }
 
+    /**
+     * 转换生产工单实体类 保存数据
+     *
+     * */
+    @Override
+    public ArrayList<BaseOrderInfo> insertSAPBaseOrderInfo(SAPResultVo resultVo) throws ParseException {
+        ArrayList<BaseOrderInfo> baseOrderInfoList = new ArrayList<>();
+        List<HashMap<String, String>> itemList = resultVo.getO_TAB().get("item");
+        for (HashMap<String, String> map : itemList) {
+            int item = 0;
+            List<BaseOrderInfo> baseOrderInfos = baseOrderInfoService.selectBaseOrderInfoList(null);
+            //查出值进行比对 如果数据库中已有该字段则忽略本次数据
+            //缺少工作中心
+            for (int i=0;i<baseOrderInfos.size();i++){
+                if (baseOrderInfos.get(i).getFactoryCode()!=null
+                && baseOrderInfos.get(i).getFactoryCode().equals(map.get("WERKS"))
+                &&baseOrderInfos.get(i).getOrderCode()!=null
+                &&baseOrderInfos.get(i).getOrderCode().equals(map.get("AUFNR"))
+                &&baseOrderInfos.get(i).getMaterialCode()!=null
+                &&baseOrderInfos.get(i).getMaterialCode().equals(map.get("MATNR"))
+                ){
+                    //忽略标识
+                    item = 1;
+
+                }
+            }
+            if (item==0){
+                BaseOrderInfo baseOrderInfo = new BaseOrderInfo();
+                baseOrderInfo.setOrderCode(map.get("AUFNR"));
+                baseOrderInfo.setOrderStatus(map.get("STTXT"));
+                baseOrderInfo.setSaleOrderCode(map.get("KDAUF"));
+                baseOrderInfo.setMaterialCode(map.get("MATNR"));
+                baseOrderInfo.setMaterialName(map.get("MAKTX"));
+                if (!map.get("GAMNG").equals(null)){
+                    baseOrderInfo.setOrderAmount(Long.valueOf(map.get("GAMNG")));
+                }
+                baseOrderInfo.setFactoryCode(map.get("WERKS"));
+                baseOrderInfo.setOrderType(map.get("AUART"));
+                baseOrderInfo.setBeginDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("GLTRP")));
+                baseOrderInfo.setEndDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("GSTRP")));
+
+                baseOrderInfoService.insertBaseOrderInfo(baseOrderInfo);
+
+                baseOrderInfoList.add(baseOrderInfo);
+            }
+        }
+
+
+        return baseOrderInfoList;
+    }
+
     /**
      * 转设备台账实体类 保存数据
      * @param resultVo
      * @return
      */
     @Override
-    public ArrayList<BaseDeviceLedger> insertSAPDeviceLedger(SAPResultVo resultVo) {
+    public ArrayList<BaseDeviceLedger> insertSAPDeviceLedger(SAPResultVo resultVo) throws ParseException {
-        return null;
+        ArrayList<BaseDeviceLedger> baseDeviceLedgerArrayList = new ArrayList<>();
+        List<HashMap<String, String>> itemList = resultVo.getO_TAB().get("item");
+        BaseDeviceLedger device = new BaseDeviceLedger();
+        for (HashMap<String, String> map : itemList) {
+            int item = 0;
+            List<BaseDeviceLedger> baseDeviceLedgers = baseDeviceLedgerService.selectBaseDeviceLedgerList(device);
+            //查出值进行比对 如果数据库中已有该字段则忽略本次数据
+            for (int i=0;i<baseDeviceLedgers.size();i++){
+                if (baseDeviceLedgers.get(i).getCostCenter().equals(map.get("KOSTL"))&&
+                baseDeviceLedgers.get(i).getDeviceCode().equals(map.get("EQUNR"))
+                &&baseDeviceLedgers.get(i).getFactoryCode().equals(map.get("IWERK"))
+                &&baseDeviceLedgers.get(i).getCostCenter()!=null
+                &&baseDeviceLedgers.get(i).getFactoryCode()!=null
+                &&baseDeviceLedgers.get(i).getDeviceCode()!=null){
+                    //忽略标识
+                    item = 1;
+                }
+            }
+            if (item==0){
+            BaseDeviceLedger deviceLedger = new BaseDeviceLedger();
+            deviceLedger.setCostCenter(map.get("KOSTL"));//
+            deviceLedger.setFactoryCode(map.get("IWERK"));
+            deviceLedger.setDeviceName(map.get("EQKTX"));
+            deviceLedger.setEnableDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("INBDT")));
+            deviceLedger.setManufacturer(map.get("ELIEF"));
+            deviceLedger.setDeviceType(map.get("EQTYP"));
+            deviceLedger.setDeviceCode(map.get("EQUNR"));//
+            deviceLedger.setUsedDepartment(map.get("NAME1"));
+                baseDeviceLedgerService.insertBaseDeviceLedger(deviceLedger);
+                baseDeviceLedgerArrayList.add(deviceLedger);
+            }
+        }
+        return baseDeviceLedgerArrayList;
     }
 
 

aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceLedger.java

@@ -279,23 +279,46 @@ public class BaseDeviceLedger extends BaseEntity {
         return updatedTime;
     }
 
+//    @Override
+//    public String toString() {
+//        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+//                .append("objId", getObjId())
+//                .append("deviceCode", getDeviceCode())
+//                .append("deviceName", getDeviceName())
+//                .append("deviceModel", getDeviceModel())
+//                .append("deviceType", getDeviceType())
+//                .append("deviceAddress", getDeviceAddress())
+//                .append("deviceStatus", getDeviceStatus())
+//                .append("usedDepartment", getUsedDepartment())
+//                .append("productLineCode", getProductLineCode())
+//                .append("isFlag", getIsFlag())
+//                .append("createdBy", getCreatedBy())
+//                .append("createdTime", getCreatedTime())
+//                .append("updatedBy", getUpdatedBy())
+//                .append("updatedTime", getUpdatedTime())
+//                .toString();
+//    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+        return "BaseDeviceLedger{" +
-                .append("objId", getObjId())
+                "objId=" + objId +
-                .append("deviceCode", getDeviceCode())
+                ", deviceCode='" + deviceCode + '\'' +
-                .append("deviceName", getDeviceName())
+                ", deviceName='" + deviceName + '\'' +
-                .append("deviceModel", getDeviceModel())
+                ", deviceModel='" + deviceModel + '\'' +
-                .append("deviceType", getDeviceType())
+                ", deviceType='" + deviceType + '\'' +
-                .append("deviceAddress", getDeviceAddress())
+                ", deviceAddress='" + deviceAddress + '\'' +
-                .append("deviceStatus", getDeviceStatus())
+                ", deviceStatus=" + deviceStatus +
-                .append("usedDepartment", getUsedDepartment())
+                ", usedDepartment='" + usedDepartment + '\'' +
-                .append("productLineCode", getProductLineCode())
+                ", costCenter='" + costCenter + '\'' +
-                .append("isFlag", getIsFlag())
+                ", manufacturer='" + manufacturer + '\'' +
-                .append("createdBy", getCreatedBy())
+                ", enableDate=" + enableDate +
-                .append("createdTime", getCreatedTime())
+                ", productLineCode='" + productLineCode + '\'' +
-                .append("updatedBy", getUpdatedBy())
+                ", isFlag=" + isFlag +
-                .append("updatedTime", getUpdatedTime())
+                ", createdBy='" + createdBy + '\'' +
-                .toString();
+                ", createdTime=" + createdTime +
+                ", updatedBy='" + updatedBy + '\'' +
+                ", updatedTime=" + updatedTime +
+                '}';
     }
 }