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 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 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 5bfd573..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
@@ -2,10 +2,13 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
+import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* 鐢熶骇浠诲姟璁ら鎺у埗鍣�
@@ -14,7 +17,49 @@
@RestController
@RequestMapping(path = "workOrder")
public class WorkOrderCtrl {
-
+ private WorkOrderSv sv;
+ @Autowired
+ public void setWorkOrderSv(WorkOrderSv workOrderSv) {
+ this.sv = workOrderSv;
+ }
+ /**
+ * 鏌ヨ宸ョ珯鏄惁宸茬粡琚崰鐢�
+ * @param
+ * @return
+ */
+ @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.buildSuccess(true);
+ }
+ }
+ /**
+ * 鏌ヨ鍏ㄩ儴鎵ц涓殑缁勮浠诲姟娓呭崟
+ * @param
+ * @return
+ */
+ @GetMapping(path="planList")
+ 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