修改

src/main/java/com/steerinfo/dil/controller/WmshGridMaterialController.java

@@ -111,7 +111,25 @@ public class WmshGridMaterialController extends BaseRESTfulController {
         return success(data);
     }
 
+    /**
+     * 获取下游港口库存吨位
+     * @param mapVal
+     * @return
+     */
+    @PostMapping(value = "/getDownPortStockList")
+    public RESTfulResult getDownPortStockList(@RequestBody(required = false) Map<String,Object> mapVal){
+        return success(wmshGridMaterialService.getDownPortStockList(mapVal));
+    }
 
+    /**
+     * 获取在途库存信息
+     * @param mapVal
+     * @return
+     */
+    @PostMapping(value = "/getRunStockList")
+    public RESTfulResult getRunStockList(@RequestBody(required = false) Map<String,Object> mapVal){
+        return success(wmshGridMaterialService.getRunStockList(mapVal));
+    }
 
     @ApiOperation(value="船舶动态表展示库存吨位", notes="分页查询")
     @ApiImplicitParams({

src/main/java/com/steerinfo/dil/mapper/WmshGridMaterialMapper.java

@@ -26,6 +26,9 @@ public interface WmshGridMaterialMapper extends IBaseMapper<WmshGridMaterial, Bi
      */
     List<Map<String,Object>> getLoadPortStockList(Map<String, Object> mapVal);
 
+    List<Map<String,Object>> getDownPortStockList(Map<String, Object> mapVal);
+
+    List<Map<String,Object>> getRunStockList(Map<String, Object> mapVal);
     /**
      * 修改实时库存
      * @param wmshGridMaterial

src/main/java/com/steerinfo/dil/service/IWmshGridMaterialService.java

@@ -32,6 +32,15 @@ public interface IWmshGridMaterialService {
      */
     List<Map<String,Object>> getLoadPortStockList(Map<String, Object> mapVal);
 
+    /**
+     * 展示下游港口库存
+     * @param mapVal
+     * @return
+     */
+    List<Map<String,Object>> getDownPortStockList(Map<String, Object> mapVal);
+
+    List<Map<String,Object>> getRunStockList(Map<String, Object> mapVal);
+
     /**
      * 修改实时库存
      * @param map

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

@@ -59,6 +59,16 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
         return wmshGridMaterialMapper.getLoadPortStockList(mapVal);
     }
 
+    @Override
+    public List<Map<String, Object>> getDownPortStockList(Map<String, Object> mapVal) {
+        return wmshGridMaterialMapper.getDownPortStockList(mapVal);
+    }
+
+    @Override
+    public List<Map<String, Object>> getRunStockList(Map<String, Object> mapVal) {
+        return wmshGridMaterialMapper.getRunStockList(mapVal);
+    }
+
     /**
      * 修改实时库存
      * @param map

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

@@ -646,4 +646,88 @@
                            ON RP.PORT_ID=WGM.PORT_ID
         WHERE WGM.BATCH_ID=#{batchId}
     </select>
+    <select id="getDownPortStockList" resultType="java.util.Map">
+        SELECT WGM.GM_ID "gmId",
+               WGM.GM_TONNAGE "gmTonnage",
+               RP.PORT_NAME "portName",
+               RM.MATERIAL_NAME "materialName",
+               DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+               temp."totalTonnage" "totalTonnage"
+        FROM WMSH_GRID_MATERIAL WGM
+                 LEFT JOIN DIL_BATCH DB ON WGM.BATCH_ID=DB.BATCH_ID
+                 LEFT JOIN RMS_PORT RP ON RP.PORT_ID=WGM.PORT_ID
+                 LEFT JOIN RMS_MATERIAL RM ON DB.MATERIAL_ID=RM.MATERIAL_ID
+                 LEFT JOIN DIL_BATCH_INFACOTRY DBI ON DBI.BATCH_ID=DB.BATCH_ID
+                 LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN ON ADN.BATCH_ID=DBI.BATCH_INFACOTRY_ID
+                 LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA ON ADA.BATCH_ID = ADN.BATCH_ID AND ADA.DOWN_SWIM_PORT_ID=WGM.PORT_ID
+                 LEFT JOIN (
+            SELECT
+                RM.MATERIAL_NAME "materialName",
+                SUM(WGM.GM_TONNAGE) "totalTonnage"
+            FROM WMSH_GRID_MATERIAL WGM
+                     LEFT JOIN DIL_BATCH DB ON WGM.BATCH_ID=DB.BATCH_ID
+                     LEFT JOIN RMS_PORT RP ON RP.PORT_ID=WGM.PORT_ID
+                     LEFT JOIN RMS_MATERIAL RM ON DB.MATERIAL_ID=RM.MATERIAL_ID
+                     LEFT JOIN DIL_BATCH_INFACOTRY DBI ON DBI.BATCH_ID=DB.BATCH_ID
+                     LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN ON ADN.BATCH_ID=DBI.BATCH_INFACOTRY_ID
+                     LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA ON ADA.BATCH_ID =ADN.BATCH_ID AND ADA.DOWN_SWIM_PORT_ID=WGM.PORT_ID
+            WHERE WGM.DELETED=0 AND WGM.GM_TONNAGE>0 AND RP.PORT_NAME!='万州港' AND ADN.DELETED=0 AND ADA.DELETED=0
+	AND DBI.BATCH_INFACOTRY_ID IN (
+		SELECT DISTINCT TLSR .BATCH_ID
+		FROM TMSSHIP_LOAD_SHIP_RESULT TLSR
+		LEFT JOIN TMSSHIP_TOTAL_RESULT TLR ON  TLR.RESULT_ID=TLSR.TOTAL_RESULT_ID
+		LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY OIC ON OIC.INSTRUCTIONS_CAPACITY_ID=TLR.ORDER_ID
+		WHERE OIC.DELETED=0
+	)
+            GROUP BY RM.MATERIAL_NAME
+        ) temp ON temp."materialName" = RM.MATERIAL_NAME
+        WHERE WGM.DELETED=0 AND WGM.GM_TONNAGE>0 AND RP.PORT_NAME!='万州港' AND ADN.DELETED=0 AND ADA.DELETED=0
+AND DBI.BATCH_INFACOTRY_ID IN (
+		SELECT DISTINCT TLSR .BATCH_ID
+		FROM TMSSHIP_LOAD_SHIP_RESULT TLSR
+		LEFT JOIN TMSSHIP_TOTAL_RESULT TLR ON  TLR.RESULT_ID=TLSR.TOTAL_RESULT_ID
+		LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY OIC ON OIC.INSTRUCTIONS_CAPACITY_ID=TLR.ORDER_ID
+		WHERE OIC.DELETED=0
+	)
+        ORDER BY RM.MATERIAL_NAME
+    </select>
+    <select id="getRunStockList" resultType="java.util.Map">
+        SELECT
+            RM.MATERIAL_NAME "materialName",
+            DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+            LT."gmTonnage" "gmTonnage",
+            MT."totalTonnage" "totalTonnage"
+        FROM AMSSHIP_DELIVERY_NOTICE ADN
+                 LEFT JOIN DIL_BATCH_INFACOTRY DBI ON ADN.BATCH_ID=DBI.BATCH_INFACOTRY_ID
+                 LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA ON ADA.BATCH_ID = ADN.BATCH_ID
+                 LEFT JOIN DIL_BATCH DB ON DBI.BATCH_ID=DB.BATCH_ID
+                 LEFT JOIN RMS_MATERIAL RM ON DB.MATERIAL_ID=RM.MATERIAL_ID
+                 LEFT JOIN (
+            SELECT  DB.BATCH_ID "batchId",
+                    SUM(TLSR.RESULT_ACTUAL_INSTALLATIONS) "gmTonnage"
+            FROM TMSSHIP_LOAD_SHIP_RESULT TLSR
+                     LEFT JOIN TMSSHIP_TOTAL_RESULT TLR ON  TLR.RESULT_ID=TLSR.TOTAL_RESULT_ID
+                     LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY OIC ON OIC.INSTRUCTIONS_CAPACITY_ID=TLR.ORDER_ID
+                     LEFT JOIN DIL_BATCH_INFACOTRY DBI ON TLSR.BATCH_ID=DBI.BATCH_INFACOTRY_ID
+                     LEFT JOIN DIL_BATCH DB ON DBI.BATCH_ID=DB.BATCH_ID
+                     LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN ON ADN.BATCH_ID=DBI.BATCH_INFACOTRY_ID
+            WHERE OIC.DELETED=0 AND ADN.DELETED=0 AND TLSR.DELETED=0
+            GROUP BY DB.BATCH_ID
+        ) LT ON LT ."batchId"= DB.BATCH_ID
+                 LEFT JOIN (
+            SELECT  RM.MATERIAL_NAME "materialName",
+                    SUM(TLSR.RESULT_ACTUAL_INSTALLATIONS) "totalTonnage"
+            FROM TMSSHIP_LOAD_SHIP_RESULT TLSR
+                     LEFT JOIN TMSSHIP_TOTAL_RESULT TLR ON  TLR.RESULT_ID=TLSR.TOTAL_RESULT_ID
+                     LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY OIC ON OIC.INSTRUCTIONS_CAPACITY_ID=TLR.ORDER_ID
+                     LEFT JOIN DIL_BATCH_INFACOTRY DBI ON TLSR.BATCH_ID=DBI.BATCH_INFACOTRY_ID
+                     LEFT JOIN DIL_BATCH DB ON DBI.BATCH_ID=DB.BATCH_ID
+                     LEFT JOIN RMS_MATERIAL RM ON DB.MATERIAL_ID=RM.MATERIAL_ID
+                     LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN ON ADN.BATCH_ID=DBI.BATCH_INFACOTRY_ID
+            WHERE OIC.DELETED=0 AND ADN.DELETED=0 AND TLSR.DELETED=0
+            GROUP BY  RM.MATERIAL_NAME
+        ) MT ON MT."materialName"=RM.MATERIAL_NAME
+        WHERE LT."gmTonnage" > 0 AND ADN.DELETED=0
+        ORDER BY RM.MATERIAL_NAME
+    </select>
 </mapper>