From 4f1c94e8610790b9cc20ea94e8d06753f41a589c Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Mon, 20 May 2024 14:31:20 +0800 Subject: [PATCH] '123' --- ABAP_AS_WITH_POOL.jcoDestination | 4 +- .../priceVerification/domain/QuotHj.java | 5 -- .../main/java/com/ruoyi/quot/domain/Quot.java | 10 ++- .../com/ruoyi/quot/domain/QuotMaterial.java | 34 +++++----- .../technicalConfirm/domain/QuotJsqr.java | 5 -- .../main/resources/mapper/quot/QuotMapper.xml | 2 +- ruoyi-ui/src/utils/number.js | 63 +++++++++++++++++++ ruoyi-ui/src/views/quot/quot/index.vue | 38 ++++++++++- ruoyi-ui/src/views/redBook/productSelect.vue | 4 +- 9 files changed, 125 insertions(+), 40 deletions(-) create mode 100644 ruoyi-ui/src/utils/number.js diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination index aea596a..c7a3327 100644 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -1,5 +1,5 @@ #for tests only ! -#Mon May 20 09:55:44 CST 2024 +#Mon May 20 13:09:39 CST 2024 jco.destination.pool_capacity=10 jco.client.lang=ZH jco.client.ashost=172.19.0.120 @@ -7,5 +7,5 @@ jco.client.saprouter= jco.client.user=RFC jco.client.sysnr=00 jco.destination.peak_limit=10 -jco.client.passwd=g`M`]ixGphtxcJ7cLz3bg5/RJZR#xvA_i#ndU1#hGjtXf7rR +jco.client.passwd=dZ:kRfA{dgU`sub#+3T]H6aOCHVj9d94]yQ__F^^y$n+#PX/ jco.client.client=300 diff --git a/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java b/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java index a93a047..76f0527 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java +++ b/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java @@ -21,23 +21,18 @@ public class QuotHj extends BaseEntity private String quotHjId; /** 核价单号 */ - @Excel(name = "核价单号") private String quotHjCode; /** 核价类型 */ - @Excel(name = "核价类型") private String quotHjPricingType; /** 核价日期 */ - @Excel(name = "核价日期",dateFormat = "yyyy-MM-dd hh:MM:ss") private Date quotHjPricingDate; /** 备注 */ - @Excel(name = "备注") private String quotHjRemark; /** 备注 */ - @Excel(name = "核价协助状态") private String quotHjApprovalStatus; /** 创建人 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java index 85095eb..c05aab0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java @@ -61,6 +61,10 @@ public class Quot extends BaseEntity @Excel(name = "报价日期",dateFormat = "yyyy-MM-dd hh:MM:ss") private Date quotQuotationDate; + /** 数量 */ + @Excel(name = "数量") + private String quotQuantity; + /** 报价来源 */ private String quotQuotationFrom; @@ -72,12 +76,7 @@ public class Quot extends BaseEntity @Excel(name = "反馈说明") private String quotFeedbackExplanation; - /** 数量 */ - @Excel(name = "数量") - private String quotQuantity; - /** 总价 */ - @Excel(name = "总价") private String quotTotalPrice; /** 审核人账号 */ @@ -92,7 +91,6 @@ public class Quot extends BaseEntity private String quotApprovalStatus; /** 创建人 */ - @Excel(name = "创建人") private String createName; diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotMaterial.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotMaterial.java index 678977a..259deec 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotMaterial.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotMaterial.java @@ -5,9 +5,11 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; + /** * 报价单-产品对象 quot_material - * + * * @author ruoyi * @date 2024-04-01 */ @@ -31,71 +33,71 @@ public class QuotMaterial extends BaseEntity private String matDanw; /** 数量 */ - private Long matSl; + private BigDecimal matSl; /** */ private String quotId; - public void setMatId(String matId) + public void setMatId(String matId) { this.matId = matId; } - public String getMatId() + public String getMatId() { return matId; } - public void setMatXingh(String matXingh) + public void setMatXingh(String matXingh) { this.matXingh = matXingh; } - public String getMatXingh() + public String getMatXingh() { return matXingh; } - public void setMatGuig(String matGuig) + public void setMatGuig(String matGuig) { this.matGuig = matGuig; } - public String getMatGuig() + public String getMatGuig() { return matGuig; } - public void setMatDiany(String matDiany) + public void setMatDiany(String matDiany) { this.matDiany = matDiany; } - public String getMatDiany() + public String getMatDiany() { return matDiany; } - public void setMatDanw(String matDanw) + public void setMatDanw(String matDanw) { this.matDanw = matDanw; } - public String getMatDanw() + public String getMatDanw() { return matDanw; } - public void setMatSl(Long matSl) + public void setMatSl(BigDecimal matSl) { this.matSl = matSl; } - public Long getMatSl() + public BigDecimal getMatSl() { return matSl; } - public void setQuotId(String quotId) + public void setQuotId(String quotId) { this.quotId = quotId; } - public String getQuotId() + public String getQuotId() { return quotId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java index eee44cb..3dbcb31 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java +++ b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java @@ -19,11 +19,9 @@ public class QuotJsqr extends BaseEntity private String quotJsqrId; /** 技术确认单编号 */ - @Excel(name = "技术确认单编号") private String quotJsqrCode; /** 特缆协助状态 */ - @Excel(name = "特缆协助状态") private String quotJsqrTlApprovalStatus; /** 特缆操作人 */ @@ -63,7 +61,6 @@ public class QuotJsqr extends BaseEntity private String quotJsqrTlLeaderRemark; /** 低压协助状态 */ - @Excel(name = "低压协助状态") private String quotJsqrDyApprovalStatus; /** 低压操作人 */ @@ -103,7 +100,6 @@ public class QuotJsqr extends BaseEntity private String quotJsqrDyLeaderRemark; /** 中压协助状态 */ - @Excel(name = "中压协助状态") private String quotJsqrZyApprovalStatus; /** 中压操作人 */ @@ -143,7 +139,6 @@ public class QuotJsqr extends BaseEntity private String quotJsqrZyLeaderRemark; /** 其他协助状态 */ - @Excel(name = "其他协助状态") private String quotJsqrQtApprovalStatus; /** 其他操作人 */ diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index 9c532d8..6653bb1 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -285,7 +285,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into quot_material( mat_id, mat_xingh, mat_guig, mat_diany, mat_danw, mat_sl, quot_id) values - ( #{item.matId}, #{item.matXingh}, #{item.matGuig}, #{item.matDiany}, #{item.matDanw}, #{item.matSl}, #{item.quotId}) + ( #{item.matId}, #{item.matXingh}, #{item.matGuig}, #{item.matDiany}, #{item.matDanw}, cast(#{item.matSl,jdbcType=DECIMAL} as decimal(18,3)), #{item.quotId}) diff --git a/ruoyi-ui/src/utils/number.js b/ruoyi-ui/src/utils/number.js new file mode 100644 index 0000000..3f3f63b --- /dev/null +++ b/ruoyi-ui/src/utils/number.js @@ -0,0 +1,63 @@ +/** 加法 */ +export function NumberAdd(arg1, arg2) { + let r1, r2, m, n; + try { + r1 = arg1.toString().split(".")[1].length + } catch (e) { + r1 = 0 + } + try { + r2 = arg2.toString().split(".")[1].length + } catch (e) { + r2 = 0 + } + m = Math.pow(10, Math.max(r1, r2)) + n = (r1 >= r2) ? r1 : r2 + return ((arg1 * m + arg2 * m) / m).toFixed(n) +} +/** 减法 */ +export function NumberSub(arg1, arg2) { + let re1, re2, m, n; + try { + re1 = arg1.toString().split(".")[1].length + } catch (e) { + re1 = 0; + } + try { + re2 = arg2.toString().split(".")[1].length + } catch (e) { + re2 = 0 + } + m = Math.pow(10, Math.max(re1, re2)); + n = (re1 >= re2) ? re1 : re2; + return ((arg1 * m - arg2 * m) / m).toFixed(n) +} +/** 乘法 */ +export function NumberMul(arg1, arg2) { + let m = 0; + const s1 = arg1.toString(); + const s2 = arg2.toString(); + try { + m += s1.split('.')[1].length + } catch (e) {} + try { + m += s2.split('.')[1].length + } catch (e) {} + + return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m) +} + +/** 除法 */ +export function NumberDiv(arg1,arg2,digit){ + let t1 = 0, t2 = 0, r1, r2; + try{t1=arg1.toString().split(".")[1].length}catch(e){} + try{t2=arg2.toString().split(".")[1].length}catch(e){} + r1=Number(arg1.toString().replace(".","")) + r2=Number(arg2.toString().replace(".","")) + //获取小数点后的计算值 + var result= ((r1/r2)*Math.pow(10,t2-t1)).toString() + var result2=result.split(".")[1] + result2=result2.substring(0,digit>result2.length?result2.length:digit) + return Number(result.split(".")[0]+"."+result2) +} + diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index c74ce83..16ede6f 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -114,6 +114,7 @@ {{ parseTime(scope.row.quotQuotationDate) }} +