From d3bb6745eb1da8f8c244f9393209e048395867f6 Mon Sep 17 00:00:00 2001 From: Fancy <Fancy.fx@outlook.com> Date: 星期三, 10 七月 2024 17:14:00 +0800 Subject: [PATCH] add a inputtime and outputtime --- pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java | 126 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 2 deletions(-) diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java index 353bbd1..a8a4cb7 100644 --- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java +++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java @@ -1,8 +1,21 @@ package com.dy.pmsStation.assemblyStep; +import com.dy.common.webUtil.BaseResponse; +import com.dy.common.webUtil.BaseResponseUtils; +import com.dy.pmsGlobal.pojoPlt.PltProductFile; +import com.dy.pmsGlobal.pojoPlt.PltProductParams; +import com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems; +import com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems; +import com.dy.pmsGlobal.pojoPr.PrProductionNode; +import com.dy.pmsGlobal.pojoSta.StaDeviceLife; +import com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog; +import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; -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; +import java.util.Map; /** *璁板綍缁勮鍚勬楠� @@ -11,4 +24,113 @@ @RestController @RequestMapping(path = "assemblyStep") public class AssemblyStepCtrl { + private AssemblyStepSv sv; + @Autowired + public void setSv(AssemblyStepSv sv) { + this.sv = sv; + } + + @PostMapping(path = "save") + public BaseResponse save(@RequestBody @Valid QueryVo vo) { + log.info("AssemblyStepCtrl.save():"+vo); + int count = sv.save(vo); + if (count <= 0) { + return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�"); + } else { + return BaseResponseUtils.buildSuccess(true); + } + } + + @PostMapping(path = "repair") + public BaseResponse repair(@RequestBody @Valid QueryVo vo) { + log.info("AssemblyStepCtrl.repair():"+vo); + int count = sv.repair(vo); + if (count <= 0) { + return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�"); + } else { + return BaseResponseUtils.buildSuccess(true); + } + } + /** + * 鏍规嵁鑺傜偣鐨勬煡鍑鸿妭鐐逛綔涓氭寚瀵间功 + * @param + * @return + */ + @GetMapping(path="getSopByNodeId") + public BaseResponse<PrProductionNode> getSopByNodeId(String nodeId){ + log.info("AssemblyStepCtrl.getSopByNodeId():"+nodeId); + PrProductionNode result = sv.getSopByNodeId(nodeId); + return BaseResponseUtils.buildSuccess(result); + } + /** + * 鏍规嵁浜у搧鏌ュ嚭 涓昏鎶�鏈弬鏁� + * @param + * @return + */ + @GetMapping(path="getParamsByProId") + public BaseResponse<List<PltProductParams>> getParamsByProId(String proId){ + log.info("AssemblyStepCtrl.getParamsByProId():"+proId); + List<PltProductParams> result = sv.getParamsByProId(proId); + return BaseResponseUtils.buildSuccess(result); + } + /** + * 鏍规嵁浜у搧鏌ュ嚭浜у搧鏂囦欢 涓昏鎶�鏈弬鏁� + * @param + * @return + */ + @GetMapping(path="getFileByProId") + public BaseResponse<List<PltProductFile>> getFileByProId(String proId){ + log.info("AssemblyStepCtrl.getFileByProId():"+proId); + List<PltProductFile> result = sv.getFileByProId(proId); + return BaseResponseUtils.buildSuccess(result); + } + @GetMapping(path = "getQualityItems") + public BaseResponse<List<PltProductQualityInspectionItems>> getQualityItems(String proId) { + log.info("AssemblyStepCtrl.getQualityItems():"+proId); + List<PltProductQualityInspectionItems> result = sv.getQualityItems(proId); + return BaseResponseUtils.buildSuccess(result); + } + @GetMapping(path = "getTestItems") + public BaseResponse<List<PltProductTestInspectionItems>> getTestItems(String proId) { + log.info("AssemblyStepCtrl.getTestItems():"+proId); + List<PltProductTestInspectionItems> result = sv.getTestItems(proId); + return BaseResponseUtils.buildSuccess(result); + } + + /** + * 娴嬭瘯鎴栧搧妫�閮借皟鐢ㄨ繖涓帴鍙� + * @param vo + * @return + */ + @PostMapping(path = "testing") + public BaseResponse testing(@RequestBody @Valid QueryVo vo) { + log.info("AssemblyStepCtrl.testing():"+vo); + int count = sv.testing(vo); + if (count <= 0) { + return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�"); + } else { + return BaseResponseUtils.buildSuccess(true); + } + } + + @GetMapping(path = "queryByDeviceNo") + public BaseResponse<Map<String,String>> queryByDeviceNo(String deviceNo) { + log.info("AssemblyStepCtrl.queryByDeviceNo():"+deviceNo); + Map<String,String> result = sv.queryByDeviceNo(deviceNo); + return BaseResponseUtils.buildSuccess(result); + } + + @GetMapping(path = "queryLifeByDeviceNo") + public BaseResponse<?> queryLifeByDeviceNo(String deviceNo) { + log.info("AssemblyStepCtrl.queryLifeByDeviceNo():"+deviceNo); + List<StaDeviceLife> result = sv.queryLifeByDeviceNo(deviceNo); + return BaseResponseUtils.buildSuccess(result); + } + + @GetMapping(path = "queryLogByDeviceNo") + public BaseResponse<?> queryLogByDeviceNo(String deviceNo) { + log.info("AssemblyStepCtrl.queryLogByDeviceNo():"+deviceNo); + List<StaDeviceProductionLog> result = sv.queryLogByDeviceNo(deviceNo); + return BaseResponseUtils.buildSuccess(result); + } } -- Gitblit v1.8.0