From cd48f9f899a57aea77a137f37ea5e6bc761afef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Wed, 25 Dec 2024 14:16:11 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=A7=94=E5=A4=96=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=20=E5=A7=94=E5=A4=96=E9=A2=86=E6=96=99=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=A7=94=E5=A4=96=E9=A2=86=E6=96=99=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=A7=94=E5=A4=96=E9=A2=86=E6=96=99?= =?UTF-8?q?=E5=8D=95service=E5=92=8Cmapper=E6=96=B9=E6=B3=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/mapper/OutsourceRequisitionMapper.java | 6 ++++++ .../system/service/IOutsourceRequisitionService.java | 5 +++++ .../service/impl/OutsourceRequisitionServiceImpl.java | 8 ++++++++ .../mapper/system/OutsourceRequisitionMapper.xml | 6 ++++++ 4 files changed, 25 insertions(+) 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