src/main/java/org/jeecg/common/aspect/ApiLogAspect.java
@@ -146,6 +146,14 @@ } catch (JsonProcessingException e) { throw new JeecgBootException(e); } } else { try { String json = objectMapper.writeValueAsString(result); JSONObject item = JSONObject.parseObject(json, Feature.OrderedField); items.add(item); } catch (JsonProcessingException e) { throw new JeecgBootException(e); } } return items.toString(); } src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncCreationJob.java
@@ -14,6 +14,7 @@ import org.jeecg.modules.sap.dto.OrderBomDTO; import org.jeecg.modules.sap.dto.OrderProcessDTO; import org.jeecg.modules.sap.dto.ProductionOrderDTO; import org.jeecg.modules.sap.request.ProductionOrderSyncRequest; import org.jeecg.modules.sap.service.OrderBomSync; import org.jeecg.modules.sap.service.OrderProcessSync; import org.jeecg.modules.sap.service.ProductionOrderSync; @@ -100,15 +101,22 @@ //è·å䏿¬¡åæ¥æ¶é´ String lastSyncDateLow = productionOrderService.getLastSyncCreateDate(); String lastSyncDateHigh = null; if(lastSyncDateLow != null) { if (lastSyncDateLow != null) { lastSyncDateHigh = DateUtils.format(new Date(), "yyyyMMdd"); if(lastSyncDateLow.equals(lastSyncDateHigh)) { if (lastSyncDateLow.equals(lastSyncDateHigh)) { lastSyncDateHigh = null; } } ProductionOrderSyncRequest request = new ProductionOrderSyncRequest(); request.setFactoryCode(FACTORY_CODE); request.setOrderTypeCode(ORDER_TYPE_CODE); request.setProductionManager(PRODUCTION_MANAGER); request.setOrderStatus(ORDER_STATUS); request.setCreateTimeLow(lastSyncDateLow); request.setCreateTimeHigh(lastSyncDateHigh); try { //è°ç¨SAPæ¥å£è·åç产订å Map<String, Object> productionOrderMap = productionOrderSync.syncProductionOrder(FACTORY_CODE, ORDER_TYPE_CODE, PRODUCTION_MANAGER, ORDER_STATUS, lastSyncDateLow, lastSyncDateHigh, null, null); Map<String, Object> productionOrderMap = productionOrderSync.syncProductionOrder(request); if (productionOrderMap == null || !SUCCESS_CODE.equals(productionOrderMap.get("ztype"))) { log.error("æªåæ¥å°è®¢åä¿¡æ¯ï¼æ¥æï¼{}", LocalDateTime.now()); return; @@ -116,7 +124,7 @@ //è°ç¨æåï¼è·åè¿åæ°æ® Object result = productionOrderMap.get("result"); boolean b = result instanceof List; if(!b) { if (!b) { log.error("è¿åç±»åéè¯¯ï¼ class:{}", result == null ? null : result.getClass()); return; } @@ -132,13 +140,13 @@ //è°ç¨æåï¼è·åè¿åæ°æ® result = orderBomMap.get("result"); b = result instanceof List; if(!b) { if (!b) { log.error("è¿åç±»åéè¯¯ï¼ class:{}", result == null ? null : result.getClass()); return; } List<OrderBomDTO> orderBomDTOList = (List<OrderBomDTO>) result; b = processBillMaterialsService.saveOrUpdateOrderBom(orderMap, orderBomDTOList); if(!b) { if (!b) { log.error("ä¿å订åBOMå¤±è´¥ï¼æ¥æï¼{}", LocalDateTime.now()); return; } @@ -151,13 +159,13 @@ //è°ç¨æåï¼è·åè¿åæ°æ® result = orderProcessMap.get("result"); b = result instanceof List; if(!b) { if (!b) { log.error("è¿åç±»åéè¯¯ï¼ class:{}", result == null ? null : result.getClass()); return; } List<OrderProcessDTO> orderProcessDTOList = (List<OrderProcessDTO>) result; b = materialProcessService.saveOrUpdateOrderProcess(orderMap, orderProcessDTOList); if(!b) { if (!b) { log.error("ä¿å订åå·¥åºå¤±è´¥ï¼æ¥æï¼{}", LocalDateTime.now()); } quartzLog.setIsSuccess(0); src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncUpdateJob.java
@@ -14,6 +14,7 @@ import org.jeecg.modules.sap.dto.OrderBomDTO; import org.jeecg.modules.sap.dto.OrderProcessDTO; import org.jeecg.modules.sap.dto.ProductionOrderDTO; import org.jeecg.modules.sap.request.ProductionOrderSyncRequest; import org.jeecg.modules.sap.service.OrderBomSync; import org.jeecg.modules.sap.service.OrderProcessSync; import org.jeecg.modules.sap.service.ProductionOrderSync; @@ -106,9 +107,16 @@ lastSyncDateHigh = null; } } ProductionOrderSyncRequest request = new ProductionOrderSyncRequest(); request.setFactoryCode(FACTORY_CODE); request.setOrderTypeCode(ORDER_TYPE_CODE); request.setProductionManager(PRODUCTION_MANAGER); request.setOrderStatus(ORDER_STATUS); request.setUpdateTimeLow(lastSyncDateLow); request.setUpdateTimeHigh(lastSyncDateHigh); try { //è°ç¨SAPæ¥å£è·åç产订å Map<String, Object> productionOrderMap = productionOrderSync.syncProductionOrder(FACTORY_CODE, ORDER_TYPE_CODE, PRODUCTION_MANAGER, ORDER_STATUS, null, null, lastSyncDateLow, lastSyncDateHigh); Map<String, Object> productionOrderMap = productionOrderSync.syncProductionOrder(request); if (productionOrderMap == null || !SUCCESS_CODE.equals(productionOrderMap.get("ztype"))) { log.error("æªåæ¥å°è®¢åä¿¡æ¯ï¼æ¥æï¼{}", LocalDateTime.now()); return; src/main/java/org/jeecg/modules/sap/controller/SAPTestController.java
@@ -6,13 +6,11 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.modules.sap.request.OrderLoadRequest; import org.jeecg.modules.sap.request.OrderReportRequest; import org.jeecg.modules.sap.request.ProductionOrderSyncRequest; import org.jeecg.modules.sap.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.util.Map; @Api(tags = "SAPéææµè¯") @@ -34,7 +32,7 @@ private static final String createTime = "20250508"; private static final String updateTime = "20250101"; // @Autowired // @Autowired // private SAPService sapService; @Autowired private ProductionOrderSync productionOrderSync; @@ -49,69 +47,69 @@ @Autowired private OrderCloseService orderCloseService; // @ApiOperation(value = "SAPéææµè¯-æµè¯æ¥å£", notes = "SAPéææµè¯-æµè¯æ¥å£") // @GetMapping("/test") // public Result<?> test() { // String test = sapService.test(); // return Result.ok(test); // } @ApiOperation(value = "SAPéææµè¯-ç产订å忥æ¥å£", notes = "SAPéææµè¯-ç产订å忥æ¥å£") @GetMapping("/syncProductionOrder") public Result<?> syncProductionOrder() throws Exception { Map<String, Object> resultMap = productionOrderSync.syncProductionOrder(factoryCode, orderTypeCode1, productionManager, orderStatus, null, null, null, null); @PostMapping("/syncProductionOrder") public Result<?> syncProductionOrder(@RequestBody ProductionOrderSyncRequest request) throws Exception { // ProductionOrderSyncRequest request = new ProductionOrderSyncRequest(); // request.setFactoryCode(factoryCode); // request.setOrderTypeCode(orderTypeCode1); // request.setProductionManager(productionManager); // request.setOrderStatus(orderStatus); // request.setOrderCode("10711342"); Map<String, Object> resultMap = productionOrderSync.syncProductionOrder(request); return Result.ok(resultMap); } @ApiOperation(value = "SAPéææµè¯-订åBOM忥", notes = "SAPéææµè¯-订åBOM忥") @GetMapping("/syncOrderBom") public Result<?> syncOrderBom() throws Exception { String orderCode = "10706312,10706988,10708077,10708078,10708825,10711404,10711404,10711543"; public Result<?> syncOrderBom(@RequestParam(value = "factoryCode") String factoryCode, @RequestParam(value = "orderCode") String orderCode) throws Exception { // String orderCode = "10706312,10706988,10708077,10708078,10708825,10711404,10711404,10711543"; Map<String, Object> resultMap = orderBomSync.syncOrderBom(factoryCode, orderCode); return Result.ok(resultMap); } @ApiOperation(value = "SAPéææµè¯-订åå·¥åºåæ¥", notes = "SAPéææµè¯-订åå·¥åºåæ¥") @GetMapping("/syncOrderProcess") public Result<?> syncOrderProcess() throws Exception { String orderCode = "10706312,10706988,10708077,10708078,10708825,10711404,10711404,10711543"; public Result<?> syncOrderProcess(@RequestParam(value = "factoryCode") String factoryCode, @RequestParam(value = "orderCode") String orderCode) throws Exception { // String orderCode = "10706312,10706988,10708077,10708078,10708825,10711404,10711404,10711543"; Map<String, Object> resultMap = orderProcessSync.syncOrderProcess(factoryCode, orderCode); return Result.ok(resultMap); } @ApiOperation(value = "SAPéææµè¯-å·¥åºæ¥å·¥", notes = "SAPéææµè¯-å·¥åºæ¥å·¥") @GetMapping("/productionOrderReport") public Result<?> productionOrderReport() throws Exception { OrderReportRequest request = new OrderReportRequest(); request.setFactoryCode(factoryCode); request.setOrderCode("10711404"); request.setWarehouseCode("7014"); //2# çº¿è¾¹åº request.setProcessCode("0040"); request.setQualifiedQuantity(new BigDecimal("180")); request.setScrapQuantity(new BigDecimal("0")); request.setKeyProcess("202505080102"); @PostMapping("/productionOrderReport") public Result<?> productionOrderReport(@RequestBody OrderReportRequest request) throws Exception { // OrderReportRequest request10 = new OrderReportRequest(); // request10.setFactoryCode(factoryCode); // request10.setOrderCode("10711404"); // request10.setWarehouseCode("7014"); //2# çº¿è¾¹åº // request10.setProcessCode("0010"); // request10.setQualifiedQuantity(new BigDecimal("180")); // request10.setScrapQuantity(new BigDecimal("0")); // request10.setKeyProcess("202505080101"); // request10.setBatchNumber("202505080101"); Map<String, Object> resultMap = orderReportService.productionOrderReport(request); return Result.ok(resultMap); } @ApiOperation(value = "SAPéææµè¯-çäº§è®¢åææ", notes = "SAPéææµè¯-çäº§è®¢åææ") @GetMapping("/productionOrderLoad") public Result<?> productionOrderLoad() throws Exception { OrderLoadRequest request = new OrderLoadRequest(); request.setFactoryCode(factoryCode); request.setOrderCode("10711404"); request.setWarehouseCode("7014"); //2# çº¿è¾¹åº request.setMaterialNumber("320013727"); request.setQuantity(new BigDecimal("180")); request.setBatchNumber("202505080102"); @PostMapping("/productionOrderLoad") public Result<?> productionOrderLoad(@RequestBody OrderLoadRequest request) throws Exception { // OrderLoadRequest request = new OrderLoadRequest(); // request.setFactoryCode(factoryCode); // request.setOrderCode("10711404"); // request.setWarehouseCode("7014"); //2# çº¿è¾¹åº // request.setMaterialNumber("320013727"); // request.setQuantity(new BigDecimal("180")); // request.setBatchNumber("202505080102"); Map<String, Object> resultMap = orderLoadService.productionOrderLoad(request); return Result.ok(resultMap); } @ApiOperation(value = "SAPéææµè¯-ç产订åå ³é", notes = "SAPéææµè¯-ç产订åå ³é") @GetMapping("/productionOrderClose") public Result<?> productionOrderClose() throws Exception { String orderCode = "10711404"; public Result<?> productionOrderClose(@RequestParam(value = "orderCode") String orderCode) throws Exception { // String orderCode = "10698749"; Map<String, Object> resultMap = orderCloseService.productionOrderClose(orderCode); return Result.ok(resultMap); } src/main/java/org/jeecg/modules/sap/request/ProductionOrderSyncRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,16 @@ package org.jeecg.modules.sap.request; import lombok.Data; @Data public class ProductionOrderSyncRequest { private String factoryCode; private String orderCode; private String orderTypeCode; private String productionManager; private String orderStatus; private String createTimeLow; private String createTimeHigh; private String updateTimeLow; private String updateTimeHigh; } src/main/java/org/jeecg/modules/sap/service/ProductionOrderSync.java
@@ -1,10 +1,12 @@ package org.jeecg.modules.sap.service; import org.jeecg.modules.sap.request.ProductionOrderSyncRequest; import java.util.Map; public interface ProductionOrderSync { /** * 忥çæè®¢å */ Map<String, Object> syncProductionOrder(String factoryCode, String orderTypeCode, String productionManager, String orderStatus, String createTimeLow, String createTimeHigh, String updateTimeLow, String updateTimeHigh) throws Exception; Map<String, Object> syncProductionOrder(ProductionOrderSyncRequest request) throws Exception; } src/main/java/org/jeecg/modules/sap/service/impl/OrderCloseServiceImpl.java
@@ -38,8 +38,8 @@ // æ§è¡è°ç¨ function.execute(destination); //è·åè¿åç»æ String ztype = function.getExportParameterList().getTable("ZTYPE").toString(); String zmess = function.getExportParameterList().getTable("ZMESS").toString(); String ztype = function.getExportParameterList().getValue("ZTYPE").toString(); String zmess = function.getExportParameterList().getValue("ZMESS").toString(); resultMap.put("zmess", zmess); resultMap.put("ztype", ztype); src/main/java/org/jeecg/modules/sap/service/impl/OrderLoadServiceImpl.java
@@ -6,6 +6,8 @@ import org.jeecg.common.constant.ApiLogCategoryEnum; import org.jeecg.config.sap.SapRfcConnectionManager; import org.jeecg.modules.sap.FunctionConst; import org.jeecg.modules.sap.dto.OrderLoadDTO; import org.jeecg.modules.sap.dto.OrderReportDTO; import org.jeecg.modules.sap.request.OrderLoadRequest; import org.jeecg.modules.sap.service.OrderLoadService; import org.springframework.beans.factory.annotation.Autowired; @@ -52,15 +54,55 @@ // æ§è¡è°ç¨ function.execute(destination); //è·åè¿åç»æ JCoTable eReturn = function.getExportParameterList().getTable("E_RETURN"); Object eReturn1 = function.getExportParameterList().getValue("E_RETURN"); OrderLoadDTO reportDTO1 = null; if (eReturn1 != null) { JCoStructure eReturn = (JCoStructure) eReturn1; //E Return reportDTO1 = new OrderLoadDTO(); reportDTO1.setTYPE(eReturn.getString("TYPE")); reportDTO1.setID(eReturn.getString("ID")); reportDTO1.setNUMBER(eReturn.getString("NUMBER")); reportDTO1.setMESSAGE(eReturn.getString("MESSAGE")); reportDTO1.setLOG_NO(eReturn.getString("LOG_NO")); reportDTO1.setLOG_MSG_NO(eReturn.getString("LOG_MSG_NO")); reportDTO1.setMESSAGE_V1(eReturn.getString("MESSAGE_V1")); reportDTO1.setMESSAGE_V2(eReturn.getString("MESSAGE_V2")); reportDTO1.setMESSAGE_V3(eReturn.getString("MESSAGE_V3")); reportDTO1.setMESSAGE_V4(eReturn.getString("MESSAGE_V4")); reportDTO1.setPARAMETER(eReturn.getString("PARAMETER")); reportDTO1.setROW(eReturn.getString("ROW")); reportDTO1.setFIELD(eReturn.getString("FIELD")); reportDTO1.setSYSTEM(eReturn.getString("SYSTEM")); } JCoTable tReturn1 = function.getTableParameterList().getTable("T_RETURN"); String zmess = ""; String ztype = "";//S æ è¯ æå OrderLoadDTO reportDTO2 = null; if (tReturn1.getNumRows() > 0) { tReturn1.setRow(0); reportDTO2 = new OrderLoadDTO(); reportDTO2.setTYPE(tReturn1.getString("TYPE")); reportDTO2.setID(tReturn1.getString("ID")); reportDTO2.setNUMBER(tReturn1.getString("NUMBER")); reportDTO2.setMESSAGE(tReturn1.getString("MESSAGE")); reportDTO2.setLOG_NO(tReturn1.getString("LOG_NO")); reportDTO2.setLOG_MSG_NO(tReturn1.getString("LOG_MSG_NO")); reportDTO2.setMESSAGE_V1(tReturn1.getString("MESSAGE_V1")); reportDTO2.setMESSAGE_V2(tReturn1.getString("MESSAGE_V2")); reportDTO2.setMESSAGE_V3(tReturn1.getString("MESSAGE_V3")); reportDTO2.setMESSAGE_V4(tReturn1.getString("MESSAGE_V4")); reportDTO2.setPARAMETER(tReturn1.getString("PARAMETER")); reportDTO2.setROW(tReturn1.getString("ROW")); reportDTO2.setFIELD(tReturn1.getString("FIELD")); reportDTO2.setSYSTEM(tReturn1.getString("SYSTEM")); } String zmess = reportDTO1 == null ? (reportDTO2 == null ? "" : reportDTO2.getMESSAGE()) : reportDTO1.getMESSAGE(); String ztype = reportDTO1 == null ? (reportDTO2 == null ? "" : reportDTO2.getTYPE()) : reportDTO1.getTYPE(); //S æ è¯ æå resultMap.put("zmess", zmess); resultMap.put("ztype", ztype); resultMap.put("importParameters", request); resultMap.put("result", null); resultMap.put("result", reportDTO1 == null ? reportDTO2 : reportDTO1); return resultMap; } } src/main/java/org/jeecg/modules/sap/service/impl/ProductionOrderSyncImpl.java
@@ -1,6 +1,5 @@ package org.jeecg.modules.sap.service.impl; import com.alibaba.fastjson.JSONObject; import com.sap.conn.jco.JCoDestination; import com.sap.conn.jco.JCoFunction; import com.sap.conn.jco.JCoRepository; @@ -12,6 +11,7 @@ import org.jeecg.config.sap.SapRfcConnectionManager; import org.jeecg.modules.sap.FunctionConst; import org.jeecg.modules.sap.dto.ProductionOrderDTO; import org.jeecg.modules.sap.request.ProductionOrderSyncRequest; import org.jeecg.modules.sap.service.ProductionOrderSync; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,7 +33,7 @@ @Override @ApiLog(apiName = "ç产订å忥(ZPPF_033_1)", apiCategory = ApiLogCategoryEnum.SAP) public Map<String, Object> syncProductionOrder(String factoryCode, String orderTypeCode, String productionManager, String orderStatus, String createTimeLow, String createTimeHigh, String updateTimeLow, String updateTimeHigh) throws Exception { public Map<String, Object> syncProductionOrder(ProductionOrderSyncRequest request) throws Exception { Map<String, Object> resultMap = new HashMap<>(); JCoDestination destination = connectionManager.getDestination(); JCoRepository repository = destination.getRepository(); @@ -43,94 +43,68 @@ } // 设置è¾å ¥åæ° //订åå·æ¥è¯¢æ¡ä»¶ // JCoTable AUFNRTable = function.getTableParameterList().getTable("ZTAB_AUFNR"); List<JSONObject> items = new ArrayList<>(); if (StringUtils.isNotBlank(request.getOrderCode())) { JCoTable AUFNRTable = function.getTableParameterList().getTable("ZTAB_AUFNR"); String[] split = request.getOrderCode().split(","); for (String code : split) { AUFNRTable.appendRow(); AUFNRTable.setValue("AUFNR", code); } } //订åç±»å æ åç产订å if(StringUtils.isNotBlank(orderTypeCode)){ if (StringUtils.isNotBlank(request.getOrderTypeCode())) { JCoTable AUARTTable = function.getTableParameterList().getTable("ZTAB_AUART"); String[] split = orderTypeCode.split(","); for(String code : split){ String[] split = request.getOrderTypeCode().split(","); for (String code : split) { AUARTTable.appendRow(); AUARTTable.setValue("AUART", code); } //ç»è£ 请æ±åæ° JSONObject item = new JSONObject(); item.put("AUART", orderTypeCode); items.add(item); } if(StringUtils.isNotBlank(productionManager)){ if (StringUtils.isNotBlank(request.getProductionManager())) { JCoTable FEVORTable = function.getTableParameterList().getTable("ZTAB_FEVOR"); String[] split = productionManager.split(","); for(String code : split){ String[] split = request.getProductionManager().split(","); for (String code : split) { FEVORTable.appendRow(); FEVORTable.setValue("FEVOR", code); } //ç»è£ 请æ±åæ° JSONObject item = new JSONObject(); item.put("FEVOR", productionManager); items.add(item); } if(StringUtils.isNotBlank(factoryCode)){ if (StringUtils.isNotBlank(request.getFactoryCode())) { //æ°ç«ç¬ JCoTable WERKSTable = function.getTableParameterList().getTable("ZTAB_WERKS"); String[] split = factoryCode.split(","); for(String code : split){ String[] split = request.getFactoryCode().split(","); for (String code : split) { WERKSTable.appendRow(); WERKSTable.setValue("WERKS", code); } //ç»è£ 请æ±åæ° JSONObject item = new JSONObject(); item.put("WERKS", factoryCode); items.add(item); } if(StringUtils.isNotBlank(orderStatus)) { if (StringUtils.isNotBlank(request.getOrderStatus())) { //æ°ç«ç¬ JCoTable TXT04Table = function.getTableParameterList().getTable("ZTAB_TXT04"); String[] split = orderStatus.split(","); for(String code : split){ String[] split = request.getOrderStatus().split(","); for (String code : split) { TXT04Table.appendRow(); TXT04Table.setValue("TXT04", code); } //ç»è£ 请æ±åæ° JSONObject item = new JSONObject(); item.put("TXT04", orderStatus); items.add(item); } if(StringUtils.isNotBlank(createTimeLow)){ if (StringUtils.isNotBlank(request.getCreateTimeLow())) { JCoTable UDATETable = function.getTableParameterList().getTable("ZTAB_UDATE"); UDATETable.appendRow(); UDATETable.setValue("LOW", createTimeLow); //ç»è£ 请æ±åæ° JSONObject item = new JSONObject(); item.put("ZTAB_UDATE_LOW", createTimeLow); items.add(item); UDATETable.setValue("LOW", request.getCreateTimeLow()); } if(StringUtils.isNotBlank(createTimeHigh)){ if (StringUtils.isNotBlank(request.getCreateTimeHigh())) { JCoTable UDATETable = function.getTableParameterList().getTable("ZTAB_UDATE"); UDATETable.appendRow(); UDATETable.setValue("HIGH", createTimeHigh); //ç»è£ 请æ±åæ° JSONObject item = new JSONObject(); item.put("ZTAB_UDATE_HIGH", createTimeHigh); items.add(item); UDATETable.setValue("HIGH", request.getCreateTimeHigh()); } if(StringUtils.isNotBlank(updateTimeLow)){ if (StringUtils.isNotBlank(request.getUpdateTimeLow())) { JCoTable LAEDATable = function.getTableParameterList().getTable("ZTAB_LAEDA"); LAEDATable.appendRow(); LAEDATable.setValue("LOW", updateTimeLow); //ç»è£ 请æ±åæ° JSONObject item = new JSONObject(); item.put("ZTAB_LAEDA_LOW", updateTimeLow); items.add(item); LAEDATable.setValue("LOW", request.getUpdateTimeLow()); } if(StringUtils.isNotBlank(updateTimeHigh)){ if (StringUtils.isNotBlank(request.getUpdateTimeHigh())) { JCoTable LAEDATable = function.getTableParameterList().getTable("ZTAB_LAEDA"); LAEDATable.appendRow(); LAEDATable.setValue("HIGH", updateTimeLow); //ç»è£ 请æ±åæ° JSONObject item = new JSONObject(); item.put("ZTAB_LAEDA_HIGH", updateTimeLow); items.add(item); LAEDATable.setValue("HIGH", request.getUpdateTimeHigh()); } // æ§è¡è°ç¨ function.execute(destination); @@ -176,7 +150,7 @@ } resultMap.put("zmess", zmess); resultMap.put("ztype", ztype); resultMap.put("importParameters", items); resultMap.put("importParameters", request); resultMap.put("result", resultList); return resultMap; }