diff --git a/oms_web/oms_vue/src/views/base/quotation/index.vue b/oms_web/oms_vue/src/views/base/quotation/index.vue index 462c3365..2428bb84 100644 --- a/oms_web/oms_vue/src/views/base/quotation/index.vue +++ b/oms_web/oms_vue/src/views/base/quotation/index.vue @@ -295,6 +295,8 @@ export default { quotationStatus: null, createTimeStart: null, createTimeEnd: null, + isAsc : 'desc', + orderByColumn : 'createTime', }, // 表单参数 form: { diff --git a/oms_web/oms_vue/src/views/base/quotation/selectQuotation.vue b/oms_web/oms_vue/src/views/base/quotation/selectQuotation.vue index 68449e29..14c68c3a 100644 --- a/oms_web/oms_vue/src/views/base/quotation/selectQuotation.vue +++ b/oms_web/oms_vue/src/views/base/quotation/selectQuotation.vue @@ -76,7 +76,7 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - createBy: this.createBy, + // createBy: this.createBy, quotationCode: null, quotationName: null, orderByColumn: 'createTime', @@ -87,7 +87,7 @@ export default { watch: { visible(val) { if (val) { - this.queryParams.createBy = this.createBy||"-1"; + // this.queryParams.createBy = this.createBy||"-1"; this.getList(); } }, diff --git a/oms_web/oms_vue/src/views/base/vendor/index.vue b/oms_web/oms_vue/src/views/base/vendor/index.vue index b2a1686f..9496f99a 100644 --- a/oms_web/oms_vue/src/views/base/vendor/index.vue +++ b/oms_web/oms_vue/src/views/base/vendor/index.vue @@ -330,6 +330,8 @@ export default { vendorAddress: null, vendorUser: null, vendorStatus: null, + isAsc : 'desc', + orderByColumn : 'createTime', }, // 表单参数 form: { diff --git a/oms_web/oms_vue/src/views/inventory/delivery/index.vue b/oms_web/oms_vue/src/views/inventory/delivery/index.vue index c573ee20..ec0c0943 100644 --- a/oms_web/oms_vue/src/views/inventory/delivery/index.vue +++ b/oms_web/oms_vue/src/views/inventory/delivery/index.vue @@ -169,6 +169,8 @@ export default { orderCode: null, projectName: null, deliveryType: null, + isAsc : 'desc', + orderByColumn : 'createTime', }, // 表单参数 form: {}, diff --git a/oms_web/oms_vue/src/views/inventory/outer/index.vue b/oms_web/oms_vue/src/views/inventory/outer/index.vue index 38a7d7e6..9292ebe4 100644 --- a/oms_web/oms_vue/src/views/inventory/outer/index.vue +++ b/oms_web/oms_vue/src/views/inventory/outer/index.vue @@ -102,6 +102,8 @@ export default { orderCode: undefined, projectName: undefined, deliveryStatus: undefined, + isAsc : 'desc', + orderByColumn : 'createTime', }, }; }, diff --git a/oms_web/oms_vue/src/views/project/info/index.vue b/oms_web/oms_vue/src/views/project/info/index.vue index 2eec36d9..84e1aa4e 100644 --- a/oms_web/oms_vue/src/views/project/info/index.vue +++ b/oms_web/oms_vue/src/views/project/info/index.vue @@ -344,6 +344,8 @@ export default { estimatedOrderTimeEnd: null, lastWorkUpdateTimeStart: null, lastWorkUpdateTimeEnd: null, + isAsc : 'desc', + orderByColumn : 'createTime', }, dateRange: [], }; diff --git a/oms_web/oms_vue/src/views/project/order/index.vue b/oms_web/oms_vue/src/views/project/order/index.vue index fe16834e..8a7aca6e 100644 --- a/oms_web/oms_vue/src/views/project/order/index.vue +++ b/oms_web/oms_vue/src/views/project/order/index.vue @@ -27,6 +27,12 @@ + + + + + + @@ -195,6 +201,8 @@ export default { agentName: null, dutyName: null, partnerName: null, + productCode: null, + productModel: null, timeType: 'deliveryTime', params: {}, orderByColumn:'createTime', diff --git a/oms_web/oms_vue/src/views/system/agent/index.vue b/oms_web/oms_vue/src/views/system/agent/index.vue index 7a082bcc..871f29c8 100644 --- a/oms_web/oms_vue/src/views/system/agent/index.vue +++ b/oms_web/oms_vue/src/views/system/agent/index.vue @@ -221,7 +221,9 @@ export default { agentCode: null, agentName: null, province: null, - city: null + city: null, + isAsc : 'desc', + orderByColumn : 'createAt', }, // 省份选项 provinceOptions: [], diff --git a/oms_web/oms_vue/src/views/system/customer/index.vue b/oms_web/oms_vue/src/views/system/customer/index.vue index 32f31a9d..f7b59377 100644 --- a/oms_web/oms_vue/src/views/system/customer/index.vue +++ b/oms_web/oms_vue/src/views/system/customer/index.vue @@ -287,7 +287,9 @@ export default { province: null, city: null, bgProperty: null, - industryType: null + industryType: null, + isAsc : 'desc', + orderByColumn : 'createAt', }, // 省份选项 provinceOptions: [], diff --git a/oms_web/oms_vue/src/views/system/partner/index.vue b/oms_web/oms_vue/src/views/system/partner/index.vue index 6f2008df..47f26077 100644 --- a/oms_web/oms_vue/src/views/system/partner/index.vue +++ b/oms_web/oms_vue/src/views/system/partner/index.vue @@ -305,6 +305,8 @@ export default { level: null, province: null, city: null, + isAsc : 'desc', + orderByColumn : 'createTime', }, // 省份选项 provinceOptions: [], diff --git a/oms_web/oms_vue/src/views/system/product/index.vue b/oms_web/oms_vue/src/views/system/product/index.vue index 4236fecf..b955912d 100644 --- a/oms_web/oms_vue/src/views/system/product/index.vue +++ b/oms_web/oms_vue/src/views/system/product/index.vue @@ -236,6 +236,8 @@ export default { productName: null, model: null, vendorName: null, + isAsc : 'desc', + orderByColumn : 'createTime', }, // 表单参数 form: {}, diff --git a/oms_web/oms_vue/src/views/warehouse/info/index.vue b/oms_web/oms_vue/src/views/warehouse/info/index.vue index 04ac5f0e..1c010453 100644 --- a/oms_web/oms_vue/src/views/warehouse/info/index.vue +++ b/oms_web/oms_vue/src/views/warehouse/info/index.vue @@ -237,6 +237,8 @@ export default { managerName: null, managerPhone: null, managerEmail: null, + isAsc : 'desc', + orderByColumn : 'createTime', }, // 表单参数 form: {}, diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/QuotationProductInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/QuotationProductInfo.java index e5c43937..8b7ef37b 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/QuotationProductInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/QuotationProductInfo.java @@ -4,6 +4,8 @@ package com.ruoyi.sip.domain; import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; +import java.math.BigDecimal; + /** * 项目产品信息(QuotationProductInfo)实体类 @@ -34,31 +36,31 @@ public class QuotationProductInfo extends BaseEntity { /** * 产品数量 */ - private Double quantity; + private BigDecimal quantity; /** * 目录单价 */ - private Double cataloguePrice; + private BigDecimal cataloguePrice; /** * 目录总价 */ - private Double catalogueAllPrice; + private BigDecimal catalogueAllPrice; /** * 单价 */ - private Double price; + private BigDecimal price; /** * 总价 */ - private Double allPrice; + private BigDecimal allPrice; /** * 指导折扣 */ - private Double guidanceDiscount; + private BigDecimal guidanceDiscount; /** * 折扣 */ - private Double discount; + private BigDecimal discount; /** * 备注 */ @@ -66,7 +68,7 @@ public class QuotationProductInfo extends BaseEntity { /** * 税率 */ - private Double taxRate; + private BigDecimal taxRate; /** * 配置器id */ diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/QuotationServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/QuotationServiceImpl.java index 790fcf5a..cca58a3d 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/QuotationServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/QuotationServiceImpl.java @@ -32,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.io.InputStream; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.*; @@ -238,7 +239,7 @@ public class QuotationServiceImpl implements IQuotationService { // 2. 第二部分：列标题 List headers = Arrays.asList( "序号", "产品编码", "产品型号", "产品代码描述", "数量", - "目录单价(RMB)", "推荐折扣", "折扣单价(RMB)", "总价(RMB)", + "目录单价(RMB)", "推荐折扣(%)","折扣(%)", "单价(RMB)", "总价(RMB)", "目录总价(RMB)", "CID信息", "备注" ); // 记录列标题行索引 @@ -452,8 +453,8 @@ public class QuotationServiceImpl implements IQuotationService { - double sumAllPrice = 0.0; - double sumCatalogueAllPrice = 0.0; + BigDecimal sumAllPrice = BigDecimal.ZERO; + BigDecimal sumCatalogueAllPrice = BigDecimal.ZERO; // 添加数据行 int index = 1; @@ -465,7 +466,8 @@ public class QuotationServiceImpl implements IQuotationService { row.add(item.getProductDesc()); row.add(item.getQuantity()); row.add(item.getCataloguePrice()); - row.add(item.getGuidanceDiscount()); + row.add(item.getGuidanceDiscount()==null?"":item.getGuidanceDiscount().multiply(new BigDecimal("100"))); + row.add(item.getDiscount()==null?"":item.getDiscount().multiply(new BigDecimal("100"))); row.add(item.getPrice()); row.add(item.getAllPrice()); row.add(item.getCatalogueAllPrice()); @@ -474,10 +476,10 @@ public class QuotationServiceImpl implements IQuotationService { rows.add(row); if (item.getAllPrice() != null) { - sumAllPrice += item.getAllPrice(); + sumAllPrice = sumAllPrice.add(item.getAllPrice()); } if (item.getCatalogueAllPrice() != null) { - sumCatalogueAllPrice += item.getCatalogueAllPrice(); + sumCatalogueAllPrice =sumCatalogueAllPrice.add(item.getCatalogueAllPrice()); } }