From d7e416ca3ef54e449cd54feb3577d5199d8f6ade Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期五, 21 六月 2024 10:50:32 +0800
Subject: [PATCH] plan add note
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
index 4991de4..d2bfa5e 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
@@ -27,13 +27,13 @@
* @param
* @return
*/
- @GetMapping(path="isStationUsed")
- public BaseResponse<Boolean> isStationUsed(StaAssemblyWorkLast last){
- String message = sv.isStationUsed(last);
- if ("".equals(message)) {
- return BaseResponseUtils.buildSuccess(true);
+ @GetMapping(path="checkStationUsed")
+ public BaseResponse<Boolean> isStationUsed(QueryVo last){
+ String message = sv.checkStationUsed(last);
+ if ("FALSE".equals(message.split("\\^")[0])) {
+ return BaseResponseUtils.buildFail(message.split("\\^")[1]);
} else {
- return BaseResponseUtils.buildFail(message);
+ return BaseResponseUtils.buildSuccess(true);
}
}
/**
@@ -42,14 +42,24 @@
* @return
*/
@GetMapping(path="planList")
- public BaseResponse<List<PrAssemblyPlan>> selectOnLineList(){
+ public BaseResponse<List<PrAssemblyPlan>> selectAssyPlanList(){
+ PrAssemblyPlan params = new PrAssemblyPlan();
+ params.setStatus(1);
+ List<PrAssemblyPlan> list = sv.selectAssyPlanList(params);
+ return BaseResponseUtils.buildSuccess(list);
+ }
+ /**
+ * 鏍规嵁缁勮浠诲姟鏌ヨ鑺傜偣淇℃伅
+ * @param
+ * @return
+ */
+ /* @GetMapping(path="nodeList")
+ public BaseResponse<List<PrAssemblyPlan>> selectOnLineList(String processId){
PrAssemblyPlan params = new PrAssemblyPlan();
params.setStatus(1);
List<PrAssemblyPlan> list = sv.selectList(params);
return BaseResponseUtils.buildSuccess(list);
- }
-
-
+ }*/
@GetMapping(path = "test")
public BaseResponse test() {
log.info("test");
--
Gitblit v1.8.0