diff --git a/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/controller/ProcurementPlanController.java b/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/controller/ProcurementPlanController.java index 9464fe8..1073aae 100644 --- a/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/controller/ProcurementPlanController.java +++ b/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/controller/ProcurementPlanController.java @@ -72,7 +72,7 @@ public class ProcurementPlanController extends BladeController { @ApiOperationSupport(order = 1) @Operation(summary = "生成单据号", description = "生成唯一单据号") public R generateBillNo() { - return R.data(billCodeService.generateBillCode("PROCUREMENT_PLAN")); + return R.data(billCodeService.generateBillCode("PROCUREMENT_PLAN","NDZC")); } /** diff --git a/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/service/IBillCodeService.java b/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/service/IBillCodeService.java index 4807811..19fdd3d 100644 --- a/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/service/IBillCodeService.java +++ b/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/service/IBillCodeService.java @@ -41,6 +41,6 @@ public interface IBillCodeService extends IService { * @param billType 单据类型 * @return 单据号 */ - String generateBillCode(String billType); + String generateBillCode(String billType,String perFix); } diff --git a/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/service/impl/BillCodeServiceImpl.java b/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/service/impl/BillCodeServiceImpl.java index bf5840b..bb1e1b9 100644 --- a/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/service/impl/BillCodeServiceImpl.java +++ b/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/service/impl/BillCodeServiceImpl.java @@ -54,15 +54,15 @@ public class BillCodeServiceImpl extends ServiceImpl i /** * 单据号前缀 */ - private static final String BILL_NO_PREFIX = "NDZC"; +// private static final String BILL_NO_PREFIX = "NDZC"; @Override - public String generateBillCode(String billType) { + public String generateBillCode(String billType,String perFix) { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmm"); for (int i = 0; i < MAX_RETRY; i++) { String dateStr = dateFormat.format(new Date()); String randomStr = String.format("%03d", ThreadLocalRandom.current().nextInt(0, 1000)); - String candidate = BILL_NO_PREFIX + dateStr + randomStr; + String candidate = perFix + dateStr + randomStr; if (baseMapper.selectCount(Wrappers.lambdaQuery() .eq(BillCode::getBillCode, candidate)) == 0) { BillCode billCode = new BillCode();