diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index 3901a42a..cf08a7e4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -355,6 +355,7 @@ public class PurchaseorderController { resultList = FileCopy.getInfoAndUpFile(gbk.listFiles()); } catch (IOException e) { log.info("loadProperties IOException:" + e.getMessage()); + return ActionResult.fail("上传文件不符合导入规则"); } inputStream.close(); @@ -404,10 +405,15 @@ public class PurchaseorderController { public ActionResult ImportData(@RequestBody PurchaseorderDTO data) throws ParseException, DataException { List dataList = JsonUtil.getJsonToList(data.getList(), PurchaseorderDTO.class); //导入数据 - PurchaseOrderImportVo result = purchaseorderitemService.importData(dataList); - System.out.println("这是错误的数据"+result); - Map stringObjectMap = JsonUtil.entityToMap(result); - return ActionResult.success(stringObjectMap); + try { + PurchaseOrderImportVo result = purchaseorderitemService.importData(dataList); + System.out.println("这是错误的数据"+result); + Map stringObjectMap = JsonUtil.entityToMap(result); + return ActionResult.success(stringObjectMap); + } catch (Exception e) { + log.info("loadProperties IOException:" + e.getMessage()); + return ActionResult.fail("导入的数据格式不对!"); + } }