修改

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -2272,8 +2272,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             List<Map<String, Object>> materialId = omstruckOrderMapper.getMaterialId(orderId);
             for (Map<String, Object> stringObjectMap : materialMesNew) {
                 for (Map<String, Object> objectMap : materialId) {
-                    BigDecimal materialId2 = DataChange.dataToBigDecimal(stringObjectMap.get("materialId"));
-                    BigDecimal materialId1 = (BigDecimal) objectMap.get("materialId");
+                    BigDecimal materialId2 = DataChange.dataToBigDecimal(stringObjectMap.get("saleMaterialId"));
+                    BigDecimal materialId1 = (BigDecimal) objectMap.get("saleMaterialId");
                     if (materialId2.compareTo(materialId1)==0){
                         //钢材长度
                         BigDecimal steelmeter = (BigDecimal) objectMap.get("steelmeter");

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -3057,6 +3057,7 @@
     <select id="getMaterialId" resultType="java.util.Map">
         select
         distinct
+        AMS.SALE_MATERIAL_ID  "saleMaterialId",
         AMS.MATERIAL_ID "materialId",
         AMS.STEEL_METER "steelmeter"
         from OMSTRUCK_ORDER_MATERIAL OOM
@@ -4494,6 +4495,7 @@
         "materialName",
         RM.MATERIAL_ID   "materialId",
         OOM.MATERIAL_PRIORITY "materialPriority",
+        OOM.SALE_MATERIAL_ID    "saleMaterialId",
         CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
         (case
         when OOM.ORDER_MATERIAL_NUMBER is not null