From 9f7fcb82f43ac4905623b0239d0f3ef7f4079e47 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 13 八月 2024 08:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proLine/ProLineCtrl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proLine/ProLineCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proLine/ProLineCtrl.java
index 3ea503b..5ed0602 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proLine/ProLineCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proLine/ProLineCtrl.java
@@ -48,7 +48,6 @@
}
}
-
/**
* 鏇存柊
* @param line
@@ -59,6 +58,23 @@
@Log("鏇存柊鐢熶骇绾�")
public BaseResponse<Boolean> update(@RequestBody @Valid PltProductionLine line){
int count = sv.update(line);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
+
+ /**
+ * 鍚敤\绂佺敤鐢熶骇绾�
+ * @return
+ */
+ @PostMapping(path="disabled")
+ @SsoPowerAop(power = "10300005")
+ @Log("璁剧疆鐢熶骇绾跨姸鎬�")
+ //{id: "2", disabled: true}
+ public BaseResponse<Boolean> disabled(@RequestBody PltProductionLine line){
+ int count = sv.updateStatus(line);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -82,8 +98,6 @@
return BaseResponseUtils.buildSuccess(true);
}
}
-
-
/**
* 鏍规嵁ID鏌ヨ
@@ -122,6 +136,5 @@
return BaseResponseUtils.buildSuccess(list);
}
-
}
--
Gitblit v1.8.0