diff --git a/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java b/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java
index 00e1cc1e1db2cc77d63ce9191b858888cd09a100..685a4af5a0071892f4739591231747515092da07 100644
--- a/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java
+++ b/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java
@@ -50,11 +50,12 @@ public interface BizModelRequirementInfoService {
     /**
      * 删除模型需求
      *
-     * @param demandId
-     * @param modelId
+     * @param objId
+     * @param requirementCode
+     * @param modelCode
      * @return
      */
-    Integer deleteModelRequirementInfo(String demandId, String modelId);
+    Integer deleteModelRequirementInfo(String objId, String requirementCode, String modelCode);
 
     /**
      * 删除模型属性需求
diff --git a/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java b/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java
index 74fac7337c49066e4e6d79e75324d679732b0ba3..553c5c44531b2fb21eeab355f9eef53c11beeea3 100644
--- a/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java
+++ b/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java
@@ -99,10 +99,6 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
     @Override
     public Integer createModelPropertyRequirementInfo(ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO) {
 
-//        ModelRequirement modelRequirement = new ModelRequirement();
-//        BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelRequirement);
-//        modelRequirement.setCtime(LocalDateTime.now());
-
         ModelPropertyVersion modelPropertyVersion = new ModelPropertyVersion();
         BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelPropertyVersion);
         modelPropertyVersion.setRequirementCode(modelPropertyVersionRequirementDTO.getRequirementCode());
@@ -135,6 +131,7 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
         return 1;
     }
 
+    @Transactional
     @Override
     public Integer updateModelPropertyRequirementInfo(ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO) {
         ModelRequirement modelRequirement = new ModelRequirement();
@@ -152,26 +149,25 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
 
     @Transactional
     @Override
-    public Integer deleteModelRequirementInfo(String demandId, String modelId) {
+    public Integer deleteModelRequirementInfo(String objId, String requirementCode, String modelCode) {
+
+        modelRequirementService.deleteModelRequirement(objId, requirementCode);
 
-        modelRequirementService.deleteModelRequirement(modelId, demandId);
+        if (StringUtils.isNotEmpty(requirementCode)) {
 
-        if (StringUtils.isNotEmpty(modelId)) {
+            modelBaseVersionService.deleteModelBaseVersion(requirementCode, modelCode);
+            modelPropertyVersionService.deleteModelPropertyVersion(requirementCode, modelCode, null);
 
-            modelBaseVersionService.deleteModelBaseVersion(modelId, demandId);
         }
 
         return 1;
     }
 
+    @Transactional
     @Override
-    public Integer deleteModelPropertyRequirementInfo(String demandId, String modelId, String proId) {
-        modelRequirementService.deleteModelRequirement(modelId, demandId);
-
-        if (StringUtils.isNotEmpty(proId)) {
+    public Integer deleteModelPropertyRequirementInfo(String requirementCode, String modelCode, String propCode) {
 
-            modelPropertyVersionService.deleteModelPropertyVersion(demandId, proId);
-        }
+        modelPropertyVersionService.deleteModelPropertyVersion(requirementCode, modelCode, propCode);
 
         return 1;
     }
diff --git a/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java b/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java
index b66a96b889607c7df48c922152d89cb1b594b5de..a0739888334ecc57071aa5151ec1389cf86a9644 100644
--- a/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java
+++ b/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java
@@ -64,9 +64,10 @@ public class ModelControlDemandController {
      */
     @ApiOperation("模型需求-删除")
     @PostMapping("/delete/modelRequirement")
-    public ResponseVO deleteModelRequirement(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId,
-                                             @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) {
-        return ResponseVO.ok(bizModelRequirementInfoService.deleteModelRequirementInfo(objId, modelCode));
+    public ResponseVO deleteModelRequirement(@ApiParam(value = "需求编号") @RequestParam(value = "objId", required = false) String objId,
+                                             @ApiParam(value = "需求编码") @RequestParam(value = "requirementCode") String requirementCode,
+                                             @ApiParam(value = "模型编码") @RequestParam(value = "modelCode") String modelCode) {
+        return ResponseVO.ok(bizModelRequirementInfoService.deleteModelRequirementInfo(objId, requirementCode, modelCode));
     }
 
     /**
diff --git a/src/main/java/com/pms/ocp/service/ModelBaseVersionService.java b/src/main/java/com/pms/ocp/service/ModelBaseVersionService.java
index 3c1ffe621e496c7b76f4fc7f415c2ee2af98faa8..c0cd2380d6880a3133f6915c38ec28b1bdd843f8 100644
--- a/src/main/java/com/pms/ocp/service/ModelBaseVersionService.java
+++ b/src/main/java/com/pms/ocp/service/ModelBaseVersionService.java
@@ -25,11 +25,11 @@ public interface ModelBaseVersionService {
     /**
      * 删除模型基础版本信息
      *
-     * @param modelId
+     * @param requirementCode
      * @param modelCode
      * @return
      */
-    Integer deleteModelBaseVersion(String modelId, String modelCode);
+    Integer deleteModelBaseVersion(String requirementCode, String modelCode);
 
     /**
      * 更新模型基础版本信息
diff --git a/src/main/java/com/pms/ocp/service/ModelPropertyVersionService.java b/src/main/java/com/pms/ocp/service/ModelPropertyVersionService.java
index 3d9cfd8c51ece1ab3a0826363988ae420728b9f0..ce3fd2b25285e22c50068ce48e3190c03d3954b8 100644
--- a/src/main/java/com/pms/ocp/service/ModelPropertyVersionService.java
+++ b/src/main/java/com/pms/ocp/service/ModelPropertyVersionService.java
@@ -24,10 +24,11 @@ public interface ModelPropertyVersionService {
      * 删除模型属性版本信息
      *
      * @param propCode
-     * @param propId
+     * @param modelCode
+     * @param requirementCode
      * @return
      */
-    Integer deleteModelPropertyVersion(String propId, String propCode);
+    Integer deleteModelPropertyVersion(String requirementCode, String modelCode, String propCode);
 
     /**
      * 更新模型属性版本信息
diff --git a/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java
index 43519785271fedac5a151949a71a81c3d864d5b2..437b849e136c1ed5b65376fd86b099e798cb1be0 100644
--- a/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java
@@ -31,11 +31,11 @@ public class ModelBaseVersionServiceImpl implements ModelBaseVersionService {
     }
 
     @Override
-    public Integer deleteModelBaseVersion(String objId, String modelCode) {
+    public Integer deleteModelBaseVersion(String requirementCode, String modelCode) {
         QueryWrapper<ModelBaseVersion> queryWrapper = new QueryWrapper();
 
-        if (StringUtils.isNotEmpty(objId)) {
-            queryWrapper.lambda().eq(ModelBaseVersion::getObjId, objId);
+        if (StringUtils.isNotEmpty(requirementCode)) {
+            queryWrapper.lambda().eq(ModelBaseVersion::getObjId, requirementCode);
         }
 
         if (StringUtils.isNotEmpty(modelCode)) {
diff --git a/src/main/java/com/pms/ocp/service/impl/ModelPropertyVersionServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelPropertyVersionServiceImpl.java
index 711515166efc19f19709b7c407e05fc58ec2537f..45965a1f2d3d3c13f6b6537dda4a167f3b73f443 100644
--- a/src/main/java/com/pms/ocp/service/impl/ModelPropertyVersionServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ModelPropertyVersionServiceImpl.java
@@ -32,11 +32,15 @@ public class ModelPropertyVersionServiceImpl implements ModelPropertyVersionServ
     }
 
     @Override
-    public Integer deleteModelPropertyVersion(String propId, String propCode) {
+    public Integer deleteModelPropertyVersion(String requirementCode, String modelCode, String propCode) {
         QueryWrapper<ModelPropertyVersion> queryWrapper = new QueryWrapper();
 
-        if (StringUtils.isNotEmpty(propId)) {
-            queryWrapper.lambda().eq(ModelPropertyVersion::getObjId, propId);
+        if (StringUtils.isNotEmpty(requirementCode)) {
+            queryWrapper.lambda().eq(ModelPropertyVersion::getRequirementCode, requirementCode);
+        }
+
+        if (StringUtils.isNotEmpty(modelCode)) {
+            queryWrapper.lambda().eq(ModelPropertyVersion::getModelCode, modelCode);
         }
 
         if (StringUtils.isNotEmpty(propCode)) {