From 82f614e4646aeb179927dd82ccf0097a671dce48 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 03 七月 2026 14:19:38 +0800
Subject: [PATCH] 外购下单：出厂检验报告检验值小数位数生成错误问题修复
---
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 2 ++
basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java | 6 ++++++
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 20 ++++++++++----------
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
index 624c48b..ab29c9c 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
@@ -56,6 +56,9 @@
@ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
private String enterUrlS;
+ @ApiModelProperty("杩涘巶鎶ュ憡瀹℃壒鐘舵��(1:鎵瑰噯閫氳繃锛�0锛氭壒鍑嗕笉閫氳繃)")
+ private Integer enterRatifyStatus;
+
// 瀛ｅ害
@ApiModelProperty("瀛ｅ害璁㈠崟id")
private Integer quarterOrderId;
@@ -69,6 +72,9 @@
@ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
private String quarterUrlS;
+ @ApiModelProperty("瀛ｅ害妫�楠屾姤鍛婂鎵圭姸鎬�(1:鎵瑰噯閫氳繃锛�0锛氭壒鍑嗕笉閫氳繃)")
+ private Integer quarterRatifyStatus;
+
private Integer orderState;
@ApiModelProperty("涓嬪彂鏃堕棿")
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index 432cf08..e1b9829 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -282,10 +282,12 @@
ir1.id enter_report_id,
ir1.url enter_url,
ir1.url_s enter_url_s,
+ ir1.is_ratify enter_ratify_status,
io2.id quarter_order_id,
ir2.id quarter_report_id,
ir2.url quarter_url,
ir2.url_s quarter_url_s,
+ ir2.is_ratify quarter_ratify_status,
group_concat(distinct isa.sample_code, ' ') sample_code,
group_concat(distinct isa.sample, ' ') sample_name,
group_concat(distinct isa.model, ' ') sample_model,
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 621ddeb..5257381 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -4360,17 +4360,17 @@
}
- private static int getDecimalPlaces(String str) {
- // 鏌ユ壘灏忔暟鐐逛綅缃�
- int decimalPointIndex = str.lastIndexOf('.');
-
- if (decimalPointIndex == -1) {
- // 濡傛灉娌℃湁灏忔暟鐐癸紝杩斿洖0浣嶅皬鏁�
- return 0;
+ private static int getDecimalPlaces(String str) {
+ // 浣跨敤姝ｅ垯鍖归厤鎵�鏈夊甫灏忔暟鐐圭殑鏁板瓧锛屽彇鏈�澶у皬鏁颁綅鏁�
+ java.util.regex.Matcher matcher = Pattern.compile("\\d+\\.(\\d+)").matcher(str);
+ int maxDecimalPlaces = 0;
+ while (matcher.find()) {
+ int places = matcher.group(1).length();
+ if (places > maxDecimalPlaces) {
+ maxDecimalPlaces = places;
+ }
}
-
- // 璁＄畻灏忔暟鐐瑰悗鐨勪綅鏁�
- return str.length() - decimalPointIndex - 1;
+ return maxDecimalPlaces;
}
/**
--
Gitblit v1.9.3