From 2b0dc519ddc4fefcabc7f60dcda4968964155e11 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 16:45:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java
index d1679eb..eec8bd8 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java
@@ -86,8 +86,18 @@
@ApiOperation(value = "瑙﹀彂闆朵欢", notes = "瑙﹀彂闆朵欢")
@SysLog("瑙﹀彂闆朵欢")
@PostMapping("/triggerAdd")
- public R triggerAdd(@RequestBody PartVo partVo) {
- return R.ok(partService.triggerAdd(partVo));
+ @Inner(value = false)
+ public R triggerAdd(@RequestParam String params) {
+ PartVo partVo = JSONObject.parseObject(params, PartVo.class);
+ R<Object> objectR = new R<>();
+ if(partService.triggerAdd(partVo).equals("1")){
+ objectR.setCode(1);
+ objectR.setMsg("鎿嶄綔鎴愬姛");
+ }else {
+ objectR.setCode(0);
+ objectR.setMsg("鎿嶄綔澶辫触锛佽仈绯讳汉鍛樻煡鐪嬫棩蹇楋紒");
+ }
+ return objectR;
}
--
Gitblit v1.9.3