From 68d6ddbe1610b66e75ee05ad75998ce1a3caadba Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 29 一月 2026 16:30:35 +0800
Subject: [PATCH] 不合格管理：重新提交oa功能调整
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
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 b203491..b77a7fd 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
@@ -1745,6 +1745,22 @@
}
/**
+ * 浣跨敤姝ｅ垯琛ㄨ揪寮忓幓闄ゅ瓧绗︿覆鏈�鍚庝竴涓�"-"鍙婂叾鍚庨潰鐨勬墍鏈夊唴瀹�
+ * @param str 寰呭鐞嗙殑瀛楃涓诧紙鍏佽涓簄ull锛�
+ * @return 澶勭悊鍚庣殑瀛楃涓诧紝null杩斿洖null锛屾棤"-"杩斿洖鍘熷瓧绗︿覆
+ */
+ public static String removeLastHyphenAndContent(String str) {
+ // 绌哄�兼牎楠岋細閬垮厤NullPointerException
+ if (str == null || str.isEmpty()) {
+ return str;
+ }
+ // 姝ｅ垯琛ㄨ揪寮忥細鍖归厤鏈�鍚庝竴涓�"-"鍙婂叾鍚庨潰鐨勬墍鏈夊唴瀹�
+ String regex = "-[^-]*$";
+ // 鏇挎崲鍖归厤鐨勫唴瀹逛负绌哄瓧绗︿覆
+ return str.replaceAll(regex, "");
+ }
+
+ /**
* 灏忔姤鍛婄敓鎴�
*
* @param orderId
@@ -1767,7 +1783,7 @@
IfsPartPropsRecord ifsPartPropsRecord = ifsPartPropsRecordMapper.selectOne(Wrappers.<IfsPartPropsRecord>lambdaQuery()
.eq(IfsPartPropsRecord::getIfsInventoryId, ifsInventoryQuantity.getId()));
if (Objects.nonNull(ifsPartPropsRecord)) {
- enterFactoryReport.setOuterColor(ifsPartPropsRecord.getOuterColor());
+ enterFactoryReport.setOuterColor(StringUtils.equals(ifsPartPropsRecord.getOuterColor(),"/")?ifsPartPropsRecord.getInsulationColor():ifsPartPropsRecord.getOuterColor());
}
enterFactoryReport.setQtyArrived(ifsInventoryQuantity.getQtyArrived() == null ? "" :
ifsInventoryQuantity.getQtyArrived().stripTrailingZeros().toPlainString() + ifsInventoryQuantity.getBuyUnitMeas());
@@ -1812,7 +1828,7 @@
//鏌ヨ妫�楠屽崟娑堟伅
InsSampleUserVO insSampleUser = insSampleUserMapper.selectUserNameByOrderId(orderId);
if (Objects.nonNull(insSampleUser)) {
- enterFactoryReport.setPartDesc(insSampleUser.getModel());
+ enterFactoryReport.setPartDesc(removeLastHyphenAndContent(insSampleUser.getModel()));
enterFactoryReport.setInspector(insSampleUser.getInspector());
enterFactoryReport.setInspectDate(insSampleUser.getInspectDate());
}
--
Gitblit v1.9.3