diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index 7499122..2f05762 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -72,6 +72,7 @@ public class PdaServiceImp implements PdaService { mydoJob.setExitId(trayCodeMakeSure.getExitId()); mydoJob.setProductId(productId); mydoJob.setStatus("3"); + List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByExit(mydoJob); return AjaxResult.success(mydoJobDetails); } diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml index 9227691..69baa76 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml @@ -370,6 +370,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join mydo_job mj on mjd.job_id = mj.job_id where mj.exit_id=#{exitId} and mj.status='3' + and mj.execution_phase=2 and mjd.product_id=#{productId} and mj.in_or_out>=20