From d1a6f7127b82929c681af7d4ce2b3e0b53761ad4 Mon Sep 17 00:00:00 2001 From: icewint Date: Wed, 26 Feb 2025 15:41:15 +0800 Subject: [PATCH] Merge branch 'master' of http://112.4.208.194:3000/FeiDaBaoKai/wms_serve_xugongteji --- .../java/com/ruoyi/web/controller/app/AppPmsController.java | 6 +++++- .../com/ruoyi/web/controller/app/AppTaskController.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java index 52fefd42..10ac6100 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java @@ -88,7 +88,11 @@ public class AppPmsController extends BaseController { if (i == 0) { return error("存入入库码盘信息失败"); } - return toAjax(appPmsOrderInService.insertAppPmsOrderIn(appPmsOrderIn)); + int i1 = appPmsOrderInService.insertAppPmsOrderIn(appPmsOrderIn); + if (i1 == 0) { + return error("入库单保存失败"); + } + return AjaxResult.success("success"); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java index c2d16b4b..6869b13f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java @@ -474,7 +474,7 @@ public class AppTaskController extends BaseController } } - return success(); + return AjaxResult.success("成功"); } @PostMapping("/kk") @Anonymous