From f85a779384ecb8c45a575c7dbbad9fcb43cb1d7a Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 20 Jun 2024 09:38:46 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E3=80=81=E5=A7=94=E5=86=85?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=20=E5=A7=94=E5=86=85=E5=85=A5=E5=BA=93=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=A1=A8=20=E6=96=B0=E5=A2=9E=20=E5=A7=94=E5=86=85?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=B4=B9=E6=80=BB=E4=BB=B7=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20=20=E5=A7=94=E5=86=85=E5=85=A5=E5=BA=93=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E6=96=B0=E5=A2=9E=E6=88=90=E5=91=98=E5=8F=98?= =?UTF-8?q?=E9=87=8F=20=20mapper.xml=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=90=8E=E7=AB=AF=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=AF=AD=E5=8F=A5=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BF=AE=E6=94=B9=E8=AF=AD=E5=8F=A5=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E7=AB=AF=E6=8F=92=E5=85=A5=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/erp/domain/ErpInboundOrder.java | 14 +++++++++++++- .../resources/mapper/erp/ErpInboundOrderMapper.xml | 8 +++++++- .../templates/erp/inboundOrder/inboundOrder.html | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrder.java index bbafea3a..94565d3d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrder.java @@ -5,6 +5,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; import java.util.List; /** @@ -95,7 +96,9 @@ public class ErpInboundOrder extends BaseEntity @Excel(name = "入库数量") private Long storageNum; - + /** 委内加工费总价 */ + @Excel(name = "委内加工费总价") + private BigDecimal processingFeeTotal; private List inboundDetails; public void setId(Long id) @@ -279,6 +282,14 @@ public class ErpInboundOrder extends BaseEntity return storageNum; } + public BigDecimal getProcessingFeeTotal() { + return processingFeeTotal; + } + + public void setProcessingFeeTotal(BigDecimal processingFeeTotal) { + this.processingFeeTotal = processingFeeTotal; + } + public List getInboundDetails() { return inboundDetails; } @@ -315,6 +326,7 @@ public class ErpInboundOrder extends BaseEntity .append("qualityQualifiedNum", getQualityQualifiedNum()) .append("qualityUnqualifiedNum", getQualityUnqualifiedNum()) .append("storageNum", getStorageNum()) + .append("processingFeeTotal", getProcessingFeeTotal()) .append("inboundDetails",getInboundDetails()) .toString(); } diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderMapper.xml index ff86128b..862e5f59 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderMapper.xml @@ -30,6 +30,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -58,7 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.num_total, a.quality_qualified_num, a.quality_unqualified_num, - a.storage_num + a.storage_num, + a.processing_fee_total from erp_inbound_order a @@ -107,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quality_qualified_num, quality_unqualified_num, storage_num, + processing_fee_total, #{delFlag}, @@ -133,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{qualityQualifiedNum}, #{qualityUnqualifiedNum}, #{storageNum}, + #{processingFeeTotal}, @@ -163,6 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quality_qualified_num = #{qualityQualifiedNum}, quality_unqualified_num = #{qualityUnqualifiedNum}, storage_num = #{storageNum}, + processing_fee_total = #{processingFeeTotal}, where id = #{id} diff --git a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html index 068f1812..314cbcc7 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html +++ b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html @@ -175,7 +175,7 @@ }, { title: '委内加工费总价', - field: 'numTotal', + field: 'processingFeeTotal', }, { title: '品质合格数量',