diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceRequisitionMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceRequisitionMapper.java index 45523a47..68877d98 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceRequisitionMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceRequisitionMapper.java @@ -104,4 +104,10 @@ public interface OutsourceRequisitionMapper public int insertOutsourceRequisitionDetail(OutsourceRequisitionDetail outsourceRequisitionDetail); public int updateOutsourceRequisitionDetail(OutsourceRequisitionDetail outsourceRequisitionDetail); + + /** + * 根据委外领料单号查询委外领料 + */ + public OutsourceRequisition selectOutsourceRequisitionByNo(String requisitionNo); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceRequisitionService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceRequisitionService.java index a0d549ea..ca228a83 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceRequisitionService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceRequisitionService.java @@ -83,4 +83,9 @@ public interface IOutsourceRequisitionService //审批拒绝后更新领料单详情和库存信息 int updateUnApprovedInfo(OutsourceRequisitionVO outsourceRequisitionVO); + + /** + * 根据委外领料单号查询委外领料 + */ + public OutsourceRequisition selectOutsourceRequisitionByNo(String requisitionNo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceRequisitionServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceRequisitionServiceImpl.java index f3563d06..272ecff9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceRequisitionServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceRequisitionServiceImpl.java @@ -13,6 +13,7 @@ import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.process.general.service.IProcessService; import com.ruoyi.process.todoitem.mapper.BizTodoItemMapper; +import com.ruoyi.system.domain.OutsourceRequisition; import com.ruoyi.system.domain.OutsourceRequisitionDetail; import com.ruoyi.system.domain.Vo.OutsourceRequisitionVO; import com.ruoyi.system.mapper.OutsourceRequisitionMapper; @@ -563,4 +564,11 @@ public class OutsourceRequisitionServiceImpl implements IOutsourceRequisitionSer return updateResult; } + /** + * 根据委外领料单号查询委外领料 + */ + @Override + public OutsourceRequisition selectOutsourceRequisitionByNo(String requisitionNo){ + return outsourceRequisitionMapper.selectOutsourceRequisitionByNo(requisitionNo); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/system/OutsourceRequisitionMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/OutsourceRequisitionMapper.xml index 4ecb9547..d4d7d2ff 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/OutsourceRequisitionMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/OutsourceRequisitionMapper.xml @@ -109,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and outsource_requisition_no = #{outsourceRequisitionNo} and outsource_order_no = #{outsourceOrderNo} and parent_id = #{parentId} + and `level` = #{level} and plan_detail_id = #{planDetailId} @@ -345,4 +346,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where outsource_requisition_detail_id = #{outsourceRequisitionDetailId} + + \ No newline at end of file