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 @@ -