From f5d7729d0b3e4597ad22c8a08e16c4a3046dfcbe Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Mon, 8 Jul 2024 20:39:10 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E4=BF=AE=E5=A4=8Dbom=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=90=8E=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9C=AA=E6=9B=B4=E6=96=B0=EF=BC=8C=E7=8E=B0=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=90=8E=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E4=B8=BA=E5=BE=85=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/erp/controller/ErpBomController.java | 2 ++ ruoyi-admin/src/main/resources/templates/erp/bom/edit.html | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java index 11002678..c73af039 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java @@ -246,6 +246,8 @@ public class ErpBomController extends BaseController erpBomService.updateErpBom(erpBomVo); // 驳回申请后继续申请，可能修改表单 if (saveEntityBoolean) { + erpBomVo.setAuditStatus("0"); + erpBomVo.setUseStatus("0"); erpBomService.updateErpBom(erpBomVo); } return success("任务已完成"); diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html index ff0b3e14..8b761f04 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html @@ -309,11 +309,11 @@ title: '备注', editable : { type : 'text', - title : '损耗率', + title : '备注', mode:'inline', validate : function(value) { if (!value) { - return '用量不能为空'; + return '备注'; } } }