root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[feat]销售管理 

客户基本信息创建时间加上时间类型转换
客户报价实体类和子表实体类处理关键和没用字段的@Excel注解
新增导出客户报价主表和子表的数据的实体类
修改客户报价的导出方法，现在导出的数据由一条主表对应一条子表组成
客户报价新增 导出客户报价明细方法
修改 根据供应商编码数组查询客户报价信息集合方法的返回值
客户报价子表新增 根据客户报价编码查询供应商报价子表方法
dev
liuxiaoxu 2 months ago
parent
46dbb763b9
commit
52dfb72782
11 changed files with 403 additions and 129 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java
  2. 2
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java
  3. 19
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java
  4. 79
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java
  5. 167
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/ExportCustomerQuoteDetailVo.java
  6. 5
      ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerQuoteChildMapper.java
  7. 2
      ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerQuoteMapper.java
  8. 8
      ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteService.java
  9. 72
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java
  10. 12
      ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml
  11. 146
      ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html

20
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java
View File

@ -16,6 +16,7 @@ import com.ruoyi.erp.domain.ErpMaterialVo;
import com.ruoyi.process.general.service.IProcessService;
import com.ruoyi.remind.service.RemindService;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.domain.Vo.ExportCustomerQuoteDetailVo;
import com.ruoyi.system.domain.exportDto.SysCustomerDto;
import com.ruoyi.system.mapper.SysCustomerQuoteChildMapper;
import com.ruoyi.system.service.*;
@ -39,10 +40,8 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
@ -382,13 +381,16 @@ public class SysCustomerQuoteController extends BaseController
{
if (StringUtils.isEmpty(ids)){
List<SysCustomerQuoteVo> list = sysCustomerQuoteService.exportSysCustomerQuoteList(sysCustomerQuoteVo);
ExcelUtil<SysCustomerQuoteVo> util = new ExcelUtil<SysCustomerQuoteVo>(SysCustomerQuoteVo.class);
return util.exportExcel(list, "客户报价数据");
List<ExportCustomerQuoteDetailVo> exportCustomerQuoteDetailVos = sysCustomerQuoteService.exportCustomerQuoteDetailList(list);
ExcelUtil<ExportCustomerQuoteDetailVo> util = new ExcelUtil<ExportCustomerQuoteDetailVo>(ExportCustomerQuoteDetailVo.class);
return util.exportExcel(exportCustomerQuoteDetailVos, "客户报价数据");
}else {
String[] supplierCodes = ids.split(",");
List<SysCustomerQuote> list = sysCustomerQuoteService.selectCustomerQuoteOneBySupplierCodes(supplierCodes);//客户报价编号
ExcelUtil<SysCustomerQuote> util = new ExcelUtil<SysCustomerQuote>(SysCustomerQuote.class);
return util.exportExcel(list, ids);
List<SysCustomerQuoteVo> list = sysCustomerQuoteService.selectCustomerQuoteOneBySupplierCodes(supplierCodes);//客户报价编号
List<ExportCustomerQuoteDetailVo> exportCustomerQuoteDetailVos = sysCustomerQuoteService.exportCustomerQuoteDetailList(list);
ExcelUtil<ExportCustomerQuoteDetailVo> util = new ExcelUtil<ExportCustomerQuoteDetailVo>(ExportCustomerQuoteDetailVo.class);
return util.exportExcel(exportCustomerQuoteDetailVos, ids);
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java
View File

@ -219,7 +219,7 @@ public class SysCustomer extends BaseEntity
@Excel(name = "修改时间")
private String updateInfoTime;
@Excel(name = "录入时间", dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 3)
@Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 3)
private Date createTime;
/** 备注内容 */

19
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java
View File

@ -26,7 +26,7 @@ public class SysCustomerQuote extends BaseEntity
private Long id;
/** 客户报价编号 */
@Excel(name = "客户报价编号")
@Excel(name = "客户报价编号",sort = 1)
private String supplierCode;
/** 客户的编号 */
@ -49,7 +49,7 @@ public class SysCustomerQuote extends BaseEntity
private Double enterpriseSum;
/** 报价币种 */
@Excel(name = "报价币种")
@Excel(name = "报价币种",dictType = "sys_common_currency")
private String commonCurrency;
/*是否含税*/
private String confirmTax;
@ -104,6 +104,8 @@ public class SysCustomerQuote extends BaseEntity
private String instanceType;
private String cancelInstanceId;
private String restoreInstanceId;
@Excel(name = "客户报价详情信息")
private List<SysCustomerQuoteChild> sysCustomerQuoteChildList;
@ -114,6 +116,9 @@ public class SysCustomerQuote extends BaseEntity
private String materialName;
@Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 2)
private Date createTime;
public String getConfirmTax() {
return confirmTax;
}
@ -401,6 +406,16 @@ public class SysCustomerQuote extends BaseEntity
this.materialName = materialName;
}
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

79
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java
View File

@ -21,15 +21,14 @@ public class SysCustomerQuoteChild extends BaseEntity
private Long id;
/** 主表的中关联的id字段 */
@Excel(name = "主表的中关联的id字段")
private String quoteId;
/** 物料表中的id */
@Excel(name = "物料表中的id")
private Long materialId;
/** 物料表中的编号 */
@Excel(name = "物料表中的编号")
@Excel(name = "物料号")
private String materialCode;
/** 物料的名称 */
@ -37,32 +36,32 @@ public class SysCustomerQuoteChild extends BaseEntity
private String materialName;
/** 物料的类型 */
@Excel(name = "物料的类型")
@Excel(name = "物料类型")
private String materialType;
/** 物料的加工方式 */
@Excel(name = "物料的加工方式")
/** 物料加工方式 */
@Excel(name = "物料加工方式")
private String processMethod;
/** 物料的型号 */
@Excel(name = "物料的型号")
/** 物料型号 */
@Excel(name = "物料型号")
private String materialModel;
/** 物料的单位 */
@Excel(name = "物料的单位")
/** 物料单位 */
@Excel(name = "物料单位")
private String unit;
/** 物料的品牌 */
@Excel(name = "物料的品牌")
/** 物料品牌 */
@Excel(name = "物料品牌")
private String brand;
/** 物料的图片 */
@Excel(name = "物料的图片")
/** 物料图片 */
@Excel(name = "物料图片")
private String photoUrl;
/** 物料的描述 */
@Excel(name = "物料的描述")
/** 物料描述 */
@Excel(name = "物料描述")
private String describe;
/** 国内税率 */
@ -73,56 +72,56 @@ public class SysCustomerQuoteChild extends BaseEntity
@Excel(name = "美元汇率")
private BigDecimal usdTax;
/** 物料的数量 */
@Excel(name = "物料的数量")
/** 物料数量 */
@Excel(name = "物料数量")
private BigDecimal materialNum;
@Excel(name = "物料的对外售价")
@Excel(name = "物料对外售价")
private BigDecimal materialSole;
@Excel(name = "物料的最新报价(RMB)")
@Excel(name = "物料最新报价(RMB)")
private BigDecimal recentQuotationRMB;
@Excel(name = "物料的最新报价(RMB)")
@Excel(name = "物料最新报价(RMB)")
private BigDecimal recentQuotationUSD;
/** 物料的含税单价(RMB) */
@Excel(name = "物料的含税单价(RMB) ")
/** 物料含税单价(RMB) */
@Excel(name = "物料含税单价(RMB) ")
private BigDecimal materialRmb;
/** 物料的不含税单价(RMB) */
@Excel(name = "物料的不含税单价(RMB)")
/** 物料不含税单价(RMB) */
@Excel(name = "物料不含税单价(RMB)")
private BigDecimal materialNoRmb;
/** 物料的不含税单价(USD) */
@Excel(name = "物料的不含税单价(USD)")
/** 物料不含税单价(USD) */
@Excel(name = "物料不含税单价(USD)")
private BigDecimal materialNoUsd;
/** 物料的含税单价(USD) */
@Excel(name = "物料的含税单价(USD)")
/** 物料含税单价(USD) */
@Excel(name = "物料含税单价(USD)")
private BigDecimal materialUsd;
/** 物料的含税总价(USD) */
@Excel(name = "物料的含税总价(USD)")
/** 物料含税总价(USD) */
@Excel(name = "物料含税总价(USD)")
private BigDecimal materialUsdSum;
/** 物料的不含税总价(USD) */
@Excel(name = "物料的不含税总价(USD)")
/** 物料不含税总价(USD) */
@Excel(name = "物料不含税总价(USD)")
private BigDecimal materialNoUsdSum;
/** 物料的不含税总价(RMB) */
@Excel(name = "物料的不含税总价(RMB)")
/** 物料不含税总价(RMB) */
@Excel(name = "物料不含税总价(RMB)")
private BigDecimal materialNoRmbSum;
/** 物料的含税总价(RMB) */
@Excel(name = "物料的含税总价(RMB)")
/** 物料含税总价(RMB) */
@Excel(name = "物料含税总价(RMB)")
private BigDecimal materialRmbSum;
/** 审核状态 */
@Excel(name = "审核状态")
private String deginFlag;
@Excel(name = "审核状态")
private String auditStatus;
@Excel(name = "删除状态")
private String useStatus;
/** 删除标志 */

167
ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/ExportCustomerQuoteDetailVo.java
View File

@ -0,0 +1,167 @@
package com.ruoyi.system.domain.Vo;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 导出客户报价主表和子表的数据
* */
@Data
public class ExportCustomerQuoteDetailVo{
/** 客户报价编号 */
@Excel(name = "客户报价编号",sort = 1)
private String supplierCode;
@Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 2)
private Date createTime;
/** 客户的编号 */
@Excel(name = "客户的编号")
private String customerCode;
/** 客户名称 */
@Excel(name = "客户名称")
private String customerName;
/*订价日期*/
@Excel(name = "订价日期")
private String pricingDate;
/** 物料合计 */
@Excel(name = "物料合计")
private String enterprise;
/** 数量合计 */
@Excel(name = "数量合计")
private Double enterpriseSum;
/** 报价币种 */
@Excel(name = "报价币种",dictType = "sys_common_currency")
private String commonCurrency;
/*是否含税*/
/** 国内汇率 */
@Excel(name = "国内汇率")
private BigDecimal rmbTax;
/** 美元汇率 */
@Excel(name = "美元汇率")
private BigDecimal usdTax;
/** 不含税总价(RMB) */
@Excel(name = "不含税总价(RMB)")
private BigDecimal noRmbSum;
@Excel(name = "不含税单价(RMB)")
private BigDecimal noRmb;
@Excel(name = "含税单价(RMB)")
private BigDecimal rmb;
/** 含税总价(RMB) */
@Excel(name = "含税总价(RMB)")
private BigDecimal rmbSum;
/** 不含税单价(美元) */
@Excel(name = "不含税单价(美元)")
private BigDecimal noUsd;
/** 不含税总价(美元) */
@Excel(name = "不含税总价(美元)")
private BigDecimal noUsdSum;
/** 含税单价(美元) */
@Excel(name = "含税单价(美元)")
private BigDecimal usd;
/** 含税总价(美元) */
@Excel(name = "含税总价(美元)")
private BigDecimal usdSum;
/** 物料表中的编号 */
@Excel(name = "物料号")
private String materialCode;
/** 物料的名称 */
@Excel(name = "物料的名称")
private String materialName;
/** 物料的类型 */
private String materialType;
/** 物料加工方式 */
@Excel(name = "物料加工方式",dictType = "processMethod")
private String processMethod;
/** 物料型号 */
@Excel(name = "物料型号")
private String materialModel;
/** 物料单位 */
@Excel(name = "物料单位")
private String unit;
/** 物料品牌 */
@Excel(name = "物料品牌")
private String brand;
/** 物料图片 */
@Excel(name = "物料图片")
private String photoUrl;
/** 物料描述 */
@Excel(name = "物料描述")
private String describe;
/** 物料数量 */
@Excel(name = "物料数量")
private BigDecimal materialNum;
@Excel(name = "物料对外售价")
private BigDecimal materialSole;
@Excel(name = "物料最新报价(RMB)")
private BigDecimal recentQuotationRMB;
@Excel(name = "物料最新报价(RMB)")
private BigDecimal recentQuotationUSD;
/** 物料含税单价(RMB) */
@Excel(name = "物料含税单价(RMB) ")
private BigDecimal materialRmb;
/** 物料不含税单价(RMB) */
@Excel(name = "物料不含税单价(RMB)")
private BigDecimal materialNoRmb;
/** 物料不含税单价(USD) */
@Excel(name = "物料不含税单价(USD)")
private BigDecimal materialNoUsd;
/** 物料含税单价(USD) */
@Excel(name = "物料含税单价(USD)")
private BigDecimal materialUsd;
/** 物料含税总价(USD) */
@Excel(name = "物料含税总价(USD)")
private BigDecimal materialUsdSum;
/** 物料不含税总价(USD) */
@Excel(name = "物料不含税总价(USD)")
private BigDecimal materialNoUsdSum;
/** 物料不含税总价(RMB) */
@Excel(name = "物料不含税总价(RMB)")
private BigDecimal materialNoRmbSum;
/** 物料含税总价(RMB) */
@Excel(name = "物料含税总价(RMB)")
private BigDecimal materialRmbSum;
}

5
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerQuoteChildMapper.java
View File

@ -24,4 +24,9 @@ public interface SysCustomerQuoteChildMapper {
* 检查客户报价子表是否引用了物料
* */
int checkMaterialIsReferencedByCustomerQuoteChild(String materialNo);
/**
* 根据客户报价编码查询供应商报价子表
* */
List<SysCustomerQuoteChild> selectSysCustomerQuoteChildListByQuoteIdList(List<String> supplierCodeList);
}

2
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerQuoteMapper.java
View File

@ -109,5 +109,5 @@ public interface SysCustomerQuoteMapper
/**
* 根据供应商编码数组查询客户报价信息集合
* */
List<SysCustomerQuote> selectCustomerQuoteOneBySupplierCodes(String[] supplierCodes);
List<SysCustomerQuoteVo> selectCustomerQuoteOneBySupplierCodes(String[] supplierCodes);
}

8
ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteService.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.system.service;
import com.ruoyi.erp.domain.ErpMaterial;
import com.ruoyi.system.domain.SysCustomerQuote;
import com.ruoyi.system.domain.SysCustomerQuoteVo;
import com.ruoyi.system.domain.Vo.ExportCustomerQuoteDetailVo;
import org.activiti.engine.runtime.ProcessInstance;
import org.springframework.transaction.annotation.Transactional;
@ -111,7 +112,7 @@ public interface ISysCustomerQuoteService
/**
* 根据供应商编码数组查询客户报价信息集合
* */
List<SysCustomerQuote> selectCustomerQuoteOneBySupplierCodes(String[] supplierCodes);
List<SysCustomerQuoteVo> selectCustomerQuoteOneBySupplierCodes(String[] supplierCodes);
/**
* 通过用户名找到业务登录名，重新给业务员赋值
@ -122,4 +123,9 @@ public interface ISysCustomerQuoteService
* 根据客户报价对象作废客户报价
* */
int cancelSysCustomerQuoteByObject(SysCustomerQuote sysCustomerQuote);
/**
* 导出客户报价明细
* */
List<ExportCustomerQuoteDetailVo> exportCustomerQuoteDetailList(List<SysCustomerQuoteVo> list);
}

72
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java
View File

@ -20,6 +20,7 @@ import com.ruoyi.process.general.service.IProcessService;
import com.ruoyi.process.todoitem.mapper.BizTodoItemMapper;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.domain.Vo.ExportCustomerQuoteChildVo;
import com.ruoyi.system.domain.Vo.ExportCustomerQuoteDetailVo;
import com.ruoyi.system.domain.Vo.ExportSalesOrderChildVo;
import com.ruoyi.system.domain.Vo.ExportSalesOrderVo;
import com.ruoyi.system.mapper.*;
@ -40,6 +41,8 @@ import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@Slf4j
@Service
@ -97,8 +100,8 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
* 根据供应商编码数组查询客户报价信息集合
* */
@Override
public List<SysCustomerQuote> selectCustomerQuoteOneBySupplierCodes(String[] supplierCodes) {
List<SysCustomerQuote> list = sysCustomerQuoteMapper.selectCustomerQuoteOneBySupplierCodes(supplierCodes);
public List<SysCustomerQuoteVo> selectCustomerQuoteOneBySupplierCodes(String[] supplierCodes) {
List<SysCustomerQuoteVo> list = sysCustomerQuoteMapper.selectCustomerQuoteOneBySupplierCodes(supplierCodes);
return list;
}
@ -733,4 +736,69 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
}
/**
* 导出客户报价明细
* */
@Override
public List<ExportCustomerQuoteDetailVo> exportCustomerQuoteDetailList(List<SysCustomerQuoteVo> list) {
List<ExportCustomerQuoteDetailVo> exportCustomerQuoteDetailVos = new ArrayList<>();
List<String> collectSupplierCodes = list.stream().map(SysCustomerQuoteVo::getSupplierCode).collect(Collectors.toList());
Map<String, SysCustomerQuote> sysCustomerQuoteMap = list.stream().collect(Collectors.toMap(SysCustomerQuote::getSupplierCode, Function.identity()));
List<SysCustomerQuoteChild> sysCustomerQuoteChildren = sysCustomerQuoteChildMapper.selectSysCustomerQuoteChildListByQuoteIdList(collectSupplierCodes);
//HashMap<String, SysCustomerQuote> sysCustomerQuoteMap = new HashMap<>();
for (SysCustomerQuoteChild sysCustomerQuoteChild : sysCustomerQuoteChildren) {
ExportCustomerQuoteDetailVo exportCustomerQuoteDetailVo = new ExportCustomerQuoteDetailVo();
String quoteId = sysCustomerQuoteChild.getQuoteId();
SysCustomerQuote tempCustomerQuoteVo = sysCustomerQuoteMap.get(quoteId);
exportCustomerQuoteDetailVo.setCustomerName(tempCustomerQuoteVo.getCustomerName());
exportCustomerQuoteDetailVo.setCustomerCode(tempCustomerQuoteVo.getCustomerCode());
exportCustomerQuoteDetailVo.setSupplierCode(tempCustomerQuoteVo.getSupplierCode());
exportCustomerQuoteDetailVo.setEnterprise(tempCustomerQuoteVo.getEnterprise());
exportCustomerQuoteDetailVo.setEnterpriseSum(tempCustomerQuoteVo.getEnterpriseSum());
exportCustomerQuoteDetailVo.setNoRmb(tempCustomerQuoteVo.getNoRmb());
exportCustomerQuoteDetailVo.setNoUsd(tempCustomerQuoteVo.getNoUsd());
exportCustomerQuoteDetailVo.setRmb(tempCustomerQuoteVo.getRmb());
exportCustomerQuoteDetailVo.setUsd(tempCustomerQuoteVo.getUsd());
exportCustomerQuoteDetailVo.setRmbSum(tempCustomerQuoteVo.getRmbSum());
exportCustomerQuoteDetailVo.setUsdSum(tempCustomerQuoteVo.getUsdSum());
exportCustomerQuoteDetailVo.setNoRmbSum(tempCustomerQuoteVo.getNoRmbSum());
exportCustomerQuoteDetailVo.setNoUsdSum(tempCustomerQuoteVo.getNoUsdSum());
exportCustomerQuoteDetailVo.setCreateTime(tempCustomerQuoteVo.getCreateTime());
exportCustomerQuoteDetailVo.setPricingDate(tempCustomerQuoteVo.getPricingDate());
exportCustomerQuoteDetailVo.setCommonCurrency(tempCustomerQuoteVo.getCommonCurrency());
exportCustomerQuoteDetailVo.setRmbTax(tempCustomerQuoteVo.getRmbTax());
exportCustomerQuoteDetailVo.setUsdTax(tempCustomerQuoteVo.getUsdTax());
exportCustomerQuoteDetailVo.setMaterialCode(sysCustomerQuoteChild.getMaterialCode());
exportCustomerQuoteDetailVo.setMaterialName(sysCustomerQuoteChild.getMaterialName());
exportCustomerQuoteDetailVo.setMaterialRmb(sysCustomerQuoteChild.getMaterialRmb());
exportCustomerQuoteDetailVo.setMaterialNoRmb(sysCustomerQuoteChild.getMaterialNoRmb());
exportCustomerQuoteDetailVo.setMaterialNoUsd(sysCustomerQuoteChild.getMaterialNoUsd());
exportCustomerQuoteDetailVo.setMaterialUsd(sysCustomerQuoteChild.getMaterialUsd());
exportCustomerQuoteDetailVo.setMaterialRmbSum(sysCustomerQuoteChild.getMaterialRmbSum());
exportCustomerQuoteDetailVo.setMaterialNoRmbSum(sysCustomerQuoteChild.getMaterialNoRmbSum());
exportCustomerQuoteDetailVo.setMaterialUsdSum(sysCustomerQuoteChild.getMaterialUsdSum());
exportCustomerQuoteDetailVo.setMaterialNoUsdSum(sysCustomerQuoteChild.getMaterialNoUsdSum());
exportCustomerQuoteDetailVo.setDescribe(sysCustomerQuoteChild.getDescribe());
exportCustomerQuoteDetailVo.setMaterialNum(sysCustomerQuoteChild.getMaterialNum());
exportCustomerQuoteDetailVo.setBrand(sysCustomerQuoteChild.getBrand());
exportCustomerQuoteDetailVo.setUnit(sysCustomerQuoteChild.getUnit());
exportCustomerQuoteDetailVo.setMaterialModel(sysCustomerQuoteChild.getMaterialModel());
exportCustomerQuoteDetailVo.setProcessMethod(sysCustomerQuoteChild.getProcessMethod());
exportCustomerQuoteDetailVo.setMaterialType(sysCustomerQuoteChild.getMaterialType());
exportCustomerQuoteDetailVo.setRecentQuotationRMB(sysCustomerQuoteChild.getRecentQuotationRMB());
exportCustomerQuoteDetailVo.setRecentQuotationUSD(sysCustomerQuoteChild.getRecentQuotationUSD());
exportCustomerQuoteDetailVo.setMaterialSole(sysCustomerQuoteChild.getMaterialSole());
exportCustomerQuoteDetailVos.add(exportCustomerQuoteDetailVo);
}
return exportCustomerQuoteDetailVos;
}
}

12
ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml
View File

@ -69,6 +69,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(1) from sys_customer_quotechild where materialCode = #{materialCode}
</select>
<select id="selectSysCustomerQuoteChildListByQuoteIdList" parameterType="list" resultMap="customerQuoteChildResult">
<include refid="selectSysCustomerQuoteChildVo"/>
<where>
<if test="list != null and list.size > 0">
quoteId in
<foreach item="quoteId" collection="list" separator="," open="(" close=")">
#{quoteId}
</foreach>
</if>
</where>
</select>
<insert id="insertSysCustomerQuoteChild" parameterType="SysCustomerQuoteChild" useGeneratedKeys="true" keyProperty="id">
insert into sys_customer_quotechild
<trim prefix="(" suffix=")" suffixOverrides=",">

146
ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
View File

@ -193,79 +193,79 @@
{title: '国内汇率',field: 'rmbTax',align: 'center'},
{title: '美元汇率',field: 'usdTax',align: 'center'},
{title: '不含税单价(RMB)',field: 'noRmb',align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].noRmb) || 0;
}
return "总不含税单价(RMB): " + sum.toFixed(2);
}
},
{title: '含税单价(RMB)',field: 'rmb',align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].rmb) || 0;
}
return "总含税单价(RMB): " + sum.toFixed(2);
}
},
{title: '不含税单价($)',field: 'noUsd',align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].noUsd) || 0;
}
return "总不含税单价($): " + sum.toFixed(2);
}
},
{title: '含税单价($)',field: 'usd',align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].usd) || 0;
}
return "总含税单价($): " + sum.toFixed(2);
}
},
{title: '不含税总价(RMB)',field: 'noRmbSum',align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].noRmbSum) || 0;
}
return "总不含税总价(RMB): " + sum.toFixed(2);
}
},
{title: '含税总价(RMB)',field: 'rmbSum',align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].rmbSum) || 0;
}
return "总含税总价(RMB): " + sum.toFixed(2);
}
},
{title: '不含税总价($)',field: 'noUsdSum',align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].noUsdSum) || 0;
}
return "总不含税总价($): " + sum.toFixed(2);
}
},
{title: '含税总价($)',field: 'usdSum',align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].usdSum) || 0;
}
return "总含税总价($): " + sum.toFixed(2);
}
},
// {title: '不含税单价(RMB)',field: 'noRmb',align: 'center',
// footerFormatter: function (value) {
// var sum = 0;
// for (var i in value) {
// sum += parseFloat(value[i].noRmb) || 0;
// }
// return "总不含税单价(RMB): " + sum.toFixed(2);
// }
// },
// {title: '含税单价(RMB)',field: 'rmb',align: 'center',
// footerFormatter: function (value) {
// var sum = 0;
// for (var i in value) {
// sum += parseFloat(value[i].rmb) || 0;
// }
// return "总含税单价(RMB): " + sum.toFixed(2);
// }
// },
// {title: '不含税单价($)',field: 'noUsd',align: 'center',
// footerFormatter: function (value) {
// var sum = 0;
// for (var i in value) {
// sum += parseFloat(value[i].noUsd) || 0;
// }
// return "总不含税单价($): " + sum.toFixed(2);
// }
// },
// {title: '含税单价($)',field: 'usd',align: 'center',
// footerFormatter: function (value) {
// var sum = 0;
// for (var i in value) {
// sum += parseFloat(value[i].usd) || 0;
// }
// return "总含税单价($): " + sum.toFixed(2);
// }
// },
//
// {title: '不含税总价(RMB)',field: 'noRmbSum',align: 'center',
// footerFormatter: function (value) {
// var sum = 0;
// for (var i in value) {
// sum += parseFloat(value[i].noRmbSum) || 0;
// }
// return "总不含税总价(RMB): " + sum.toFixed(2);
// }
// },
// {title: '含税总价(RMB)',field: 'rmbSum',align: 'center',
// footerFormatter: function (value) {
// var sum = 0;
// for (var i in value) {
// sum += parseFloat(value[i].rmbSum) || 0;
// }
// return "总含税总价(RMB): " + sum.toFixed(2);
// }
// },
// {title: '不含税总价($)',field: 'noUsdSum',align: 'center',
// footerFormatter: function (value) {
// var sum = 0;
// for (var i in value) {
// sum += parseFloat(value[i].noUsdSum) || 0;
// }
// return "总不含税总价($): " + sum.toFixed(2);
// }
// },
// {title: '含税总价($)',field: 'usdSum',align: 'center',
// footerFormatter: function (value) {
// var sum = 0;
// for (var i in value) {
// sum += parseFloat(value[i].usdSum) || 0;
// }
// return "总含税总价($): " + sum.toFixed(2);
// }
// },
{title: '使用状态',field: 'useStatus',align: 'center',
formatter: function (value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);},
},

Write Preview
Loading…
Cancel
Save