Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java =================================================================== diff -u -r18359 -r19422 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 18359) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 19422) @@ -165,6 +165,7 @@ ColumnNameAndPoPropertyNameMap.put("能否被科室申请", "isApplicationMaterial"); ColumnNameAndPoPropertyNameMap.put("是否消毒中心物品", "isSupplyRoomGoods"); ColumnNameAndPoPropertyNameMap.put("是否打印标签", "printInLabel"); + ColumnNameAndPoPropertyNameMap.put("包装规格", "packageSpec"); ColumnNameAndPoPropertyNameMap.put("申领规格", "applicationSpecification"); ColumnNameAndPoPropertyNameMap.put("申领单位", "middlePackageUnit"); ColumnNameAndPoPropertyNameMap.put("申领单位转换单位系数", "transferScale"); Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r19416 -r19422 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 19416) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 19422) @@ -1110,25 +1110,27 @@ } else { printInLabel = "是"; } + // 包装规格 + String packageSpec = ParerUtils.getCellFormatValue(row, 14); // 申领规格 - String applicationSpecification = ParerUtils.getCellFormatValue(row, 14); + String applicationSpecification = ParerUtils.getCellFormatValue(row, 15); // 申领单位 - String middlePackageUnit = ParerUtils.getCellFormatValue(row, 15); + String middlePackageUnit = ParerUtils.getCellFormatValue(row, 16); // 申领单位转换单位系数 Integer transferScale = null; - String transferScaleStr = ParerUtils.getCellFormatValue(row, 16); + String transferScaleStr = ParerUtils.getCellFormatValue(row, 17); 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); + failureCount, sb, currentRowNum,17,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); continue; } } 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; } } @@ -1137,19 +1139,19 @@ || (StringUtils.isNotBlank(applicationSpecification) && StringUtils.isNotBlank(middlePackageUnit) && StringUtils.isNotBlank(transferScaleStr)) )){ failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,16,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); + failureCount, sb, currentRowNum,17,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID); continue; } // 顺序号 Integer sequence = null; - String sequenceStr = ParerUtils.getCellFormatValue(row, 17); + String sequenceStr = ParerUtils.getCellFormatValue(row, 18); if (StringUtils.isNotBlank(sequenceStr)) { try { sequence = Integer.parseInt(sequenceStr); } catch (Exception e) { failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,17,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER); + failureCount, sb, currentRowNum,18,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER); continue; } }else{ @@ -1187,6 +1189,7 @@ diposableGoods.setTransferScale(transferScale); diposableGoods.setSequence(sequence); diposableGoods.setApplicationSpecification(applicationSpecification); + diposableGoods.setPackageSpec(packageSpec); totalCount = saveOrUpdateAndClearCache(totalCount, diposableGoods); successCount++; Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls =================================================================== diff -u -r19416 -r19422 Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataTest.xls =================================================================== diff -u -r19416 -r19422 Binary files differ