提交

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

@@ -286,7 +286,9 @@ public class WmspGridMaterialController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer warehouseId,
                                                String con){
-        mapVal.put("warehouseId",warehouseId);
+        if (warehouseId!=null){
+            mapVal.put("warehouseId",warehouseId);
+        }
         if (con!=null&&!con.equals("undefined")){
             mapVal.put("con","%"+con+"%");
         }
@@ -297,6 +299,27 @@ public class WmspGridMaterialController extends BaseRESTfulController {
         return success(pageList);
     }
 
+    //   查询所有的钢材库名
+    @ApiOperation(value = "查询所有钢材的物资信息",notes = "查询所有钢材的物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "443", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/getSteelWarehouseList")
+    public  RESTfulResult getSteelWarehouseList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String con){
+        if (con!=null&&!con.equals("undefined")){
+            mapVal.put("con","%"+con+"%");
+        }
+        List<Map<String,Object>> columnList=wmspGridMaterialService.getSteelWarehouseList(mapVal);
+        PageHelper.startPage(pageNum,pageSize);
+        List<Map<String,Object>> mapList=wmspGridMaterialService.getSteelWarehouseList(mapVal);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,columnList,mapList);
+        return success(pageList);
+    }
+
     //    根据仓库id查询对应库的物资规格型号
     @ApiOperation(value = "查询所有钢材的物资信息",notes = "查询所有钢材的物资信息")
     @ApiImplicitParams({

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

@@ -14,6 +14,8 @@ public interface WmspCheckWarehouseMapper extends IBaseMapper<WmspCheckWarehouse
     List<Map<String, Object>> getStockTakingList();
 
     BigDecimal getMaxId();
+    //    查找所有钢材库房信息
+    List<Map<String, Object>> getSteelWarehouseList(Map<String,Object> map);
 //    查找钢材物资信息
     List<Map<String, Object>> getSteelMaterialList(Map<String,Object> map);
     //    查找钢材物资规格型号信息以及当前仓储在今天的最大预留量

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

@@ -69,4 +69,6 @@ public interface IWmspGridMaterialService  {
     int updateWmspGridMaterials(List<Map<String,Object>> map,String restackMake);
 //    查询当前仓库下的所有已经超过库龄预警界限的物资
     List<Map<String, Object>> getGridMaterialAgeList(Map<String,Object> mapVal,Integer warehouseId);
+//    查询所有的钢材库信息
+    List<Map<String, Object>> getSteelWarehouseList(Map<String, Object> mapVal);
 }

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

@@ -341,6 +341,11 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
         return wmspCheckWarehouseMapper.getSteelMaterialList(map);
     }
 
+    @Override
+    public List<Map<String, Object>> getSteelWarehouseList(Map<String, Object> mapVal) {
+        return wmspCheckWarehouseMapper.getSteelWarehouseList(mapVal);
+    }
+
     @Override
     public List<Map<String, Object>> getSteelMaterialModelList(Map<String,Object> map) {
         return wmspCheckWarehouseMapper.getSteelMaterialModelList(map);

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

@@ -401,9 +401,12 @@
         ON RMS.MATERIAL_STEEL_ID = WGM.MATERIAL_ID
         LEFT JOIN RMS_PWAREHOUSE_GRID RPG
         ON RPG.GRID_ID = WGM.GRID_ID
-        WHERE WAREHOUSE_ID = #{warehouseId}
+        WHERE RM.MATERIAL_NAME IS NOT NULL
+        <if test="warehouseId!=null">
+          AND RPG.WAREHOUSE_ID = #{warehouseId}
+        </if>
         <if test="con != null" >
-          and con like #{con}
+          AND RM.MATERIAL_NAME like #{con}
         </if>
         )
       <where>
@@ -414,6 +417,7 @@
         </foreach>
       </if>
      </where>
+      <include refid="orderBy"></include>
     </select>
     <select id="getSteelMaterialModelList" resultType="java.util.Map">
       SELECT DISTINCT
@@ -455,7 +459,18 @@
       </if>
       <include refid="orderBy"></include>
     </select>
-    <sql id="orderBy">
+  <select id="getSteelWarehouseList" resultType="java.util.Map">
+    SELECT
+        RW.WAREHOUSE_NAME "warehouseName",
+           RW.WAREHOUSE_ID "warehouseId"
+    FROM RMS_WAREHOUSE RW
+    WHERE RW.WAREHOUSE_TYPE_ID = 1 OR RW.WAREHOUSE_TYPE_ID = 2
+    <if test="con != null" >
+      AND RW.WAREHOUSE_NAME like #{con}
+    </if>
+    <include refid="orderBy"></include>
+  </select>
+  <sql id="orderBy">
       <if test="orderField != null and orderField != ''">
         order by "${orderField}"
         <if test="orderType != null and orderType != ''">