diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java
index 8525d86..4f5c2a2 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java
@@ -130,10 +130,13 @@ public class DvCheckPlanController extends BaseController
for (Long planId:planIds
) {
DvCheckPlan plan = dvCheckPlanService.selectDvCheckPlanByPlanId(planId);
- if(UserConstants.ORDER_STATUS_PREPARE.equals(plan.getStatus())){
+ if(!UserConstants.ORDER_STATUS_PREPARE.equals(plan.getStatus())){
return AjaxResult.error("只能删除草稿状态单据!");
}
}
+
+
+
return toAjax(dvCheckPlanService.deleteDvCheckPlanByPlanIds(planIds));
}
}
diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckMachineryMapper.java b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckMachineryMapper.java
index b3b7afb..eb51f9b 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckMachineryMapper.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckMachineryMapper.java
@@ -60,4 +60,11 @@ public interface DvCheckMachineryMapper
* @return 结果
*/
public int deleteDvCheckMachineryByRecordIds(Long[] recordIds);
+
+ /**
+ * 根据计划头ID删除对应的设备列表
+ * @param planId
+ * @return
+ */
+ public int deleteByPlanId(Long planId);
}
diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckMachineryService.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckMachineryService.java
index 95f42d8..2529dd9 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckMachineryService.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckMachineryService.java
@@ -60,4 +60,11 @@ public interface IDvCheckMachineryService
* @return 结果
*/
public int deleteDvCheckMachineryByRecordId(Long recordId);
+
+ /**
+ * 根据计划头ID删除对应的设备列表
+ * @param planId
+ * @return
+ */
+ public int deleteByPlanId(Long planId);
}
diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckMachineryServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckMachineryServiceImpl.java
index 27da6fa..b9da8fe 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckMachineryServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckMachineryServiceImpl.java
@@ -106,4 +106,9 @@ public class DvCheckMachineryServiceImpl implements IDvCheckMachineryService
{
return dvCheckMachineryMapper.deleteDvCheckMachineryByRecordId(recordId);
}
+
+ @Override
+ public int deleteByPlanId(Long planId) {
+ return dvCheckMachineryMapper.deleteByPlanId(planId);
+ }
}
diff --git a/ktg-mes/src/main/resources/mapper/dv/DvCheckMachineryMapper.xml b/ktg-mes/src/main/resources/mapper/dv/DvCheckMachineryMapper.xml
index 9c150e1..14b4f34 100644
--- a/ktg-mes/src/main/resources/mapper/dv/DvCheckMachineryMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/dv/DvCheckMachineryMapper.xml
@@ -45,8 +45,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
@@ -119,4 +126,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{recordId}
+
+
+ delete from dv_check_machinery where plan_id = #{planId}
+
+
\ No newline at end of file