From c9bd782b462e2626e3d9574b62f940d604460987 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 20 Jun 2024 17:30:01 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=20table=E8=A1=A8=E6=A0=BC=E4=B8=8D=E8=83=BD=E8=87=AA?= =?UTF-8?q?=E9=80=82=E5=BA=94=E7=AA=97=E5=8F=A3=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=A2=86=E6=96=99=E9=A1=B5=E9=9D=A2=20tab?= =?UTF-8?q?le=E8=A1=A8=E6=A0=BC=E4=B8=8D=E8=83=BD=E8=87=AA=E9=80=82?= =?UTF-8?q?=E5=BA=94=E7=AA=97=E5=8F=A3=E9=97=AE=E9=A2=98=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20=E9=A2=86=E6=96=99=E4=BF=9D=E5=AD=98=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E4=BF=AE=E6=94=B9=20=E9=A2=86=E6=96=99=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=9A=84=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysMakeorderPickController.java | 4 ++++ .../resources/templates/system/makeorder/addpick.html | 2 -- .../resources/templates/system/makeorder/detail.html | 9 +++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeorderPickController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeorderPickController.java index 3be4ae5c..57c8f353 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeorderPickController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeorderPickController.java @@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.process.general.service.IProcessService; import com.ruoyi.system.domain.SysMakeorderPick; @@ -106,6 +107,9 @@ public class SysMakeorderPickController extends BaseController @ResponseBody public AjaxResult addSave(SysMakeorderPick sysMakeorderPick) { + if (StringUtils.isEmpty(sysMakeorderPick.getPickDetails())){ + return AjaxResult.success(); + } // 审核状态-待审核 sysMakeorderPick.setAuditStatus("0"); sysMakeorderPickService.submitApply(sysMakeorderPick); diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html index 7c9794da..e2afe31d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html @@ -356,9 +356,7 @@ }); function submitHandler() { - debugger var data = $("#form-makeorder-edit").serializeArray(); - alert(JSON.stringify(data)); $.operate.save(ctx + "system/makeorderpick/add", data); } diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html index d569b47e..b5f7102f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html @@ -36,12 +36,13 @@ -
-
-
+
+
+
+
+
-