From cac8b3203ddc577bc2842012923eff1fcf51f256 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 19:45:02 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99?= =?UTF-8?q?=20=E5=91=98=E5=B7=A5=E9=A2=86=E6=96=99=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E9=A2=86=E6=96=99=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=95=B0=E9=87=8F=E7=B1=BB=E5=9E=8B=E4=B8=BA?= =?UTF-8?q?Integer=EF=BC=9B=20=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E5=8F=B7=E6=9F=A5=E6=89=BE=E9=A2=86?= =?UTF-8?q?=E6=96=99=E5=8D=95service=E5=92=8Cmapper=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/domain/BaseEmpRequisiteOrderChild.java | 8 +++++--- .../ruoyi/system/mapper/BaseEmpRequisiteOrderMapper.java | 3 +++ .../system/service/IBaseEmpRequisiteOrderService.java | 3 +++ .../service/impl/BaseEmpRequisiteOrderServiceImpl.java | 6 ++++++ .../mapper/system/BaseEmpRequisiteOrderChildMapper.xml | 7 ++++++- .../mapper/system/BaseEmpRequisiteOrderMapper.xml | 5 +++++ 6 files changed, 28 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEmpRequisiteOrderChild.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEmpRequisiteOrderChild.java index 1d12bb71..c209d0ca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEmpRequisiteOrderChild.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEmpRequisiteOrderChild.java @@ -1,6 +1,8 @@ package com.ruoyi.system.domain; import java.math.BigDecimal; + +import io.swagger.models.auth.In; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -61,7 +63,7 @@ public class BaseEmpRequisiteOrderChild extends BaseEntity /** 物料的数量 */ @Excel(name = "物料的数量") - private Long materialNum; + private Integer materialNum; /** 物料的不含税单价(RMB) */ @Excel(name = "物料的不含税单价(RMB)") @@ -206,12 +208,12 @@ public class BaseEmpRequisiteOrderChild extends BaseEntity { return describe; } - public void setMaterialNum(Long materialNum) + public void setMaterialNum(Integer materialNum) { this.materialNum = materialNum; } - public Long getMaterialNum() + public Integer getMaterialNum() { return materialNum; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEmpRequisiteOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEmpRequisiteOrderMapper.java index dd5436bd..50079a85 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEmpRequisiteOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEmpRequisiteOrderMapper.java @@ -77,4 +77,7 @@ public interface BaseEmpRequisiteOrderMapper public int restoreBaseEmpRequisiteOrderById(Long requisiteId); public List selectBaseEmpRequisiteOrderByIds(String[] requisiteIds); + + /** 根据领料单号查找领料单*/ + public BaseEmpRequisiteOrder selectBaseEmpRequisiteOrderByCode(String requisitionCode); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEmpRequisiteOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEmpRequisiteOrderService.java index fcc9101e..8ffb1b9e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEmpRequisiteOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEmpRequisiteOrderService.java @@ -82,4 +82,7 @@ public interface IBaseEmpRequisiteOrderService * 审批流程启动 * */ ProcessInstance submitApply(BaseEmpRequisiteOrderVO baseEmpRequisiteOrderVO); + + /** 根据领料单号查找领料单*/ + public BaseEmpRequisiteOrder selectBaseEmpRequisiteOrderByCode(String requisitionCode); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEmpRequisiteOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEmpRequisiteOrderServiceImpl.java index f1fad461..4a7dfda4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEmpRequisiteOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEmpRequisiteOrderServiceImpl.java @@ -459,4 +459,10 @@ public class BaseEmpRequisiteOrderServiceImpl implements IBaseEmpRequisiteOrderS variables.put("authority",2); } } + + /** 根据领料单号查找领料单*/ + @Override + public BaseEmpRequisiteOrder selectBaseEmpRequisiteOrderByCode(String requisitionCode){ + return baseEmpRequisiteOrderMapper.selectBaseEmpRequisiteOrderByCode(requisitionCode); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/system/BaseEmpRequisiteOrderChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/BaseEmpRequisiteOrderChildMapper.xml index d954f3f8..615beb0c 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/BaseEmpRequisiteOrderChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/BaseEmpRequisiteOrderChildMapper.xml @@ -33,7 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select requisitioning_child_id, quote_id, material_id, material_code, photoUrl, material_name, material_type, material_model, specifications, brand, `describe`, materialNum, materialRmb, materialNoRmb, materialNoRmbSum, materialRmbSum, remark, create_by, create_time, update_by, update_time, use_status, audit_status, unit, process_method from base_emp_requisite_order_child + select requisitioning_child_id, quote_id, material_id, material_code, photoUrl, + material_name, material_type, material_model, specifications, brand, + `describe`, materialNum, materialRmb, materialNoRmb, materialNoRmbSum, + materialRmbSum, remark, create_by, create_time, update_by, update_time, + use_status, audit_status, unit, process_method + from base_emp_requisite_order_child + + where requisitie_code = #{requisitieCode} + + \ No newline at end of file