Fancy
2024-11-01 4a35dea2b0976e7fdb0e2b1a0d7d9b8ac2af0fe4
get product
2个文件已修改
25 ■■■■■ 已修改文件
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java
@@ -1,12 +1,11 @@
package com.dy.pmsStation.assemblyStep;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.dy.common.aop.SsoPowerAop;
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.aop.Log;
import com.dy.pmsGlobal.pojoPlt.*;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
import com.dy.pmsGlobal.pojoSta.StaDeviceLife;
@@ -189,9 +188,14 @@
    }
    //自动化测试   根据产品ID查出全部指令
    @GetMapping(path = "getCommand")
    public BaseResponse<TstCommand> getCommand(String proId) {
        log.info("AssemblyStepCtrl.getCommand():{}", proId);
        List<TstCommand> result = sv.getCommand(proId);
    public BaseResponse<TstCommand> getCommand(String proId, int type) {
        log.info("AssemblyStepCtrl.getCommand():{}", proId + " " + type);
        List<TstCommand> result = sv.getCommand(proId,type);
        return BaseResponseUtils.buildSuccess(result);
    }
    @GetMapping(path="all")
    public BaseResponse<List<PltProduct>> all(){
        QueryVo vo = new QueryVo();
        return BaseResponseUtils.buildSuccess(sv.selectAll(vo));
    }
}
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
@@ -631,9 +631,14 @@
        bill.orgName = file.orgName;
        bill.extName = file.extName;
    }
    public List<TstCommand> getCommand(String proId) {
    public List<TstCommand> getCommand(String proId, int type) {
        Map<String, Object> params = new HashMap<>();
        params.put("proId", proId);
        params.put("type", type);
        return tstCommandDao.selectSome(params);
    }
    public List<PltProduct> selectAll(QueryVo queryVo) {
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
        return productDao.selectAll(params);
    }
}