修改万州港实时库存

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

@@ -85,13 +85,50 @@ public class WmshGridMaterialController extends BaseRESTfulController {
     public RESTfulResult getLoadPortStockList(@RequestBody(required = false) Map<String,Object> mapVal,
                                                 Integer pageNum,
                                                 Integer pageSize,
-                                                Integer apiId){
+                                                Integer apiId,
+                                                String con){
+        if (con!=null&&!"".equals(con)){
+            mapVal.put("con",con);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = wmshGridMaterialService.getLoadPortStockList(mapVal);
         PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
+    /**
+     * 展示万州港港存库库存列表
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="展示万州港当前物资实时库存", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "158", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getLoadPortStockByMaterialName")
+    public RESTfulResult getLoadPortStockByMaterialName(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                        String con){
+        if (con!=null&&!"".equals(con)){
+            mapVal.put("con",con);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = wmshGridMaterialService.getLoadPortStockByMaterialName(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
+        return success(data);
+    }
+
+
+
+
 
     //清场
     @ApiModelProperty(value = "清场远程调用")

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

@@ -44,4 +44,6 @@ public interface WmshGridMaterialMapper extends IBaseMapper<WmshGridMaterial, Bi
     BigDecimal selectMaxId();
 
    List<Map<String,Object>> getGridId(Map<String,Object> map);
+
+    List<Map<String, Object>> getLoadPortStockByMaterialName(Map<String, Object> mapVal);
 }

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

@@ -40,4 +40,6 @@ public interface IWmshGridMaterialService {
     int updatePortStock(Map<String, Object> map);
 
     int clearWmshGridMaterial(Map<String, Object> map);
+
+    List<Map<String, Object>> getLoadPortStockByMaterialName(Map<String, Object> mapVal);
 }

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

@@ -130,4 +130,10 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
         return i;
     }
 
+    //展示港存库目前品种对应的库存
+    @Override
+    public List<Map<String, Object>> getLoadPortStockByMaterialName(Map<String, Object> mapVal) {
+        return wmshGridMaterialMapper.getLoadPortStockByMaterialName(mapVal);
+    }
+
 }

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

@@ -408,6 +408,10 @@
         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  or instr(rp.PORT_NAME , #{con}) > 0 or instr(db.RESULT_FOREIGN_SHIP_NAME,#{con}) > 0)
+        </if>
+        ORDER BY  rm.MATERIAL_NAME
         )
         <where>
             <if test="portName != null">
@@ -446,4 +450,22 @@
         ON RP.PORT_ID=WGM.PORT_ID
         WHERE RP.PORT_ID=#{portId} and WGM.BATCH_ID=#{batchId}
     </select>
+    <select id="getLoadPortStockByMaterialName" resultType="java.util.Map" parameterType="java.util.Map">
+        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 = '万州港'
+        <if test="con!=null">
+            and instr(rm.MATERIAL_NAME,#{con}) > 0
+        </if>
+        GROUP BY
+            rm.MATERIAL_NAME
+    </select>
 </mapper>