Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r20132 -r20722 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 20132) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 20722) @@ -1164,6 +1164,35 @@ // 导入字段为空 默认顺序号为0 sequence = 0; } + + //物资编码 + String inventorySerialNumber = ParerUtils.getCellFormatValue(row, 19); + + // 最小申请数量 + Integer minApplyAmount = null; + String minApplyAmountStr = ParerUtils.getCellFormatValue(row, 20); + if (StringUtils.isNotBlank(minApplyAmountStr)) { + try { + minApplyAmount = Integer.parseInt(minApplyAmountStr); + } catch (Exception e) { + failureCount = appendFailureRowNumAndRecordFailureNum( + failureCount, sb, currentRowNum,20,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER); + continue; + } + } + + //最大申请数量 + Integer maxApplyAmount = null; + String maxApplyAmountStr = ParerUtils.getCellFormatValue(row, 21); + if (StringUtils.isNotBlank(maxApplyAmountStr)) { + try { + maxApplyAmount = Integer.parseInt(maxApplyAmountStr); + } catch (Exception e) { + failureCount = appendFailureRowNumAndRecordFailureNum( + failureCount, sb, currentRowNum,21,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER); + continue; + } + } DisposableGoods diposableGoods = diposableGoodsManager .get(name, specification); @@ -1196,6 +1225,9 @@ diposableGoods.setSequence(sequence); diposableGoods.setApplicationSpecification(applicationSpecification); diposableGoods.setPackageSpec(packageSpec); + diposableGoods.setInventorySerialNumber(inventorySerialNumber); + diposableGoods.setMaxApplyAmount(maxApplyAmount); + diposableGoods.setMinApplyAmount(minApplyAmount); totalCount = saveOrUpdateAndClearCache(totalCount, diposableGoods); successCount++; Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls =================================================================== diff -u -r20115 -r20722 Binary files differ