生产文件路径修改

src/main/java/com/jeeplus/modules/sg/information/utils/ImportInformation.java

@@ -79,13 +79,20 @@ public  class ImportInformation {
                 }
                 if (status.size() > 0) {
                     for (Material list : status) {
-                        if (list.getProjectId().equals(projectId.toString()) && list.getInforId().equals(inforId.toString()) && list.getAfterNumber().equals(outboundNumber)) {
+                        double afterNumber = list.getAfterNumber();
+                        double testOutBoundNumber = Double.parseDouble(outboundNumber.toString());
+                        if (list.getProjectId().equals(projectId.toString()) && list.getInforId().equals(inforId.toString()) &&  afterNumber == testOutBoundNumber) {
                             material.setIsBack(list.getIsBack());
                             material.setIsBackNo(list.getIsBackNo());
                             material.setStatus(list.getStatus());
                             material.setInfo(list.getInfo());
                             material.setAfterNumber(list.getAfterNumber());
-                        }else {
+                            break;
+                        } else if (list.getProjectId().equals(projectId.toString()) && list.getInforId().equals(inforId.toString()) && afterNumber!=testOutBoundNumber) {
+                            material.setIsBack("否");
+                            material.setIsBackNo(1);
+                            break;
+                        } else {
                             material.setIsBack(isBack);
                             material.setIsBackNo(isBackNo);
                         }
@@ -168,6 +175,10 @@ public  class ImportInformation {
                         } else if (("否").equals(needInfor.getSecondFinish())) {
                             upInfor.setSecondFinish("是");
                             upInfor.setSecondFinishDate(new Date());
+                        } else if (("是").equals(needInfor.getSecondFinish())) {
+                            upInfor.setFirstFinish("是");
+                            upInfor.setSecondFinish(" ");
+                            upInfor.setFirstFinishDate(new Date());
                         }
                     } else {
                         if (needInfor.getFirstFinish() == "" || needInfor.getFirstFinish() == null || ("否").equals(needInfor.getFirstFinish())) {
@@ -371,24 +382,29 @@ public  class ImportInformation {
                 failureNum++;
             }
         }
-        if (materialList.size() != 0) {
-            materialService.updateStatus(materialList);
-            List<Material> isBack = materialService.findIsBack(materialList);
-            for (Material maInfor:isBack) {
-                Information upInfor = new Information();
-                Information needInfor = materialService.findNeedInfor(maInfor);
-                if (needInfor.getFirstFinish() == "" || needInfor.getFirstFinish() == null || needInfor.getFirstFinish().equals("否")) {
-                    upInfor.setProjectId(needInfor.getProjectId());
-                    upInfor.setFirstFinish("是");
-                    upInfor.setFirstFinishDate(new Date());
-                }else if (needInfor.getSecondFinish().equals("否")) {
-                    upInfor.setProjectId(needInfor.getProjectId());
-                    upInfor.setSecondFinish("是");
-                    upInfor.setSecondFinishDate(new Date());
-                }
+        try {
+            if (materialList.size() != 0) {
+                materialService.updateStatus(materialList);
+                List<Material> isBack = materialService.findIsBack(materialList);
+                for (Material maInfor:isBack) {
+                    Information upInfor = new Information();
+                    Information needInfor = materialService.findNeedInfor(maInfor);
+                    if (needInfor.getFirstFinish() == "" || needInfor.getFirstFinish() == null || needInfor.getFirstFinish().equals("否")) {
+                        upInfor.setProjectId(needInfor.getProjectId());
+                        upInfor.setFirstFinish("是");
+                        upInfor.setFirstFinishDate(new Date());
+                    } else  {
+                        upInfor.setProjectId(needInfor.getProjectId());
+                        upInfor.setSecondFinish("是");
+                        upInfor.setSecondFinishDate(new Date());
+                    }
 
-                materialService.updateNeed(upInfor);
+                    materialService.updateNeed(upInfor);
+                }
             }
+        } catch (Exception e) {
+            failureNum++;
+            e.printStackTrace();
         }
         hashMap.put("error",error);
         hashMap.put("successNum",successNum);

src/main/java/com/jeeplus/modules/sg/information/web/InformationController.java

@@ -255,23 +255,28 @@ public class InformationController extends BaseController {
 			ImportExcel ei = new ImportExcel(file, 1, 0);
 			int lastDataRowNum = ei.getLastDataRowNum();
 			Map<String, Object> importInTrial = ImportInformation.btnInReason(ei, lastDataRowNum);
-			int failureNum = Integer.parseInt(importInTrial.get("failureNum").toString());
-			int successNum = Integer.parseInt(importInTrial.get("successNum").toString());
-			if (failureNum>0){
-				failureMsg.insert(0, "，失败 "+failureNum+" 项目管理记录。");
-			}
-			ArrayList error = (ArrayList) importInTrial.get("error");
-			if (error.size()>0) {
-				errorMsg.append("以下项目定义号因出库不一致未导入");
-				for (int i = 0; i < error.size(); i++) {
-					errorMsg.append("\r\n");
-					errorMsg.append(error.get(i));
-				}
-			}
-			j.setMsg( "已成功导入 "+successNum+" 条记录"+errorMsg);
+            if (importInTrial != null) {
+                int failureNum = Integer.parseInt(importInTrial.get("failureNum").toString());
+                int successNum = Integer.parseInt(importInTrial.get("successNum").toString());
+                if (failureNum > 0) {
+                    failureMsg.insert(0, "，失败 " + failureNum + " 项目管理记录。");
+                }
+                ArrayList error = (ArrayList) importInTrial.get("error");
+                if (error.size() > 0) {
+                    errorMsg.append("以下项目定义号因出库不一致未导入");
+                    for (int i = 0; i < error.size(); i++) {
+                        errorMsg.append("\r\n");
+                        errorMsg.append(error.get(i));
+                    }
+                }
+                j.setMsg("已成功导入 " + successNum + " 条记录" + errorMsg);
+            } else {
+                j.setMsg("数据都已更新过");
+            }
+
 		} catch (Exception e) {
 			j.setSuccess(false);
-			j.setMsg("导入项审定日期失败！失败信息："+e.getMessage());
+			j.setMsg("导入项目原因！失败信息："+e.getMessage());
 		}
 		return j;
 	}