From c6b519695e8d0190182da679e6bbb5397c524f67 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 01 八月 2024 14:52:35 +0800
Subject: [PATCH] repair

---
 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java |   64 ++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 16 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 0e775ba..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
@@ -25,6 +25,7 @@
 @Slf4j
 @RestController
 @RequestMapping(path = "assemblyStep")
+@SuppressWarnings("unchecked")
 public class AssemblyStepCtrl {
     private AssemblyStepSv sv;
 
@@ -34,8 +35,8 @@
     }
 
     @PostMapping(path = "save")
-    public BaseResponse save(@RequestBody @Valid QueryVo vo) {
-        log.info("AssemblyStepCtrl.save():" + vo);
+    public BaseResponse<Boolean> save(@RequestBody @Valid QueryVo vo) {
+        log.info("AssemblyStepCtrl.save():{}", vo);
         int count = sv.save(vo);
         if (count <= 0) {
             return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
@@ -45,13 +46,13 @@
     }
 
     /**
-     * 娴嬭瘯鎴栧搧妫�閮借皟鐢ㄨ繖涓帴鍙�
+     * 娴嬭瘯
      * @param vo
      * @return
      */
     @PostMapping(path = "testing")
-    public BaseResponse testing(@RequestBody @Valid QueryVo vo) {
-        log.info("AssemblyStepCtrl.testing():" + vo);
+    public BaseResponse<Boolean> testing(@RequestBody @Valid QueryVo vo) {
+        log.info("AssemblyStepCtrl.testing():{}", vo);
         int count = sv.testing(vo);
         if (count <= 0) {
             return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
@@ -60,9 +61,40 @@
         }
     }
 
+    /**
+     * 鍝佹
+     * @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 repair(@RequestBody @Valid QueryVo vo) {
-        log.info("AssemblyStepCtrl.repair():" + vo);
+    public BaseResponse<Boolean> repair(@RequestBody @Valid QueryVo vo) {
+        log.info("AssemblyStepCtrl.repair():{}" ,vo);
         int count = sv.repair(vo);
         if (count <= 0) {
             return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
@@ -79,7 +111,7 @@
      */
     @GetMapping(path = "getSopByNodeId")
     public BaseResponse<PrProductionNode> getSopByNodeId(String nodeId) {
-        log.info("AssemblyStepCtrl.getSopByNodeId():" + nodeId);
+        log.info("AssemblyStepCtrl.getSopByNodeId():{}", nodeId);
         PrProductionNode result = sv.getSopByNodeId(nodeId);
         return BaseResponseUtils.buildSuccess(result);
     }
@@ -92,7 +124,7 @@
      */
     @GetMapping(path = "getParamsByProId")
     public BaseResponse<List<PltProductParams>> getParamsByProId(String proId) {
-        log.info("AssemblyStepCtrl.getParamsByProId():" + proId);
+        log.info("AssemblyStepCtrl.getParamsByProId():{}", proId);
         List<PltProductParams> result = sv.getParamsByProId(proId);
         return BaseResponseUtils.buildSuccess(result);
     }
@@ -105,28 +137,28 @@
      */
     @GetMapping(path = "getFileByProId")
     public BaseResponse<List<PltProductFile>> getFileByProId(String proId) {
-        log.info("AssemblyStepCtrl.getFileByProId():" + 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);
+        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);
+        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);
+        log.info("AssemblyStepCtrl.queryByDeviceNo():{}", deviceNo);
         Map<String, String> result = sv.queryByDeviceNo(deviceNo, null);
         if (StringUtils.isBlank(result.get("proName"))) {
             return BaseResponseUtils.buildFail("璇ョ紪鐮�(" + deviceNo + ")涓嶆槸涓昏鐗╂枡(绯荤粺涓鎺х殑鍏朵粬璁惧)");
@@ -137,20 +169,20 @@
 
     @GetMapping(path = "queryLifeByDeviceNo")
     public BaseResponse<?> queryLifeByDeviceNo(String deviceNo) {
-        log.info("AssemblyStepCtrl.queryLifeByDeviceNo():" + 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);
+        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.queryLogByDeviceNo():" + deviceNo);
+        log.info("AssemblyStepCtrl.queryPlanByDeviceNo():{}", deviceNo);
         PrAssemblyPlan result = sv.queryPlanByDeviceNo(deviceNo);
         return BaseResponseUtils.buildSuccess(result);
     }

--
Gitblit v1.8.0