修改

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/PickingInfo.java

@@ -328,10 +328,19 @@ public  class PickingInfo {
                 flag =true;
                 for (Acquisition acquisition2:projectAcquisitions){
                     if (acquisition2.getProjectId().equals(acquisition.getProjectId())){
-                        long days1 = acquisition.getManagerTime().getTime();//项目领导审核时间
-                        long days2 = acquisition2.getManagerTime().getTime();
-                        if (days1>days2){
-                            acquisition2.setManagerTime(acquisition.getManagerTime());
+                        if(null!=acquisition.getManagerTime()&&null!=acquisition2.getManagerTime()){
+                            long days1 = acquisition.getManagerTime().getTime();//项目领导审核时间
+                            long days2 = acquisition2.getManagerTime().getTime();
+                            if (days1>days2){
+                                acquisition2.setManagerTime(acquisition.getManagerTime());
+                            }
+                        }else {
+                            if (null!=acquisition.getManagerTime()){
+                                acquisition2.setManagerTime(acquisition.getManagerTime());
+                            }
+                            if (null!=acquisition2.getManagerTime()){
+                                acquisition2.setManagerTime(acquisition2.getManagerTime());
+                            }
                         }
                         flag = false;
                     }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -386,7 +386,7 @@ public class ProjectController extends BaseController {
 	public AjaxJson importFileRequisition(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
 		AjaxJson j = new AjaxJson();
 		String str = "";//提示
-		try {
+//		try {
 			ImportUtil importUtil = new ImportUtil(file, 0, 0);
 			//读取表格list
 			List<PickingRequisition> listPickRequisition = PickingInfo.getListPickRequisition(importUtil);
@@ -527,10 +527,10 @@ public class ProjectController extends BaseController {
 				}
 			}
 			j.setMsg( "已成功导入 "+sureSavePicking.size()+" 条领料表单记录."+str);
-		} catch (Exception e) {
-			j.setSuccess(false);
-			j.setMsg("导入领料表单失败！失败信息："+e.getMessage());
-		}
+//		} catch (Exception e) {
+//			j.setSuccess(false);
+//			j.setMsg("导入领料表单失败！失败信息："+e.getMessage());
+//		}
 		return j;
 	}
 }