Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java =================================================================== diff -u -r15918 -r15919 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 15918) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 15919) @@ -158,6 +158,7 @@ ColumnNameAndPoPropertyNameMap.put("能否被科室申请", "isApplicationMaterial"); ColumnNameAndPoPropertyNameMap.put("是否消毒中心物品", "isSupplyRoomGoods"); ColumnNameAndPoPropertyNameMap.put("是否打印标签", "printInLabel"); + ColumnNameAndPoPropertyNameMap.put("申领规格", "applicationSpecification"); ColumnNameAndPoPropertyNameMap.put("申领单位", "middlePackageUnit"); ColumnNameAndPoPropertyNameMap.put("申领单位转换单位系数", "transferScale"); ColumnNameAndPoPropertyNameMap.put("顺序号", "sequence"); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls =================================================================== diff -u -r15820 -r15919 Binary files differ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r15825 -r15919 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 15825) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 15919) @@ -1106,31 +1106,46 @@ } else { printInLabel = "是"; } + // 申领规格 + String applicationSpecification = ParerUtils.getCellFormatValue(row, 14); // 申领单位 - String middlePackageUnit = ParerUtils.getCellFormatValue(row, 14); + String middlePackageUnit = ParerUtils.getCellFormatValue(row, 15); // 申领单位转换单位系数 Integer transferScale = null; - String transferScaleStr = ParerUtils.getCellFormatValue(row, 15); + String transferScaleStr = ParerUtils.getCellFormatValue(row, 16); if (StringUtils.isNotBlank(transferScaleStr)) { try { transferScale = Integer.parseInt(transferScaleStr); + if( transferScale <= 0){ + failureCount = appendFailureRowNumAndRecordFailureNum( + failureCount, sb, currentRowNum,16,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); + continue; + } } catch (Exception e) { failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,15,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER); + failureCount, sb, currentRowNum,16,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER); continue; } } + // 申领规格,申领单位,单位转换系数,要么都有值,要么同时为空 + if( !((StringUtils.isBlank(applicationSpecification) && StringUtils.isBlank(middlePackageUnit) && StringUtils.isBlank(transferScaleStr)) + || (StringUtils.isNotBlank(applicationSpecification) && StringUtils.isNotBlank(middlePackageUnit) && StringUtils.isNotBlank(transferScaleStr)) + )){ + failureCount = appendFailureRowNumAndRecordFailureNum( + failureCount, sb, currentRowNum,16,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); + continue; + } // 顺序号 Integer sequence = null; - String sequenceStr = ParerUtils.getCellFormatValue(row, 16); + String sequenceStr = ParerUtils.getCellFormatValue(row, 17); if (StringUtils.isNotBlank(sequenceStr)) { try { sequence = Integer.parseInt(sequenceStr); } catch (Exception e) { failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,16,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER); + failureCount, sb, currentRowNum,17,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER); continue; } }else{ @@ -1167,6 +1182,7 @@ diposableGoods.setMiddlePackageUnit(middlePackageUnit); diposableGoods.setTransferScale(transferScale); diposableGoods.setSequence(sequence); + diposableGoods.setApplicationSpecification(applicationSpecification); totalCount = saveOrUpdateAndClearCache(totalCount, diposableGoods); successCount++;