修改

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

@@ -114,6 +114,7 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int clearWmshGridMaterial(Map<String, Object> map) {
         int i=0;
         BigDecimal gmId =DataChange.dataToBigDecimal(map.get("gmId"));

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

@@ -400,6 +400,8 @@
         rm.MATERIAL_NAME as "materialName",
         db.RESULT_FOREIGN_SHIP_NAME as "resultForeignShipName",
         wgm.BATCH_ID as "batchId",
+        wgm.GM_ID "gmId",
+        wgm.PORT_ID "portId",
         wgm.GM_TONNAGE as "afterTonnage",--点后实时批次库存
         case when AfterIn."sumIn"  is not null and AfterOut."sumOut" is not null
             then wgm.GM_TONNAGE-AfterIn."sumIn"+AfterOut."sumOut"
@@ -521,13 +523,13 @@
         GROUP BY WOR.BATCH_ID) AfterOut ON AfterOut."batchId"=WGM.BATCH_ID
         WHERE wgm.DELETED = 0
         and RP.PORT_NAME = '万州港'
-        and wgm.GM_TONNAGE > 0
-        <if test="con!=null">
+        <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  rm.MATERIAL_NAME
         )
         <where>
+            "gmTonnage" > 0 or "afterTonnage" > 0
             <if test="portName != null">
                 and
                 <foreach collection="portName" item="item" open="(" separator="," close=")">