Merge remote-tracking branch 'origin/master' into master

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/dto/MaterialListDTO.java

@@ -23,6 +23,9 @@ public class MaterialListDTO {
     @ApiModelProperty(value = "材料名称")
     private String materialName;
 
-    @ApiModelProperty(value = "材料计量期id")
+    @ApiModelProperty(value = "计量期id(合同计量期id)未上报")
     private Long meterPeriodId;
+
+    @ApiModelProperty(value = "调差期id(合同计量期id)已审批")
+    private Long contractPeriodId;
 }

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

@@ -81,5 +81,11 @@ public class ContractMaterialAdjustDetail extends BaseEntity {
     @ApiModelProperty(value = "调差数量")
     private BigDecimal adjustTotal;
 
+    public BigDecimal getMeterTotal() {
+        return new BigDecimal(meterTotal.stripTrailingZeros().toPlainString());
+    }
 
+    public void setMeterTotal(BigDecimal meterTotal) {
+        this.meterTotal = new BigDecimal(meterTotal.stripTrailingZeros().toPlainString());
+    }
 }

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

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModelProperty;
 import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
@@ -114,4 +115,11 @@ public class InventoryFormApply extends BaseEntity {
     @ApiModelProperty(value = "支付金额")
     private BigDecimal PayMoney;
 
+    public BigDecimal getCurrentMeterTotal() {
+        return new BigDecimal(currentMeterTotal.stripTrailingZeros().toPlainString());
+    }
+
+    public void setCurrentMeterTotal(BigDecimal currentMeterTotal) {
+        this.currentMeterTotal = new BigDecimal(currentMeterTotal.stripTrailingZeros().toPlainString());
+    }
 }

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/MeterInventoryVO.java

@@ -82,4 +82,19 @@ public class MeterInventoryVO {
     @ApiModelProperty(value = "排序")
     private Integer sort;
 
+    public BigDecimal getCurrentMeterTotal() {
+        return new BigDecimal(currentMeterTotal.stripTrailingZeros().toPlainString());
+    }
+
+    public void setCurrentMeterTotal(BigDecimal currentMeterTotal) {
+        this.currentMeterTotal = new BigDecimal(currentMeterTotal.stripTrailingZeros().toPlainString());
+    }
+
+    public BigDecimal getAllMeterTotal() {
+        return new BigDecimal(allMeterTotal.stripTrailingZeros().toPlainString());
+    }
+
+    public void setAllMeterTotal(BigDecimal allMeterTotal) {
+        this.allMeterTotal = new BigDecimal(allMeterTotal.stripTrailingZeros().toPlainString());
+    }
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/ContractMaterialController.java

@@ -149,7 +149,7 @@ public class ContractMaterialController extends BladeController {
 
 	@PostMapping("/get-all-material3")
 	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "材料调差-当前期未调差材料不分页", notes = "传入合同id,计量期id")
+	@ApiOperation(value = "材料调差-当前调差期未调差材料不分页", notes = "传入合同id,计量期id")
 	public R<List<ContractMaterialVO4>> getAllMaterial3(@RequestBody MaterialListDTO dto) {
 		List<ContractMaterialVO4> list = contractMaterialService.getAllMaterial3(dto);
 		return R.data(list);

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/ContractMaterialMapper.xml

@@ -68,7 +68,7 @@
         select id,material_number,material_name,unit,price
         from s_contract_material where is_deleted = 0 and contract_id = #{dto.contractId}
         and id not in (select contract_material_id from s_contract_material_adjust cma where cma.is_deleted = 0
-                                and cma.contract_id = #{dto.contractId} and cma.meter_period_id = #{dto.meterPeriodId})
+                                and cma.contract_id = #{dto.contractId} and cma.contract_period_id = #{dto.contractPeriodId})
     </select>
 
 

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

@@ -60,7 +60,7 @@ public class ContractMaterialAdjustServiceImpl extends BaseServiceImpl<ContractM
 
     private final IInventoryFormMaterialService formMaterialService;
 
-    private final IMeterPeriodService meterPeriodService;
+    private final IContractMeterPeriodService contractMeterPeriodService;
 
     @Override
     @Transactional
@@ -239,8 +239,8 @@ public class ContractMaterialAdjustServiceImpl extends BaseServiceImpl<ContractM
         if (adjust.getApproveStatus() == 1){
             throw new ServiceException("当前材料调差单已经上报，删除失败");
         }
-        //获取材料计量期，判断是否已经审批
-        MeterPeriod period = meterPeriodService.getById(adjust.getMeterPeriodId());
+        //获取合同计量期，判断是否已经审批
+        ContractMeterPeriod period = contractMeterPeriodService.getById(adjust.getMeterPeriodId());
         if (period.getApproveStatus() != 0){
             throw new ServiceException("删除失败，当前计量期不是未上报状态");
         }