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 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