调料调差删除

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

@@ -98,5 +98,13 @@ public class ContractMaterialAdjustController extends BladeController {
         return R.success("修改成功");
     }
 
+    @GetMapping("/delete")
+    @ApiOperationSupport(order = 6)
+    @ApiOperation(value = "删除", notes = "传入材料调差表id")
+    public R delete(Long id) {
+        adjustService.delete(id);
+        return R.success("删除成功");
+    }
+
 
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/service/IContractMaterialAdjustService.java

@@ -47,4 +47,6 @@ public interface IContractMaterialAdjustService extends BaseService<ContractMate
     MaterialAdjustDetailVO detail(Long id);
 
     void update2(ContractMaterialAdjustAddDTO dto);
+
+    void delete(Long id);
 }

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

@@ -60,6 +60,8 @@ public class ContractMaterialAdjustServiceImpl extends BaseServiceImpl<ContractM
 
     private final IInventoryFormMaterialService formMaterialService;
 
+    private final IMeterPeriodService meterPeriodService;
+
     @Override
     @Transactional
     public void add(ContractMaterialAdjustAddDTO dto) {
@@ -207,4 +209,20 @@ public class ContractMaterialAdjustServiceImpl extends BaseServiceImpl<ContractM
             attachmentFormService.saveBatch(files);
         }
     }
+
+    @Override
+    public void delete(Long id) {
+        //获取调差信息，判断是否已经审批
+        ContractMaterialAdjust adjust = this.getById(id);
+        if (adjust.getApproveStatus() == 1){
+            throw new ServiceException("当前材料调差单已经上报，删除失败");
+        }
+        //获取材料计量期，判断是否已经审批
+        MeterPeriod period = meterPeriodService.getById(adjust.getMeterPeriodId());
+        if (period.getApproveStatus() != 0){
+            throw new ServiceException("删除失败，当前计量期不是未上报状态");
+        }
+        this.removeById(id);
+
+    }
 }