From f10c6a23612df6384059d4076480fdabe481479d Mon Sep 17 00:00:00 2001
From: chc0125 <844857777@qq.com>
Date: Wed, 26 Feb 2025 11:12:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/controller/app/AppPmsController.java  |  8 ++++++--
 .../ruoyi/web/controller/app/AppTaskController.java |  4 ++--
 .../com/ruoyi/common/core/domain/AjaxResult.java    | 13 +++++++++++++
 3 files changed, 21 insertions(+), 4 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..749960d3 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
@@ -69,7 +69,7 @@ public class AppPmsController extends BaseController {
         // 判断入库单号是否重复
         AppPmsOrderIn existAppPmsOrderIn = appPmsOrderInService.selectAppPmsOrderInByListId(orderInRequest.getListId());
         if (existAppPmsOrderIn != null) {
-            return error("入库单号重复。");
+           return AjaxResult.error(201,"入库单已存在");
         }
         AppPmsOrderIn appPmsOrderIn = new AppPmsOrderIn();
         BeanUtils.copyProperties(orderInRequest, appPmsOrderIn);
@@ -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 de79ac7e..5de40b0a 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
@@ -298,7 +298,7 @@ public class AppTaskController extends BaseController
         wcsDate.setUser("WMS");
         wcsDate.setVehicleNo(wcsStackerTask.getVehicleNo());
         wcsDate.setDestination(location);
-        return success(wcsDate);
+        return  AjaxResult.success(0,"请求成功",wcsDate);
     }
 
     @ApiOperation("任务反馈")
@@ -465,7 +465,7 @@ public class AppTaskController extends BaseController
             }
 
         }
-        return success();
+        return AjaxResult.success(0,"成功");
     }
     @PostMapping("/kk")
     @Anonymous
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
index 42dcbcde..b9f81459 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
@@ -23,6 +23,7 @@ public class AjaxResult extends HashMap<String, Object>
     /** 数据对象 */
     public static final String DATA_TAG = "data";
 
+
     /**
      * 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。
      */
@@ -59,6 +60,8 @@ public class AjaxResult extends HashMap<String, Object>
         }
     }
 
+
+
     /**
      * 返回成功消息
      * 
@@ -102,6 +105,16 @@ public class AjaxResult extends HashMap<String, Object>
         return new AjaxResult(HttpStatus.SUCCESS, msg, data);
     }
 
+    public static AjaxResult success(int code,String msg, Object returnDate)
+    {
+        return new AjaxResult(code, msg, returnDate);
+    }
+
+    public static AjaxResult success(int code,String msg)
+    {
+        return new AjaxResult(code, msg);
+    }
+
     /**
      * 返回警告消息
      *