can not scan other material

Fancy

2024-07-15 708c924017f21d789849507d386330f71a3b82b4

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java

@@ -1,5 +1,6 @@
package com.dy.pmsStation.assemblyStep;

import com.alibaba.excel.util.StringUtils;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pmsGlobal.pojoPlt.PltProductFile;
@@ -7,12 +8,15 @@
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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;

/**
 *记录组装各步骤
@@ -29,7 +33,7 @@

    @PostMapping(path = "save")
    public BaseResponse save(@RequestBody @Valid QueryVo vo) {
        log.info("AssemblyStepCtrl.save()");
        log.info("AssemblyStepCtrl.save():"+vo);
        int count = sv.save(vo);
        if (count <= 0) {
            return BaseResponseUtils.buildFail("数据库存储失败");
@@ -40,7 +44,7 @@

    @PostMapping(path = "repair")
    public BaseResponse repair(@RequestBody @Valid QueryVo vo) {
        log.info("AssemblyStepCtrl.repair()");
        log.info("AssemblyStepCtrl.repair():"+vo);
        int count = sv.repair(vo);
        if (count <= 0) {
            return BaseResponseUtils.buildFail("数据库存储失败");
@@ -55,6 +59,7 @@
     */
    @GetMapping(path="getSopByNodeId")
    public BaseResponse<PrProductionNode> getSopByNodeId(String nodeId){
        log.info("AssemblyStepCtrl.getSopByNodeId():"+nodeId);
        PrProductionNode result = sv.getSopByNodeId(nodeId);
        return BaseResponseUtils.buildSuccess(result);
    }
@@ -65,6 +70,7 @@
     */
    @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);
    }
@@ -75,18 +81,19 @@
     */
    @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()");
        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()");
        log.info("AssemblyStepCtrl.getTestItems():"+proId);
        List<PltProductTestInspectionItems> result = sv.getTestItems(proId);
        return BaseResponseUtils.buildSuccess(result);
    }
@@ -98,7 +105,7 @@
     */
    @PostMapping(path = "testing")
    public BaseResponse testing(@RequestBody @Valid QueryVo vo) {
        log.info("AssemblyStepCtrl.testing()");
        log.info("AssemblyStepCtrl.testing():"+vo);
        int count = sv.testing(vo);
        if (count <= 0) {
            return BaseResponseUtils.buildFail("数据库存储失败");
@@ -106,4 +113,29 @@
            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);
        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);
    }
}