2.28

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

@@ -280,12 +280,19 @@ public class WmspGridMaterialController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "443", required = false, dataType = "BigDecimal"),
     })
     @PostMapping("/getSteelMaterialList")
-    public  RESTfulResult getSteelMaterialList(Integer pageNum,
+    public  RESTfulResult getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                               Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId){
-        List<Map<String,Object>> columnList=wmspGridMaterialService.getSteelMaterialList();
+                                               Integer apiId,
+                                               Integer warehouseId,
+                                               String con){
+        mapVal.put("warehouseId",warehouseId);
+        if (con!=null&&!con.equals("undefined")){
+            mapVal.put("con","%"+con+"%");
+        }
+        List<Map<String,Object>> columnList=wmspGridMaterialService.getSteelMaterialList(mapVal);
         PageHelper.startPage(pageNum,pageSize);
-        List<Map<String,Object>> mapList=wmspGridMaterialService.getSteelMaterialList();
+        List<Map<String,Object>> mapList=wmspGridMaterialService.getSteelMaterialList(mapVal);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId,columnList,mapList);
         return success(pageList);
     }

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

@@ -2,12 +2,12 @@ package com.steerinfo.dil.mapper;
 
 import com.steerinfo.dil.model.WmspCheckWarehouse;
 import com.steerinfo.framework.mapper.IBaseMapper;
-import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Mapper;
-
 @Mapper
 public interface WmspCheckWarehouseMapper extends IBaseMapper<WmspCheckWarehouse, BigDecimal> {
 //    查询所有的盘库实绩
@@ -15,7 +15,7 @@ public interface WmspCheckWarehouseMapper extends IBaseMapper<WmspCheckWarehouse
 
     BigDecimal getMaxId();
 //    查找钢材物资信息
-    List<Map<String, Object>> getSteelMaterialList();
+    List<Map<String, Object>> getSteelMaterialList(Map<String,Object> map);
     //    查找钢材物资规格型号信息以及当前仓储在今天的最大预留量
     List<Map<String, Object>> getSteelMaterialModelList(Integer warehouseId,Integer status);
 }

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

@@ -55,7 +55,7 @@ public interface IWmspGridMaterialService  {
 //   查询盘库实绩
     List<Map<String, Object>> getStockTakingList();
 //    获得钢材物资信息
-    List<Map<String, Object>> getSteelMaterialList();
+    List<Map<String, Object>> getSteelMaterialList(Map<String,Object> map);
 
     int deleteGridMaterial(List<OutBoundMaterialDetailedInfo> thisMaterialDetailedInfos);
 

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

@@ -336,8 +336,8 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
     }
 
     @Override
-    public List<Map<String, Object>> getSteelMaterialList() {
-        return wmspCheckWarehouseMapper.getSteelMaterialList();
+    public List<Map<String, Object>> getSteelMaterialList(Map<String,Object> map) {
+        return wmspCheckWarehouseMapper.getSteelMaterialList(map);
     }
 
     @Override

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

@@ -389,21 +389,31 @@
     SELECT MAX(WCM.CHECK_ID)+1 "checkId"
     FROM WMSP_CHECK_WAREHOUSE WCM
   </select>
-    <select id="getSteelMaterialList" resultType="java.util.Map">
+    <select id="getSteelMaterialList" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT * FROM(
         SELECT DISTINCT
---             物资名称
-            RM.MATERIAL_NAME "materialName",
---                物资编码
-               RM.MATERIAL_CODE "materialCode",
---                物资规格
-               RM.MATERIAL_SPECIFICATION "materialSpecification",
---                物资型号
-               RM.MATERIAL_MODEL "materialModel",
---                物资长度
-                RM.MATERIAL_LENGTH "materialLength"
+          RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || '(' ||
+          RM.MATERIAL_MODEL || ')' "materialName"
         FROM RMS_MATERIAL_STEEL RMS
         LEFT JOIN RMS_MATERIAL RM
         ON RMS.MATERIAL_ID = RM.MATERIAL_ID
+        LEFT JOIN WMSP_GRID_MATERIAL WGM
+        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}
+        <if test="con != null" >
+          and con like #{con}
+        </if>
+        )
+      <where>
+      <if test="materialName != null">
+        and "materialName" in
+        <foreach collection="materialName" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+     </where>
     </select>
     <select id="getSteelMaterialModelList" resultType="java.util.Map">
       SELECT DISTINCT