Index: forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumManagerImpl.java =================================================================== diff -u -r16472 -r16486 --- forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumManagerImpl.java (.../SerialNumManagerImpl.java) (revision 16472) +++ forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumManagerImpl.java (.../SerialNumManagerImpl.java) (revision 16486) @@ -32,6 +32,7 @@ private static SerialNumVo cleanSerialNum = null; private static final int PREFENTCH_SIZE = 1000; + private static final int SERIAL_NUMBER_START = 1; private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd"); public void setSerialNumberDao(SerialNumberDao serialNumberDao) { @@ -131,7 +132,7 @@ && StringUtils.isNumeric(serialNumberStr)) { vo.setSerialNum(Integer.parseInt(serialNumberStr)); } else { - vo.setSerialNum(0); + vo.setSerialNum(SERIAL_NUMBER_START); } vo.setSnMode(serialNum.getDefaultSerialNum()); vo.setIsEveryDayClean(serialNum.getIsEveryDayClean()); @@ -153,9 +154,9 @@ .getDateTime())) { vo.setDateTime(currentDate); vo.setCount(PREFENTCH_SIZE); - vo.setSerialNum(0); + vo.setSerialNum(SERIAL_NUMBER_START); SerialNum serialNumObj = getSerialNumber(type); - serialNumObj.setSerialNumber("" + PREFENTCH_SIZE); + serialNumObj.setSerialNumber((SERIAL_NUMBER_START + PREFENTCH_SIZE)+""); serialNumObj.setDateTime(currentDate); objectDao.saveOrUpdate(serialNumObj); } @@ -192,13 +193,13 @@ if(serialNumObj != null){ String serialNumStr = serialNumObj.getSerialNumber(); if(StringUtils.isBlank(serialNumStr)){ - serialNumStr = "0"; + serialNumStr = SERIAL_NUMBER_START + ""; } int num = Integer.parseInt(serialNumStr); serialNumObj.setSerialNumber("" + (num + PREFENTCH_SIZE)); objectDao.saveOrUpdate(serialNumObj); objectDao.flush(); - vo.setSerialNum(num - 1); + vo.setSerialNum(num); vo.setCount(PREFENTCH_SIZE); } } @@ -208,22 +209,22 @@ if(serialNumObj != null){ String numStr = serialNumObj.getSerialNumber(); if(StringUtils.isBlank(numStr)){ - numStr = "0"; + numStr = SERIAL_NUMBER_START + ""; } initSerialNumInMemory(serialNumObj); }else{ - vo.setSerialNum(0); + vo.setSerialNum(SERIAL_NUMBER_START); } } Integer serialNum = vo.getSerialNum(); Integer count = vo.getCount(); - serialNum++; + int useSerialNum = serialNum++; count--; vo.setCount(count); vo.setSerialNum(serialNum); vo.setDateTime(currentDate); - return serialNumberDao.creatSerialNumber(vo.getSnMode(), "" + serialNum); + return serialNumberDao.creatSerialNumber(vo.getSnMode(), "" + useSerialNum); } return null; } Index: ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java =================================================================== diff -u -r15780 -r16486 --- ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java (.../InitializeDataManagerImpl.java) (revision 15780) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java (.../InitializeDataManagerImpl.java) (revision 16486) @@ -272,7 +272,7 @@ Integer currentSn = Integer.parseInt(serialNumber); Integer dbMaxSn = Integer.parseInt(dbMaxBarcode); if(dbMaxSn > currentSn){ - serialNumber = ("" + dbMaxSn); + serialNumber = ("" + (dbMaxSn + 1)); serialNum.setSerialNumber(serialNumber); } }