Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java =================================================================== diff -u -r15801 -r15820 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 15801) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 15820) @@ -154,6 +154,7 @@ ColumnNameAndPoPropertyNameMap.put("是否打印标签", "printInLabel"); ColumnNameAndPoPropertyNameMap.put("申领单位", "middlePackageUnit"); ColumnNameAndPoPropertyNameMap.put("申领单位转换单位系数", "transferScale"); + ColumnNameAndPoPropertyNameMap.put("顺序号", "sequence"); } @Id Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls =================================================================== diff -u -r15764 -r15820 Binary files differ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r15764 -r15820 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 15764) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 15820) @@ -1111,10 +1111,26 @@ transferScale = Integer.parseInt(transferScaleStr); } catch (Exception e) { failureCount = appendFailureRowNumAndRecordFailureNum( - failureCount, sb, currentRowNum,15,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_MONEY); + failureCount, sb, currentRowNum,15,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER); continue; } } + + // 顺序号 + Integer sequence = null; + String sequenceStr = ParerUtils.getCellFormatValue(row, 16); + 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); + continue; + } + }else{ + // 导入字段为空 默认顺序号为0 + sequence = 0; + } DisposableGoods diposableGoods = diposableGoodsManager .getDisposableGoodsByName(name, specification); @@ -1144,6 +1160,7 @@ diposableGoods.setPrintInLabel(printInLabel); diposableGoods.setMiddlePackageUnit(middlePackageUnit); diposableGoods.setTransferScale(transferScale); + diposableGoods.setSequence(sequence); totalCount = saveOrUpdateAndClearCache(totalCount, diposableGoods); successCount++;