From 60b5b26185fc3cc379ef14dbfbf60d420ac342b5 Mon Sep 17 00:00:00 2001
From: maxiangong <298222784@qq.com>
Date: Fri, 22 May 2026 19:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A7MES=E7=BB=93=E7=AE=97=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/oem/pojo/entity/OemStatementEntity.java          | 2 +-
 .../springblade/desk/oem/mapper/OemStatementMapper.xml    | 2 +-
 .../desk/oem/service/impl/OemStatementServiceImpl.java    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemStatementEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemStatementEntity.java
index c0fd76ac1..35f061140 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemStatementEntity.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemStatementEntity.java
@@ -82,7 +82,7 @@ public class OemStatementEntity extends BaseEntity {
      * 镀层厚度
      */
     @Schema(description = "镀层厚度")
-    private BigDecimal rosThickness;
+    private String rosThickness;
     /**
      * 结算单价
      */
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml
index 1b7cd1229..5b525e31f 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml
@@ -395,7 +395,7 @@
         to_char(d.put_store_time, 'yyyy-MM-dd') as PUT_STORE_DATE,
         d.make_qty,
         d.make_qty * e.po_area as total_area,
-        TO_NUMBER(p.plate_thickness) as ROS_THICKNESS,
+        p.plate_thickness as ROS_THICKNESS,
         p.plate_thickness,
         e.plate,
         e.part_code,
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java
index b3b9f0fb3..70a7ccf80 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java
@@ -1023,7 +1023,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
     private boolean rulePlateThickness(StatementVO statementVO) {
         List<PriceSheetVO> priceSheetList = statementVO.getPriceSheetList();
         //结算单的镀层厚度维度分匹配报价的物料号,
-        String plateThickness = statementVO.getPlateThickness();
+        String plateThickness = statementVO.getRosThickness();
         if (StringUtils.isEmpty(plateThickness)) {
             return false;
         }
@@ -1433,7 +1433,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
         }
         // ====================== 规则3：仅【工序+镀层厚度】，其他null ======================
         for (OemStandardProcessEntity s : allStandardList) {
-            boolean rule3 = Objects.equals(s.getProcessId(), statementVO.getPpsId()) && StringUtils.isEmpty(s.getPlate()) && StringUtils.equals(s.getPlateThickness(), statementVO.getPlateThickness()) && StringUtils.isEmpty(s.getPartName());
+            boolean rule3 = Objects.equals(s.getProcessId(), statementVO.getPpsId()) && StringUtils.isEmpty(s.getPlate()) && StringUtils.equals(s.getPlateThickness(), statementVO.getRosThickness()) && StringUtils.isEmpty(s.getPartName());
             if (rule3) return s;
         }
         // ====================== 规则4：仅【工序+零件名】，其他null ======================
@@ -1445,7 +1445,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
 
         // ====================== 规则5：【工序+镀层厚度+零件名】，镀种null ======================
         for (OemStandardProcessEntity s : allStandardList) {
-            boolean rule5 = Objects.equals(s.getProcessId(), statementVO.getPpsId()) && StringUtils.isEmpty(s.getPlate()) && StringUtils.equals(s.getPlateThickness(), statementVO.getPlateThickness()) && StringUtils.equals(s.getPartName(), statementVO.getPartName());
+            boolean rule5 = Objects.equals(s.getProcessId(), statementVO.getPpsId()) && StringUtils.isEmpty(s.getPlate()) && StringUtils.equals(s.getPlateThickness(), statementVO.getRosThickness()) && StringUtils.equals(s.getPartName(), statementVO.getPartName());
             if (rule5) return s;
         }
         return null;
@@ -2184,7 +2184,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             // 镀种
             entity.setPlate(vo.getPlate());
             // 镀层厚度1
-            entity.setRosThickness(new BigDecimal(vo.getPlateThickness() != null ? vo.getPlateThickness() : "0"));
+            entity.setRosThickness(vo.getRosThickness());
             // 单件面积
             entity.setYpArea(vo.getYpArea() != null ? vo.getYpArea() : BigDecimal.ZERO);