Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r25581 -r25590 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 25581) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 25590) @@ -2425,15 +2425,15 @@ String type = ParerUtils.getCellFormatValue(row, 2); if (!typeList.contains(type)) { failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,1,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_NOT_DEFINED); + failureCount, sb, currentRowNum,2,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_NOT_DEFINED); continue; } // 类别 一类二类三类 导入字段可以为空 String grade = ParerUtils.getCellFormatValue(row, 3); if(StringUtils.isNotBlank(grade)){ if (grades.indexOf(";" + grade + ";") == -1) { failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,1,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_NOT_DEFINED); + failureCount, sb, currentRowNum,3,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_NOT_DEFINED); continue; } } @@ -2443,7 +2443,7 @@ if (StringUtils.isNotBlank(goodsType)) { if (goodsTypes.indexOf(";" + goodsType + ";") == -1) { failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,8,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_NOT_DEFINED); + failureCount, sb, currentRowNum,4,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_NOT_DEFINED); continue; } } else { @@ -2465,7 +2465,7 @@ referencePrice = Double.parseDouble(referencePriceStr); } catch (Exception e) { failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,5,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_MONEY); + failureCount, sb, currentRowNum,7,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_MONEY); continue; } } @@ -2478,7 +2478,7 @@ minStorage = Integer.parseInt(minStorageStr); } catch (Exception e) { failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,6,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER); + failureCount, sb, currentRowNum,8,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER); continue; } } @@ -2501,7 +2501,7 @@ if (StringUtils.isNotBlank(isPartOfTousseMaterial)) { if (canOrNo.indexOf(";" + isPartOfTousseMaterial + ";") == -1) { failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,8,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); + failureCount, sb, currentRowNum,10,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); continue; } } else { @@ -2513,7 +2513,7 @@ if (StringUtils.isNotBlank(isApplicationMaterial)) { if (canOrNo.indexOf(";" + isApplicationMaterial + ";") == -1) { failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,9,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); + failureCount, sb, currentRowNum,11,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); continue; } } else { @@ -2525,7 +2525,7 @@ if (StringUtils.isNotBlank(isSupplyRoomGoods)) { if (yesOrNo.indexOf(";" + isSupplyRoomGoods + ";") == -1) { failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,8,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); + failureCount, sb, currentRowNum,12,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); continue; } } else { @@ -2536,7 +2536,7 @@ if (StringUtils.isNotBlank(printInLabel)) { if (yesOrNo.indexOf(";" + printInLabel + ";") == -1) { failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,8,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); + failureCount, sb, currentRowNum,13,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); continue; } } else {