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: '品质合格数量',