材料和开工计量期增加支付期编号

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MeterPeriod.java

@@ -60,6 +60,9 @@ public class MeterPeriod extends BaseEntity {
      */
     @ApiModelProperty(value = "期号")
     private String periodNumber;
+
+    @ApiModelProperty(value = "支付编号")
+    private String payNumber;
     /**
      * 期名称
      */

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MeterPeriodServiceImpl.java

@@ -36,10 +36,7 @@ import org.springblade.meter.entity.MaterialMeterForm;
 import org.springblade.meter.entity.MaterialStartStatement;
 import org.springblade.meter.entity.MeterPeriod;
 import org.springblade.meter.mapper.MeterPeriodMapper;
-import org.springblade.meter.service.IInterimPayCertificateService;
-import org.springblade.meter.service.IMaterialMeterFormService;
-import org.springblade.meter.service.IMaterialStartStatementService;
-import org.springblade.meter.service.IMeterPeriodService;
+import org.springblade.meter.service.*;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.meter.vo.MeterPeriodVO;
 import org.springframework.stereotype.Service;
@@ -62,6 +59,8 @@ public class MeterPeriodServiceImpl extends BaseServiceImpl<MeterPeriodMapper, M
 
     private final IMaterialStartStatementService materialStartStatementService;
 
+    private final IContractMeterPeriodService contractMeterPeriodService;
+
     /**
      * 编辑计量期 材料开工计量期表
      */
@@ -75,6 +74,7 @@ public class MeterPeriodServiceImpl extends BaseServiceImpl<MeterPeriodMapper, M
                     .eq(MeterPeriod::getContractId,dto.getContractId())
                     .eq(MeterPeriod::getType,dto.getType()));
         }else {
+            String contractNumber = contractMeterPeriodService.getContractNumber(dto.getContractId());
             //存在数据，先删再存，循环排序
             baseMapper.remove(dto.getContractId(),dto.getType());
             int year = -1;
@@ -101,6 +101,7 @@ public class MeterPeriodServiceImpl extends BaseServiceImpl<MeterPeriodMapper, M
                 year = period.getPeriodYear();
                 month = period.getPeriodMonth();
                 period.setSort(i);
+                period.setPayNumber(contractNumber + "-" + org.springblade.meter.utils.StringUtils.padZeroToFront(period.getPeriodNumber(),3));
 
                 //由于在期数里的 期号，打印时间 发生改变 需要同步到 手册表中
                 MaterialStartStatement materialStartStatement = this.materialStartStatementService.getOne(Wrappers.<MaterialStartStatement>lambdaQuery().eq(MaterialStartStatement::getMeterPeriodId, period.getId()));