Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAL-DAZHOU-WMSH-API

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

@@ -361,7 +361,7 @@
         LEFT JOIN RMS_PORT rp
         ON rp.PORT_ID = wgm.PORT_ID
         WHERE wgm.DELETED = 0
-        AND rp.PORT_TYPE_ID = 1
+        AND rp.PORT_NAME ! = '万州港'
         )
         <where>
             <if test="portName != null">
@@ -407,7 +407,7 @@
         LEFT JOIN RMS_PORT rp
         ON rp.PORT_ID = wgm.PORT_ID
         WHERE wgm.DELETED = 0
-        AND rp.PORT_TYPE_ID != 1
+        and RP.PORT_NAME = '万州港'
         )
         <where>
             <if test="portName != null">