修改万州港存库

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

@@ -398,7 +398,8 @@
         SELECT rp.PORT_NAME as "portName",
         rm.MATERIAL_NAME as "materialName",
         db.RESULT_FOREIGN_SHIP_NAME as "resultForeignShipName",
-        wgm.GM_TONNAGE as "gmTonnage"
+        wgm.GM_TONNAGE as "gmTonnage",
+        temp."gmTonnage" as "totalTonnage"
         FROM WMSH_GRID_MATERIAL wgm
         LEFT JOIN DIL_BATCH db
         ON db.BATCH_ID = wgm.BATCH_ID
@@ -406,6 +407,22 @@
         ON rm.MATERIAL_ID = db.MATERIAL_ID
         LEFT JOIN RMS_PORT rp
         ON rp.PORT_ID = wgm.PORT_ID
+        LEFT JOIN (
+        SELECT
+        sum( wgm.GM_TONNAGE ) AS "gmTonnage",
+        rm.material_name "materialName"
+        FROM
+        WMSH_GRID_MATERIAL wgm
+        LEFT JOIN DIL_BATCH db ON db.BATCH_ID = wgm.BATCH_ID
+        LEFT JOIN RMS_MATERIAL rm ON rm.MATERIAL_ID = db.MATERIAL_ID
+        LEFT JOIN RMS_PORT rp ON rp.PORT_ID = wgm.PORT_ID
+        WHERE
+        wgm.DELETED = 0
+        and rp.PORT_NAME = '万州港'
+        GROUP BY
+        rm.MATERIAL_NAME
+        ) temp
+        on temp."materialName"=rm.MATERIAL_NAME
         WHERE wgm.DELETED = 0
         and RP.PORT_NAME = '万州港'
         <if test="con!=null">
@@ -461,9 +478,8 @@
                 LEFT JOIN RMS_PORT rp ON rp.PORT_ID = wgm.PORT_ID
         WHERE
             wgm.DELETED = 0
-            AND RP.PORT_NAME = '万州港'
         <if test="con!=null">
-            and instr(rm.MATERIAL_NAME,#{con}) > 0
+            and (instr(rm.MATERIAL_NAME,#{con}) > 0 OR  instr(RP.PORT_NAME,#{con}) > 0)
         </if>
         GROUP BY
             rm.MATERIAL_NAME