Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r14939 -r15053 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 14939) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 15053) @@ -1387,6 +1387,7 @@ totalCount = saveOrUpdateAndClearCache(totalCount, tousseDefinition); tousseDefinition.setAncestorID(tousseDefinition.getId()); + tousseDefinition.setParentID(tousseDefinition.getId()); successCount++; materialInstanceList = null; tousseDefinitionMaterials = null; @@ -1486,6 +1487,7 @@ totalCount = saveOrUpdateAndClearCache(totalCount, tousseDefinition); tousseDefinition.setAncestorID(tousseDefinition.getId()); + tousseDefinition.setParentID(tousseDefinition.getId()); successCount++; } // 格式:成功插入数量#插入失败数量#失败行1,失败行2... @@ -2320,7 +2322,8 @@ return com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER; } } else { - return com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_BLANK; + materialDefinitionNum = 0; + //return com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_BLANK; } String isIncludePlant = includePlant; if(StringUtils.isNotBlank(includePlant) && includePlant.equals("植入物")){