From 279a149dd1ff4ef7a7a9353469532332d3fdcb5f Mon Sep 17 00:00:00 2001 From: Fancy <Fancy.fx@outlook.com> Date: 星期四, 20 六月 2024 14:28:35 +0800 Subject: [PATCH] check user and station relation --- pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java | 41 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 38 insertions(+), 3 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..eecee9a 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,6 +17,38 @@ @RestController @RequestMapping(path = "workOrder") public class WorkOrderCtrl { + private WorkOrderSv sv; + @Autowired + public void setWorkOrderSv(WorkOrderSv workOrderSv) { + this.sv = workOrderSv; + } + /** + * 鏌ヨ宸ョ珯鏄惁宸茬粡琚崰鐢� + * @param + * @return + */ + @GetMapping(path="isStationUsed") + public BaseResponse<Boolean> isStationUsed(StaAssemblyWorkLast last){ + String message = sv.checkStationIsUsed(last); + if ("OK".equals(message.split("^")[0])) { + return BaseResponseUtils.buildSuccess(true); + } else { + return BaseResponseUtils.buildFail(message); + } + } + /** + * 鏌ヨ鍏ㄩ儴鎵ц涓殑缁勮浠诲姟娓呭崟 + * @param + * @return + */ + @GetMapping(path="planList") + public BaseResponse<List<PrAssemblyPlan>> selectOnLineList(){ + PrAssemblyPlan params = new PrAssemblyPlan(); + params.setStatus(1); + List<PrAssemblyPlan> list = sv.selectList(params); + return BaseResponseUtils.buildSuccess(list); + } + @GetMapping(path = "test") public BaseResponse test() { -- Gitblit v1.8.0