From a58526cfd1f3e85c920abcb79cf762865e1f0370 Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Wed, 31 Aug 2022 21:42:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=89=B9=E9=87=8F=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ktg/mes/qc/controller/QcIpqcController.java | 5 +++++ .../main/java/com/ktg/mes/qc/controller/QcIqcController.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java index 3eef88d..8069fff 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java @@ -187,6 +187,11 @@ public class QcIpqcController extends BaseController { for (Long ipqcId: ipqcIds ) { + QcIpqc ipqc = qcIpqcService.selectQcIpqcByIpqcId(ipqcId); + if(!UserConstants.ORDER_STATUS_PREPARE.equals(ipqc.getStatus())){ + return AjaxResult.error("只能删除草稿状态的单据!"); + } + qcIpqcLineService.deleteByIpqcId(ipqcId); //删除对应的行信息 QcDefectRecord p2 = new QcDefectRecord(); p2.setQcId(ipqcId); diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcController.java b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcController.java index 99a0b5d..d31509e 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcController.java @@ -151,6 +151,10 @@ public class QcIqcController extends BaseController { for (Long iqcId:iqcIds ) { + QcIqc iqc = qcIqcService.selectQcIqcByIqcId(iqcId); + if(!UserConstants.ORDER_STATUS_PREPARE.equals(iqc.getStatus())){ + return AjaxResult.error("只能删除草稿状态单据!"); + } qcIqcLineService.deleteByIqcId(iqcId); QcDefectRecord p2 = new QcDefectRecord(); p2.setQcId(iqcId);