|
@@ -550,7 +550,9 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
|
|
*/
|
|
*/
|
|
private String buildUniqueCode( HashSet<String> uniqueSet, QrRepertoryColumnVO qrRepertoryColumn, StringBuilder codeSb, Map<String, Object> paramMap, Map<String, QrRepertorySerialNumber> qrRepertorySerialNumberMap, int buildTimes) {
|
|
private String buildUniqueCode( HashSet<String> uniqueSet, QrRepertoryColumnVO qrRepertoryColumn, StringBuilder codeSb, Map<String, Object> paramMap, Map<String, QrRepertorySerialNumber> qrRepertorySerialNumberMap, int buildTimes) {
|
|
// 生成码
|
|
// 生成码
|
|
|
|
+ log.info("buildUniqueCode==>进来了");
|
|
buildCodeByClass(qrRepertoryColumn, codeSb, paramMap, qrRepertorySerialNumberMap);
|
|
buildCodeByClass(qrRepertoryColumn, codeSb, paramMap, qrRepertorySerialNumberMap);
|
|
|
|
+ log.info("buildUniqueCode==>活着出来了");
|
|
String code = codeSb.toString();
|
|
String code = codeSb.toString();
|
|
|
|
|
|
// add成功,说明码没有重复
|
|
// add成功,说明码没有重复
|
|
@@ -576,9 +578,10 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
|
|
codeSb.delete(0, codeSb.length());
|
|
codeSb.delete(0, codeSb.length());
|
|
|
|
|
|
String[] buildClassArr = qrRepertoryColumn.getQrFormatVO().getCodeVariableBuildClass().split(",");
|
|
String[] buildClassArr = qrRepertoryColumn.getQrFormatVO().getCodeVariableBuildClass().split(",");
|
|
-
|
|
|
|
|
|
+ log.info("buildClassArr="+buildClassArr);
|
|
for (int j = 0; j < buildClassArr.length; j++) {
|
|
for (int j = 0; j < buildClassArr.length; j++) {
|
|
String buildClass = buildClassArr[j];
|
|
String buildClass = buildClassArr[j];
|
|
|
|
+ log.info("buildClass="+buildClass);
|
|
String code;
|
|
String code;
|
|
if (buildClass.startsWith(SerialBuildCode.SERIAL_START_WITH)) {
|
|
if (buildClass.startsWith(SerialBuildCode.SERIAL_START_WITH)) {
|
|
QrRepertorySerialNumber qrRepertorySerialNumber = qrRepertorySerialNumberMap.get(qrRepertoryColumn.getId() + "_" + j);
|
|
QrRepertorySerialNumber qrRepertorySerialNumber = qrRepertorySerialNumberMap.get(qrRepertoryColumn.getId() + "_" + j);
|
|
@@ -590,6 +593,7 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
|
|
} else {
|
|
} else {
|
|
code = BuildCodeUtil.buildSingleCode(buildClass, paramMap);
|
|
code = BuildCodeUtil.buildSingleCode(buildClass, paramMap);
|
|
}
|
|
}
|
|
|
|
+ log.info("code="+code);
|
|
codeSb.append(code);
|
|
codeSb.append(code);
|
|
}
|
|
}
|
|
}
|
|
}
|