From bf2368aba60129e66bcac80e60d22dc86ae5c1a3 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 30 七月 2024 15:11:25 +0800
Subject: [PATCH] 兼容无任务工作中的测试追溯信息
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 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 1e21a89..e6ebb1c 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
@@ -7,6 +7,7 @@
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;
@@ -44,8 +45,7 @@
}
/**
- * 娴嬭瘯鎴栧搧妫�閮借皟鐢ㄨ繖涓帴鍙�
- *
+ * 娴嬭瘯
* @param vo
* @return
*/
@@ -53,6 +53,37 @@
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);
+ }
+ }
+
+ /**
+ * 鍝佹
+ * @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 {
@@ -148,4 +179,11 @@
List<StaDeviceProductionLog> result = sv.queryLogByDeviceNo(deviceNo);
return BaseResponseUtils.buildSuccess(result);
}
+ @GetMapping(path = "queryPlanByDeviceNo")
+ public BaseResponse<PrAssemblyPlan> queryPlanByDeviceNo(String deviceNo) {
+ log.info("AssemblyStepCtrl.queryLogByDeviceNo():" + deviceNo);
+ PrAssemblyPlan result = sv.queryPlanByDeviceNo(deviceNo);
+ return BaseResponseUtils.buildSuccess(result);
+ }
+
}
--
Gitblit v1.8.0