diff --git a/src/main/java/com/spring/modules/part/entity/BomComponentEntity.java b/src/main/java/com/spring/modules/part/entity/BomComponentEntity.java
index e2a4322a..ce24e049 100644
--- a/src/main/java/com/spring/modules/part/entity/BomComponentEntity.java
+++ b/src/main/java/com/spring/modules/part/entity/BomComponentEntity.java
@@ -3,7 +3,9 @@ package com.spring.modules.part.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.spring.common.utils.QueryPage;
+import com.spring.modules.part.util.BigDecimalSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -47,10 +49,12 @@ public class BomComponentEntity extends QueryPage implements Serializable {
     /**
      * 单位用量
      **/
+    @JsonSerialize(using = BigDecimalSerializer.class)
     private BigDecimal qtyPerAssembly;
     /**
      * 调机量
      **/
+    @JsonSerialize(using = BigDecimalSerializer.class)
     private BigDecimal componentScrap;
     /**
      * 生产属性（倒冲方式）
diff --git a/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java b/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java
index 9c3e08b9..5564390b 100644
--- a/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java
+++ b/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java
@@ -160,7 +160,7 @@ public interface PartInformationMapper extends BaseMapper<PartInformationEntity>
 
     TransNoControlData getTranNoData(String site, String projectPartNo);
 
-    PartInformationVo getProjectPartRow(PlmProjectPartData inData);
+    PartInformationVo getProjectPartRow(@Param("site") String site, @Param("partNo") String partNo);
 
     void saveCustomerPartInfo(PartInformationEntity data);
 
diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
index 9047fe63..a2061ef0 100644
--- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
@@ -1713,9 +1713,13 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
      */
     @Override
     public PartInformationVo getProjectPartRow(PlmProjectPartData inData) {
-        PartInformationVo part =  partInformationMapper.getProjectPartRow(inData);
         TransNoControlData noData = partInformationMapper.getTranNoData(inData.getSite(), "project_part_no");
         int a = noData.getTransNo().length() + noData.getLength();
+
+        // 根据配置截取物料编码
+        String partNo = inData.getTestPartNo().substring(0, a);
+        PartInformationVo part =  partInformationMapper.getProjectPartRow(inData.getSite(), partNo);
+
         if (0 < (Integer.parseInt(part.getPartNo().substring(a + 1)) + 1) && (Integer.parseInt(part.getPartNo().substring(a + 1)) + 1) < 10) {
             part.setPartNo(part.getPartNo().substring(0, a + 1) + "0" +(Integer.parseInt(part.getPartNo().substring(a + 1)) + 1));
         } else {
diff --git a/src/main/java/com/spring/modules/part/util/BigDecimalSerializer.java b/src/main/java/com/spring/modules/part/util/BigDecimalSerializer.java
new file mode 100644
index 00000000..4de9a6d0
--- /dev/null
+++ b/src/main/java/com/spring/modules/part/util/BigDecimalSerializer.java
@@ -0,0 +1,20 @@
+package com.spring.modules.part.util;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+
+public class BigDecimalSerializer extends JsonSerializer<BigDecimal> {
+    @Override
+    public void serialize(BigDecimal value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        if (value != null) {
+            gen.writeString(value.stripTrailingZeros().toPlainString());
+            //gen.writeString(value.toPlainString());
+        } else {
+            gen.writeNull();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index 2e5b7908..93ae4ec0 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -1080,8 +1080,8 @@
     </select>
 
     <!-- 材料信息列表 -->
-    <select id="getProjectPartRow" parameterType="PlmProjectPartData" resultType="com.spring.modules.part.vo.PartInformationVo">
-        SELECT
+    <select id="getProjectPartRow" resultType="com.spring.modules.part.vo.PartInformationVo">
+        SELECT top 1
         site,
         part_no,
         part_desc,
@@ -1175,7 +1175,8 @@
         update_date,
         update_by
         FROM part
-        where site = #{site} and part_no = #{testPartNo}
+        where site = #{site} and part_no like #{partNo} + '%'
+        order by create_date desc
     </select>
 
     <!-- 材料信息列表 -->