修改

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

@@ -619,7 +619,7 @@
         <if test="con!=null and con!=''.toString()">
             and rm.MATERIAL_NAME || rp.PORT_NAME || db.RESULT_FOREIGN_SHIP_NAME like CONCAT(CONCAT('%',#{con}),'%')
         </if>
-        ORDER BY  DECODE(BR."remark",'低富粉',1,'中富粉',2,'高富粉',3,'机精粉',4 ,'进口块矿',5,6),rm.MATERIAL_NAME
+        ORDER BY  DECODE(BR."remark",'低富粉',3,'中富粉',2,'高富粉',1,'机精粉',4 ,'进口块矿',5,6),rm.MATERIAL_NAME
         )
         <where>
             "gmTonnage" > 0 or "afterTonnage" > 0
@@ -877,7 +877,7 @@
                 ) temp2 ON temp2."remark"=NVL(ADN.RESULT_MEMO,'进口块矿')
                 WHERE LT."gmTonnage" > 0 AND ADN.DELETED=0 AND ADA.DELETED=0
         )
-        ORDER BY DECODE("type",'低富粉',1,'中富粉',2,'高富粉',3,'机精粉',4 ,'进口块矿',5,6),"batchInfactoryId","batchId"
+        ORDER BY DECODE("type",'低富粉',3,'中富粉',2,'高富粉',1,'机精粉',4 ,'进口块矿',5,6),"batchInfactoryId","batchId"
     </select>
     <select id="selectAllShip" resultType="java.util.Map">
         SELECT * FROM (
@@ -1021,6 +1021,6 @@
                           )
                       )
         WHERE "gmTonnage" > 0
-        ORDER BY DECODE("type",'低富粉',1,'中富粉',2,'高富粉',3,'机精粉',4 ,'进口块矿',5,6),"batchId" DESC
+        ORDER BY DECODE("type",'低富粉',3,'中富粉',2,'高富粉',1,'机精粉',4 ,'进口块矿',5,6),"batchId" DESC
     </select>
 </mapper>