xs 5 år sedan
förälder
incheckning
48cf0c6e28

+ 13 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/util/ImportPro.java

@@ -50,7 +50,19 @@ public class ImportPro {
         }
         return list;
     }
-
+    /*
+        验证
+     */
+    public static Boolean getJudgeProvided(ImportUtil importUtil){
+        boolean flag = false;
+        Row row = importUtil.getRow(0);
+        String materialCode = (String) importUtil.getCellValue(row,5);//物理编码
+        String materialDetail = (String) importUtil.getCellValue(row,6);//物料描述
+        if (!materialCode.contains("编码")||!materialDetail.contains("描述")){
+            return true;
+        }
+        return false;
+    }
     /**
      * 生成随机数
      * @return

+ 6 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/web/MaterialProvidedController.java

@@ -159,7 +159,6 @@ public class MaterialProvidedController extends BaseController {
 
 	/**
 	 * 导入Excel数据
-
 	 */
 	@ResponseBody
 	@RequiresPermissions("managementcenter:materialProvided:import")
@@ -169,6 +168,12 @@ public class MaterialProvidedController extends BaseController {
 		try {
 			StringBuilder failureMsg = new StringBuilder();
 			ImportUtil importUtil = new ImportUtil(file,1,0);
+			Boolean judgeProvided = ImportPro.getJudgeProvided(importUtil);
+			if (judgeProvided){
+				j.setSuccess(false);
+				j.setMsg("导入失败:表格不符合规范!");
+				return j;
+			}
 			List<MaterialProvided> materProUtil = ImportPro.getMaterProUtil(importUtil);
 			Integer maxVersion = materialProvidedService.findMaxVersion();
 			materialProvidedService.saveList(materProUtil,maxVersion);