From 3083fccba0a65d78702f201222f4072c907b5d07 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 15 八月 2024 17:07:51 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java | 172 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 143 insertions(+), 29 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 1c86103..689638f 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,32 +1,42 @@
package com.dy.pmsStation.assemblyStep;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
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.PrAssemblyPlan;
+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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
/**
- *璁板綍缁勮鍚勬楠�
+ * 璁板綍缁勮鍚勬楠�
*/
@Slf4j
@RestController
@RequestMapping(path = "assemblyStep")
+@SuppressWarnings("unchecked")
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()");
+ public BaseResponse<Boolean> save(@RequestBody @Valid QueryVo vo) {
+ log.info("AssemblyStepCtrl.save():{}", vo);
int count = sv.save(vo);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
@@ -35,37 +45,14 @@
}
}
- @PostMapping(path = "repair")
- public BaseResponse repair(@RequestBody @Valid QueryVo vo) {
- log.info("AssemblyStepCtrl.repair()");
- int count = sv.repair(vo);
- if (count <= 0) {
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
- } else {
- return BaseResponseUtils.buildSuccess(true);
- }
- }
- @GetMapping(path = "getQualityItems")
- public BaseResponse<List<PltProductQualityInspectionItems>> getQualityItems(String proId) {
- log.info("AssemblyStepCtrl.getQualityItems()");
- List<PltProductQualityInspectionItems> result = sv.getQualityItems(proId);
- return BaseResponseUtils.buildSuccess(result);
- }
- @GetMapping(path = "getTestItems")
- public BaseResponse<List<PltProductTestInspectionItems>> getTestItems(String proId) {
- log.info("AssemblyStepCtrl.getTestItems()");
- 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()");
+ public BaseResponse<Boolean> testing(@RequestBody @Valid QueryVo vo) {
+ log.info("AssemblyStepCtrl.testing():{}", vo);
int count = sv.testing(vo);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
@@ -73,4 +60,131 @@
return BaseResponseUtils.buildSuccess(true);
}
}
+
+ /**
+ * 鍝佹
+ * @param vo
+ * @return
+ */
+ @PostMapping(path = "inspectQuality")
+ public BaseResponse<Boolean> inspectQuality(@RequestBody @Valid QueryVo vo) {
+ log.info("AssemblyStepCtrl.inspectQuality():{}", vo);
+ int count = sv.inspectQuality(vo);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
+ /**
+ * 鏃犱换鍔″伐浣滀腑鐨勫叾浠栭〉闈�
+ * @param vo
+ * @return
+ */
+ @PostMapping(path = "otherWork")
+ public BaseResponse<Boolean> otherWork(@RequestBody @Valid QueryVo vo) {
+ log.info("AssemblyStepCtrl.otherWork():{}", vo);
+ int count = sv.otherWork(vo);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
+
+ @PostMapping(path = "repair")
+ public BaseResponse<Boolean> 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);
+ }
+
+ @GetMapping(path = "queryByDeviceNo")
+ public BaseResponse<Map<String, String>> queryByDeviceNo(String deviceNo) {
+ log.info("AssemblyStepCtrl.queryByDeviceNo():{}", deviceNo);
+ Map<String, String> result = sv.queryByDeviceNo(deviceNo, null);
+ if (StringUtils.isBlank(result.get("proName"))) {
+ return BaseResponseUtils.buildFail("璇ョ紪鐮�(" + deviceNo + ")涓嶆槸涓昏鐗╂枡(绯荤粺涓鎺х殑鍏朵粬璁惧)");
+ } else {
+ 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);
+ }
+ @GetMapping(path = "queryPlanByDeviceNo")
+ public BaseResponse<PrAssemblyPlan> queryPlanByDeviceNo(String deviceNo) {
+ log.info("AssemblyStepCtrl.queryPlanByDeviceNo():{}", deviceNo);
+ PrAssemblyPlan result = sv.queryPlanByDeviceNo(deviceNo);
+ return BaseResponseUtils.buildSuccess(result);
+ }
+
}
--
Gitblit v1.8.0