Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dev
zhangsiqi 2 weeks ago
parent
commit
c4025241c1
  1. 15
      ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java
  2. 42
      ruoyi-admin/src/main/java/com/ruoyi/erp/domain/vo/ErpMaterialSalesHistoryVo.java
  3. 6
      ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java
  4. 69
      ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java
  5. 54
      ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
  6. 5
      ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderChildMapper.java
  7. 6
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java
  8. 7
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
  9. 7
      ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
  10. BIN
      ruoyi-admin/src/main/resources/static/attachments/客户报价3.xlsx
  11. 13
      ruoyi-admin/src/main/resources/templates/erp/material/add.html
  12. 278
      ruoyi-admin/src/main/resources/templates/erp/material/detail.html
  13. 8
      ruoyi-admin/src/main/resources/templates/erp/material/material.html
  14. 6
      ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
  15. 13
      ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
  16. 8
      ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
  17. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
  18. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
  19. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
  20. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
  21. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
  22. 6
      ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
  23. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
  24. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
  25. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
  26. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
  27. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
  28. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

15
ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java

@ -10,6 +10,7 @@ import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.erp.domain.ErpMaterial;
import com.ruoyi.erp.domain.ErpMaterialVo;
import com.ruoyi.erp.domain.vo.ErpMaterialSalesHistoryVo;
import com.ruoyi.erp.mapper.ErpMaterialMapper;
import com.ruoyi.erp.service.IErpMaterialService;
import com.ruoyi.process.general.service.IProcessService;
@ -469,4 +470,18 @@ public class ErpMaterialController extends BaseController
List<SysUser> list = sysUserService.selectRoleToUserList("gcwyRole,gcjlRole,gczgRole,yfzjRole,");
return getDataTable(list);
}
/**
* 物料销售价格历史
* */
@PostMapping ("/getMaterialSalesHistoryList")
@ResponseBody
public TableDataInfo getMaterialSalesHistoryList(@RequestParam String materialNo){
startPage();
List<ErpMaterialSalesHistoryVo> list = erpMaterialService.selectErpMaterialSalesHistoryList(materialNo);
return getDataTable(list);
}
}

42
ruoyi-admin/src/main/java/com/ruoyi/erp/domain/vo/ErpMaterialSalesHistoryVo.java

@ -0,0 +1,42 @@
package com.ruoyi.erp.domain.vo;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
//物料销售历史
@Data
public class ErpMaterialSalesHistoryVo {
//销售时间
private Date salesTime;
//物料数量
private Integer materialNum;
//币种
private String commonCurrency;
//含税价格
private double taxPrice;
//不含税价格
private double noTaxPrice;
//含税总价
private double taxSum;
//不含税总价
private double noTaxSum;
//业务员
private String salesUser;
//关联销售单号
private String salesOrderCode;
//合计
private double total;
}

6
ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java

@ -2,6 +2,7 @@ package com.ruoyi.erp.service;
import com.ruoyi.erp.domain.ErpMaterial;
import com.ruoyi.erp.domain.ErpMaterialVo;
import com.ruoyi.erp.domain.vo.ErpMaterialSalesHistoryVo;
import org.activiti.engine.runtime.ProcessInstance;
import org.springframework.transaction.annotation.Transactional;
@ -139,4 +140,9 @@ public interface IErpMaterialService
* 通过物料信息作废物料信息
* */
int cancelErpMaterialByObject(ErpMaterial erpMaterial);
/**
* 查询物料销售价历史
* */
List<ErpMaterialSalesHistoryVo> selectErpMaterialSalesHistoryList(String materialNo);
}

69
ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java

@ -11,11 +11,15 @@ import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.erp.domain.ErpMaterial;
import com.ruoyi.erp.domain.ErpMaterialVo;
import com.ruoyi.erp.domain.vo.ErpMaterialSalesHistoryVo;
import com.ruoyi.erp.mapper.ErpMaterialMapper;
import com.ruoyi.erp.service.IErpMaterialService;
import com.ruoyi.process.general.service.IProcessService;
import com.ruoyi.process.todoitem.mapper.BizTodoItemMapper;
import com.ruoyi.system.domain.SysAttach;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.domain.Vo.ExportCustomerQuoteChildVo;
import com.ruoyi.system.mapper.SysSalesOrderChildMapper;
import com.ruoyi.system.mapper.SysSalesOrderMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysAttachFileService;
import com.ruoyi.system.service.ISysAttachService;
@ -34,6 +38,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.util.*;
/**
@ -75,6 +80,14 @@ public class ErpMaterialServiceImpl implements IErpMaterialService
private ISysRoleService roleService;
@Autowired
private SysSalesOrderChildMapper sysSalesOrderChildMapper;
@Autowired
private SysSalesOrderMapper sysSalesOrderMapper;
private final static String RMB = "1"; //RMB
/**
* 查询物料信息
*
@ -507,4 +520,58 @@ public class ErpMaterialServiceImpl implements IErpMaterialService
public List<ErpMaterialVo> selectAllErpMaterialListByMaterialVo(ErpMaterialVo erpMaterialVo) {
return erpMaterialMapper.selectAllErpMaterialListByMaterialVo(erpMaterialVo);
}
/**
* 查询物料销售价历史
* */
@Override
public List<ErpMaterialSalesHistoryVo> selectErpMaterialSalesHistoryList(String materialNo) {
List<ErpMaterialSalesHistoryVo> erpMaterialSalesHistoryVos = new ArrayList<>();
List<SysSalesOrderChild> salesOrderChildList = sysSalesOrderChildMapper.selectOrderChildListByMaterialNo(materialNo);
for (SysSalesOrderChild sysSalesOrderChild : salesOrderChildList) {
ErpMaterialSalesHistoryVo erpMaterialSalesHistoryVo = new ErpMaterialSalesHistoryVo();
String quoteId = sysSalesOrderChild.getQuoteId();
SysSalesOrderVo sysSalesOrderVo = sysSalesOrderMapper.selectSysSalesOrderBySalesOrderCode(quoteId);
setMaterialPrice(erpMaterialSalesHistoryVo, sysSalesOrderVo, sysSalesOrderChild);
erpMaterialSalesHistoryVo.setMaterialNum(sysSalesOrderChild.getMaterialNum());
erpMaterialSalesHistoryVo.setCommonCurrency(sysSalesOrderVo.getCommonCurrency());
erpMaterialSalesHistoryVo.setSalesTime(sysSalesOrderChild.getCreateTime());
erpMaterialSalesHistoryVo.setSalesUser(sysSalesOrderChild.getBusinessMembers());
erpMaterialSalesHistoryVo.setSalesOrderCode(sysSalesOrderChild.getQuoteId());
erpMaterialSalesHistoryVos.add(erpMaterialSalesHistoryVo);
}
return erpMaterialSalesHistoryVos;
}
//区分不同币种的金额
private void setMaterialPrice(ErpMaterialSalesHistoryVo vo, SysSalesOrderVo sysSalesOrderVo, SysSalesOrderChild child) {
if (RMB.equals(sysSalesOrderVo.getCommonCurrency())) {
// RMB
Double materialRmb = child.getMaterialRmb();
Double materialNoRmb = child.getMaterialNoRmb();
Double materialNoRmbSum = child.getMaterialNoRmbSum();
Double materialRmbSum = child.getMaterialRmbSum();
vo.setNoTaxPrice(materialNoRmb);
vo.setTaxPrice(materialRmb);
vo.setNoTaxSum(materialNoRmbSum);
vo.setTaxSum(materialRmbSum);
} else {
//美元
Double materialUsd = child.getMaterialUsd();
Double materialNoUsd = child.getMaterialNoUsd();
Double materialNoUsdSum = child.getMaterialNoUsdSum();
Double materialUsdSum = child.getMaterialUsdSum();
vo.setNoTaxPrice(materialNoUsd);
vo.setTaxPrice(materialUsd);
vo.setNoTaxSum(materialNoUsdSum);
vo.setTaxSum(materialUsdSum);
}
}
}

54
ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java

@ -4,6 +4,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import com.ruoyi.common.core.redis.RedisCache;
@ -93,8 +94,28 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
salesEstimate.setEstimateStatus("0");
//设置默认值为RMB
salesEstimate.setCommonCurrency("1");
List<SalesEstimateDetail> salesEstimateDetailList = salesEstimate.getSalesEstimateDetailList();
if (salesEstimateDetailList != null && salesEstimateDetailList.size() > 0) {
// 确保 getMaterialNum 返回类型为 Long 或 long
long enterpriseSum = salesEstimateDetailList.stream()
.filter(detail->detail.getMaterialNum() != null) // 过滤掉 null 元素
.mapToLong(SalesEstimateDetail::getMaterialNum)
.sum();
salesEstimate.setEnterpriseSum(enterpriseSum);
salesEstimate.setMaterialSum((long) salesEstimateDetailList.size());
//计算不含税单价人民币
//计算不含税单价美元
//计算含税单价人民币
//计算含税单价美元
//计算不含税总价人民币
//计算不含税总价美元
//计算含税总价人民币
//计算含税总价美元
for (SalesEstimateDetail salesEstimateDetail : salesEstimateDetailList) {
salesEstimateDetail.setSalesEstimateCode(salesEstimateCode);
@ -286,7 +307,13 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
3不含税经营成本(RMB)=(该料号的BOM物料总不含税采购成本/总不含税物料成本)*总不含税经营成本
4含税经营成本(RMB)=(该料号的BOM物料总含税采购成本/总含税物料成本)*总含税经营成本
5不含税料号估价成本:该料号的BOM物料总不含税采购成本+不含税总经营成本+(该料号的BOM物料总不含税采购成本/总不含税物料成本)*总不含税经营成本
新版不含税料号估价成本:该料号的BOM物料总不含税采购成本+不含税运输成本+不含税服务成本+不含税开发成本+(该料号的BOM物料总不含税采购成本/总物料不含税成本)*总经营不含税成
6含税料号估价成本:该料号的BOM物料总含税采购成本+含税总经营成本+(该料号的BOM物料总含税采购成本/总含税物料成本)*总含税经营成本
新版含税料号估价成本:该料号的BOM物料总含税采购成本+含税运输成本+含税服务成本+含税开发成本+(该料号的BOM物料总含税采购成本/总物料含税成本)*总经营含税成本
7不含税单价(RMB):该料号不含税估价成本/(1-利润率)
8含税单价(RMB)=该料号含税估价成本/(1-利润率)
9不含税总价(RMB)=不含税单价(RMB)*数量
@ -340,6 +367,11 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
BigDecimal noTaxBusinessCosts = salesEstimateDetail.getNoTaxBusinessCosts(); // 获取不含税的业务成本
BigDecimal noTaxManagesCosts = salesEstimateDetail.getNoTaxManagesCosts(); // 获取不含税的管理成本
BigDecimal noTaxMaterialCosts = salesEstimateDetail.getNoTaxMaterialCosts(); // 获取不含税的物料成本
BigDecimal noTaxShippingCosts = salesEstimateDetail.getNoTaxShippingCosts(); //不含税运输成本
BigDecimal noTaxServiceCosts = salesEstimateDetail.getNoTaxServiceCosts(); //不含税服务成本
BigDecimal noTaxDevelopmentCosts = salesEstimateDetail.getNoTaxDevelopCosts();//不含税开发成本
BigDecimal profitRate = salesEstimateDetail.getProfitRate().divide(BigDecimal.valueOf(100)); // 获取利润率并转换为小数形式
Long materialNum = salesEstimateDetail.getMaterialNum(); // 获取物料数量
@ -367,10 +399,10 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
.setScale(2, RoundingMode.HALF_UP);
// 计算不含税料号估价成本,并保留两位小数
BigDecimal noTaxEstimateCost = calculateNoTaxEstimateCost(totalNoTaxPurchaseRmb, noAllTaxOperatingCosts, noTaxMaterialCosts)
BigDecimal noTaxEstimateCost = calculateNoTaxEstimateCost(totalNoTaxPurchaseRmb, noTaxShippingCosts,noTaxServiceCosts,noTaxDevelopmentCosts,noAllTaxOperatingCosts, noTaxMaterialCosts)
.setScale(2, RoundingMode.HALF_UP);
// 计算含税料号估价成本,并保留两位小数
BigDecimal taxEstimateCost = calculateTaxEstimateCost(totalTaxPurchaseRmb, allTaxOperatingCosts, taxMaterialCosts)
BigDecimal taxEstimateCost = calculateTaxEstimateCost(totalTaxPurchaseRmb,noTaxShippingCosts,noTaxServiceCosts,noTaxDevelopmentCosts, allTaxOperatingCosts, taxMaterialCosts)
.setScale(2, RoundingMode.HALF_UP);
// 计算不含税单价(RMB),并保留两位小数
@ -498,16 +530,24 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
.multiply(allTaxOperatingCosts);
}
// 计算不含税料号估价成本
private BigDecimal calculateNoTaxEstimateCost(BigDecimal totalNoTaxPurchaseRmb, BigDecimal noAllTaxOperatingCosts, BigDecimal noTaxMaterialCosts) {
return totalNoTaxPurchaseRmb.add(noAllTaxOperatingCosts)
// 计算不含税料号估价成本 BigDecimal noTaxShippingCosts = salesEstimateDetail.getNoTaxShippingCosts(); //不含税运输成本
// BigDecimal noTaxServiceCosts = salesEstimateDetail.getNoTaxServiceCosts(); //不含税服务成本
// BigDecimal noTaxDevelopmentCosts = salesEstimateDetail.getNoTaxDevelopCosts();//不含税开发成本
private BigDecimal calculateNoTaxEstimateCost(BigDecimal totalNoTaxPurchaseRmb, BigDecimal noTaxShippingCosts ,BigDecimal noTaxServiceCosts,BigDecimal noTaxDevelopmentCosts ,BigDecimal noAllTaxOperatingCosts,BigDecimal noTaxMaterialCosts) {
return totalNoTaxPurchaseRmb
.add(noTaxShippingCosts)
.add(noTaxServiceCosts)
.add(noTaxDevelopmentCosts)
.add(totalNoTaxPurchaseRmb.divide(noTaxMaterialCosts, 2, RoundingMode.HALF_UP)
.multiply(noAllTaxOperatingCosts));
}
// 计算含税料号估价成本
private BigDecimal calculateTaxEstimateCost(BigDecimal totalTaxPurchaseRmb, BigDecimal allTaxOperatingCosts, BigDecimal taxMaterialCosts) {
return totalTaxPurchaseRmb.add(allTaxOperatingCosts)
private BigDecimal calculateTaxEstimateCost(BigDecimal totalTaxPurchaseRmb, BigDecimal noTaxShippingCosts ,BigDecimal noTaxServiceCosts,BigDecimal noTaxDevelopmentCosts ,BigDecimal allTaxOperatingCosts, BigDecimal taxMaterialCosts) {
return totalTaxPurchaseRmb
.add(noTaxShippingCosts)
.add(noTaxServiceCosts)
.add(noTaxDevelopmentCosts)
.add(totalTaxPurchaseRmb.divide(taxMaterialCosts, 2, RoundingMode.HALF_UP)
.multiply(allTaxOperatingCosts));
}

5
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderChildMapper.java

@ -47,4 +47,9 @@ public interface SysSalesOrderChildMapper {
*/
Integer deleteSysSalesOrderChildByQuoteId(String salesOrderCode);
/**
* 根据物料号查询销售订单子表
* */
List<SysSalesOrderChild> selectOrderChildListByMaterialNo(String materialNo);
}

6
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java

@ -189,6 +189,12 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
String loginName = ShiroUtils.getLoginName();
sysCustomerQuote.setCreateBy(loginName);
sysCustomerQuote.setCreateTime(DateUtils.getNowDate());
String commonCurrency = sysCustomerQuote.getCommonCurrency();
if (RMB.equals(commonCurrency)){
sysCustomerQuote.setConfirmTax("1");
}else {
sysCustomerQuote.setConfirmTax("0");
}
int result = sysCustomerQuoteMapper.insertSysCustomerQuote(sysCustomerQuote);
sysCustomerQuote.getId();
List<SysCustomerQuoteChild> sysCustomerQuoteChildList = sysCustomerQuote.getSysCustomerQuoteChildList();

7
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java

@ -281,6 +281,13 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
sysSalesOrder.setCreateBy(loginName);
sysSalesOrder.setCreateTime(DateUtils.getNowDate());
sysSalesOrder.setSalesOrderCode(getId());
String commonCurrency = sysSalesOrder.getCommonCurrency();
if(RMB.equals(commonCurrency)){
sysSalesOrder.setConfirmTax("1");
}else {
sysSalesOrder.setConfirmTax("0");
}
int result = sysSalesOrderMapper.insertSysSalesOrder(sysSalesOrder);
sysSalesOrder.getSalesOrderId();
int s = sysSalesOrder.getSysSalesOrderChildList().size();

7
ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml

@ -58,6 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join erp_bom b
on a.materialCode = b.material_no
</sql>
<select id="selectSysSalesOrderChildList" parameterType="SysSalesOrderChild" resultMap="SysSalesOrderChildResult">
<include refid="selectSysSalesOrderChild"/>
<where>
@ -113,6 +115,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where quoteId = #{quoteId}
</select>
<select id="selectOrderChildListByMaterialNo" parameterType="String" resultMap="SysSalesOrderChildResult">
<include refid="selectSysSalesOrderChild"/>
where a.materialCode = #{materialCode}
</select>
<insert id="insertSysSalesOrderChild" parameterType="SysSalesOrderChild" useGeneratedKeys="true" keyProperty="id">
insert into sys_sales_order_child

BIN
ruoyi-admin/src/main/resources/static/attachments/客户报价3.xlsx

Binary file not shown.

13
ruoyi-admin/src/main/resources/templates/erp/material/add.html

@ -89,9 +89,11 @@
:on-remove="uploadRemove"
:file-list="fileList"
:limit="5"
:before-upload="checkFileSize"
list-type="picture"
accept=".jpg,.png"
multiple>
multiple
>
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">只能上传jpg/png文件,第一张图片为主图</div>
</el-upload>
@ -155,7 +157,14 @@
}
});
},
checkFileSize(file) {
const maxSize = 20 * 1024 * 1024; // 设置最大为2MB
if (file.size > maxSize) {
this.$message.error(`文件大小不能超过20MB!`);
return false;
}
return true;
},
}
})
var prefix = ctx + "erp/material";

278
ruoyi-admin/src/main/resources/templates/erp/material/detail.html

@ -335,245 +335,119 @@
$('#xiaoshou-table').bootstrapTable('destroy');
var option2 ={
id: "xiaoshou-table",
url: prefix + "/getMaterialSalesHistoryList",
showSearch: false,
showRefresh: false,
showToggle: false,
showColumns: false,
uniqueId: "id",
pageNumber:5,
pagination: false, // 设置不分页
sidePagination: "client",
showFooter: true,
queryParams: function (params) {
//console.log("123");
var curParams = {
// 传递参数查询参数
pageSize: params.limit,
pageNum: params.offset / params.limit + 1,
finishProductCode: materialNo
materialNo: materialNo
};
return curParams
},
columns: [
// {
// checkbox: true
// },
{
field: 'salesFinishId',
title: '订单id',
visible: false
},
{
field: 'salesOrderCode',
title: '订单编号'
},
{
field: 'salesOrderNumber',
title: '订单号码'
},
{
field: 'enterpriseCode',
title: '客户代码'
},
{
field: 'enterpriseName',
title: '客户名称'
},
{
field: 'paymentTerms',
title: '付款条件'
},
{
field: 'deliveryConditions',
title: '交货条件'
},
{
field: 'deliveryMethod',
title: '交货方式'
},
{
field: 'orderReceivingMode',
title: '接单方式'
},
{
field: 'customerContact',
title: '联系人'
},
{
field: 'customerFactory',
title: '客户厂区'
},
{
field: 'contactNumber',
title: '联系电话'
},
{
field: 'businessMembers',
title: '业务人员'
},
{
field: 'customerFax',
title: '传真号码'
},
{
field: 'deliveryAddress',
title: '交货地点'
},
{
field: 'orderReceivingTime',
title: '接单日期'
},
{
field: 'billingTime',
title: '开单日期时间'
},
{
field: 'customerRemarks',
title: '备注内容'
},
{
field: 'currentInventory',
title: '当前库存数',
visible: false
},
{
field: 'creditLimit',
title: '信用额度',
visible: false
},
{
field: 'unpaidAmount',
title: '未付款数',
visible: false
},
{
field: 'availableCredit',
title: '可用额度',
visible: false
},
{
field: 'confirmTax',
title: '是否含税',
visible: false
},
{
field: 'taxRate',
title: '税率',
visible: false
},
{
field: 'totalAmount',
title: '合计金额',
visible: false
},
{
field: 'modificationTime',
title: '修改日期',
visible: false
},
{
field: 'confirmTime',
title: '确认日期',
field: 'index',
title: '索引',
visible: false
},
{
field: 'fileUpload',
title: '文件存储',
visible: false
field: 'salesTime',
title: '销售时间'
},
{
field: 'confirmNo',
title: '确认否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(whetherDatas, value);
},
visible: false
},
{
field: 'confirmName',
title: '确认人',
visible: false
},
{
field: 'auditNo',
title: '结案否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(whetherDatas, value);
},
visible: false
},
{
field: 'nationalTaxBill',
title: '是否开国税发票',
visible: false
},
{
field: 'inventoryUnit',
title: '单位'
},
{
field: 'commonCurrency',
title: '币别',
formatter: function(value, row, index) {
return $.table.selectDictLabel(commonCurrencyDatas, value);
field: 'materialNum',
title: '数量',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].materialNum);
}
return sum;
}
},
{
field: 'processPrice',
title: '单价'
},
{
field: 'productQuantity',
title: '数量'
},
{
field: 'amountMoney',
title: '金额'
},
{
field: 'deliveryTime',
title: '交期'
},
{
field: 'salesExplain',
title: '说明'
field: 'commonCurrency',
title: '币种'
},
{
field: 'customerUseOrNot',
title: '客户使用否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(whetherDatas, value);
},
visible: false
field: 'taxPrice',
title: '含税价格',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].taxPrice);
}
return sum;
}
},
{
field: 'customerUseQuantity',
title: '客户使用数量',
visible: false
field: 'noTaxPrice',
title: '不含税价格',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].noTaxPrice);
}
return sum;
}
},
{
field: 'customerUseRemarks',
title: '客户使用备注说明',
visible: false
field: 'taxSum',
title: '含税总价',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].taxSum);
}
return sum;
}
},
{
field: 'accountReconciliationOrNot',
title: '对账否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(whetherDatas, value);
},
visible: false
field: 'noTaxSum',
title: '不含税总价',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].noTaxSum);
}
return sum;
}
},
{
field: 'accountReconciliationPerson',
title: '对账人',
visible: false
field: 'salesUser',
title: '业务员',
},
{
field: 'accountReconciliationTime',
title: '对账时间',
visible: false
}]
field: 'salesOrderCode',
title: '关联单号'
},
// {
// field: 'total',
// title: '合计',
// footerFormatter: function() {
// //统计总分数
// var count = 0;
// $.each(data.rows, function (index, item) {
// count += item.materialNum;
// });
// return count;
// }
// }
]
};
$.table.init(option2);
//采购价历史
$('#purser-table').bootstrapTable('destroy');
var option3 = {

8
ruoyi-admin/src/main/resources/templates/erp/material/material.html

@ -158,6 +158,9 @@
return $.table.imageView(value);
}
},
{title: '使用状态',field: 'useStatus',
formatter: function(value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);}
},
{title: '<span style="color: red;">申请人</span>',field: 'applyUserName',
formatter: function(value, row, index) {return '<span style="color: red;">' + (value ? value : "-") + '</span>';}
},
@ -175,9 +178,6 @@
{title: '审核状态',field: 'auditStatus',visible: false,
formatter: function(value, row, index) {return $.table.selectDictLabel(auditStatusDatas, value);}
},
{title: '使用状态',field: 'useStatus',visible: false,
formatter: function(value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);}
},
{title: '工程员',field: 'businessMembers',visible: false},
{title: '关联bom号',field: 'bomNo',visible: false},
{title: '物料类型',field: 'materialType',visible: false,
@ -189,7 +189,7 @@
},
{title: '技术团队id',field: 'productItem',visible: false,},
{title: '技术团队名称',field: 'itemName',visible: false},
{title: '录入时间',field: 'createTime',visible: false},
{title: '录入时间',field: 'createTime',sortable: true},
{title: '更新人',field: 'updateBy',visible: false},
{title: '删除标志', field: 'delFlag',visible: false},
{title: '入库部门', field: 'warehouseDept',visible: false,

6
ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html

@ -71,10 +71,10 @@
<div class="col-sm-8">
<!-- 报价币种单选按钮 -->
<div class="radio-inline">
<label><input type="radio" name="confirmTax" value="0">不含税</label>
<label><input type="radio" name="confirmTax" value="0" disabled>不含税</label>
</div>
<div class="radio-inline">
<label><input type="radio" name="confirmTax" value="1">含税</label>
<label><input type="radio" name="confirmTax" value="1" disabled>含税</label>
</div>
</div>
</div>
@ -117,7 +117,7 @@
</div>
</div>
<div class="container">
<div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label><input class="col-sm-4" name="enterprise" id="enterprise_edit" type="text" readonly/>

13
ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html

@ -71,17 +71,16 @@
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-warning" onclick="exportCustomerQuoteOne()" shiro:hasPermission="system:customerQuote:exportCustomerQuoteOne">
<i class="fa fa-download"></i> 导出客户报价1
<i class="fa fa-download"></i> 导出Vantritek-RMB
</a>
<a class="btn btn-warning" onclick="exportCustomerQuoteTwo()" shiro:hasPermission="system:customerQuote:exportCustomerQuoteTwo">
<i class="fa fa-download"></i> 导出客户报价2
<i class="fa fa-download"></i> 导出Vantritek-美元
</a>
<a class="btn btn-warning" onclick="exportCustomerQuoteThree()" shiro:hasPermission="system:customerQuote:exportCustomerQuoteThree">
<i class="fa fa-download"></i> 导出客户报价3
<i class="fa fa-download"></i> 导出Infinity-RMB
</a>
<a class="btn btn-warning" onclick="exportCustomerQuoteFour()" shiro:hasPermission="system:customerQuote:exportCustomerQuoteFour">
<i class="fa fa-download"></i> 导出客户报价4
<i class="fa fa-download"></i> 导出Infinity-美元
</a>
</div>
<div class="col-sm-12 select-table table-striped">
@ -410,7 +409,7 @@
// 检查是否已审核
if (row.auditStatus === AUDIT_STATUS_APPROVED) {
if (row.commonCurrency === '2'){
if (row.commonCurrency === '1'){
// 使用 $.modal.confirm 显示确认对话框
$.modal.confirm("确定导出这条数据的客户报价吗?", function() {
// 如果用户点击确定,继续导出
@ -419,7 +418,7 @@
$('#bootstrap-table').bootstrapTable('refresh'); // 刷新表格
});
}else {
showWarning("请选择报价币种为美元的数据进行导出");
showWarning("请选择报价币种为RMB的数据进行导出");
}
} else {
showWarning("请先审核");

8
ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html

@ -58,11 +58,11 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">是否含税:</label>
<div class="col-sm-6">
<label class="col-sm-4 control-label is-required">是否含税:</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">
<input required type="radio" th:id="${'confirmTax_' + dict.dictCode}"
name="confirmTax" th:value="${dict.dictValue}" th:field="*{confirmTax}" th:checked="${dict.isDefault == 'Y' ? true : false}">
name="confirmTax" th:value="${dict.dictValue}" th:field="*{confirmTax}" th:checked="${dict.isDefault == 'Y' ? true : false}" disabled>
<label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
@ -92,7 +92,7 @@
<textarea readonly name="remark" th:field="*{remark}" class="form-control"></textarea>
</div>
</div>
<div class="container">
<div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class="col-sm-2">物料合计:</label><input class="col-sm-4" name="enterprise" id="enterprise_detail" th:field="*{enterprise}" type="text" disabled/>

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html

@ -92,7 +92,7 @@
<textarea readonly name="remark" th:field="*{remark}" class="form-control"></textarea>
</div>
</div>
<div class="container">
<div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label><input class="col-sm-4" name="enterprise" id="enterprise_edit" type="text" readonly/>

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html

@ -130,7 +130,7 @@
</div>
<input type="hidden" name="customerQuoteChildList" >
<div class="container">
<div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label><input class="col-sm-4" name="enterprise" id="enterprise_edit" th:field="*{enterprise}" type="text" disabled/>

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html

@ -139,7 +139,7 @@
<input type="hidden" name="customerQuoteChildList" >
<div class="container">
<div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label><input class="col-sm-4" name="enterprise" id="enterprise_edit" th:field="*{enterprise}" type="text" disabled/>

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html

@ -140,7 +140,7 @@
<input type="hidden" name="customerQuoteChildList" >
<div class="container">
<div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label><input class="col-sm-4" name="enterprise" id="enterprise_edit" th:field="*{enterprise}" type="text" disabled/>

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html

@ -141,7 +141,7 @@
<input type="hidden" name="customerQuoteChildList" >
<div class="container">
<div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label><input class="col-sm-4" name="enterprise" id="enterprise_edit" th:field="*{enterprise}" type="text" disabled/>

6
ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html

@ -197,10 +197,10 @@
<div class="col-sm-8">
<!-- 报价币种单选按钮 -->
<div class="radio-inline">
<label><input type="radio" name="confirmTax" value="0">不含税</label>
<label><input type="radio" name="confirmTax" value="0" disabled>不含税</label>
</div>
<div class="radio-inline">
<label><input type="radio" name="confirmTax" value="1">含税</label>
<label><input type="radio" name="confirmTax" value="1" disabled>含税</label>
</div>
</div>
</div>
@ -271,7 +271,7 @@
<!-- </select>-->
</div>
</div>
<div class="container">
<div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label><input class="col-sm-4" name="materialSum" id="enterprise_add" type="text" readonly/>

2
ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html

@ -279,7 +279,7 @@
<input name="businessMembers" th:field="*{businessMembers}" class="form-control" type="text" disabled>
</div>
</div>
<div class="container">
<div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label><input class="col-sm-4" name="materialSum" type="number" th:field="*{materialSum}" readonly/>

2
ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html

@ -283,7 +283,7 @@
</select>
</div>
</div>
<div class="container">
<div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label><input class="col-sm-4" name="materialSum" id="enterprise_edit" type="number" th:field="*{materialSum}" readonly/>

2
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html

@ -248,7 +248,7 @@
<input name="businessMembers" class="form-control m-b" th:field="*{businessMembers}" readonly required>
</div>
</div>
<div class="container">
<div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label>

2
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html

@ -267,7 +267,7 @@
<textarea name="comment" class="form-control"></textarea>
</div>
</div>
<div class="container">
<div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label>

2
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html

@ -266,7 +266,7 @@
<textarea name="comment" class="form-control"></textarea>
</div>
</div>
<div class="container">
<div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label>

2
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

@ -266,7 +266,7 @@
<textarea name="comment" class="form-control"></textarea>
</div>
</div>
<div class="container">
<div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label>

Loading…
Cancel
Save