提交

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

@@ -126,12 +126,12 @@ public class WmspGridMaterialController extends BaseRESTfulController {
         }
         return success(pageList);
     }
-//统计实时库存数量
-@PostMapping(value = "/countByGmId")
-public RESTfulResult countByGmId() {
-    Long code = wmspGridMaterialService.countByGmId();
-    return success(code);
-}
+    //统计实时库存数量
+    @PostMapping(value = "/countByGmId")
+    public RESTfulResult countByGmId() {
+        Long code = wmspGridMaterialService.countByGmId();
+        return success(code);
+    }
 
 
     // 通过成品仓库网格ID查询实时库存
@@ -201,14 +201,17 @@ public RESTfulResult countByGmId() {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "warehouseid",dataType = "DECIMAL",value = "仓库"),
             @ApiImplicitParam(name = "stackingId",dataType = "BigDicemal",value = "垛位"),
-            @ApiImplicitParam(name = "gradtionNumber",dataType = "BigDicemal",value = "层号")
-
+            @ApiImplicitParam(name = "gradtionNumber",dataType = "BigDicemal",value = "层号"),
+            @ApiImplicitParam(name = "apiId", value = "437", required = false, dataType = "BigDecimal"),
     })
-    @GetMapping("/getMaterialTypeList")
-    public  RESTfulResult getMaterialTypeList(String warehouseid,BigDecimal stackingId,BigDecimal gradtionNumber){
+    @PostMapping("/getMaterialTypeList")
+    public  RESTfulResult getMaterialTypeList(String warehouseid,BigDecimal stackingId,BigDecimal gradtionNumber,Integer pageNum,Integer pageSize,Integer apiId){
         //获得一个list<Map<String,Object>> map里面包括：物质Id、物质名称、物质型号、理论重量、物质件数
-        List<Map<String,Object>> map=wmspGridMaterialService.getMaterialTypeList(warehouseid,stackingId,gradtionNumber);
-        return success();
+        List<Map<String,Object>> columnList=wmspGridMaterialService.getMaterialTypeList(warehouseid,stackingId,gradtionNumber);
+        PageHelper.startPage(pageNum,pageSize);
+        List<Map<String,Object>> mapList=wmspGridMaterialService.getMaterialTypeList(warehouseid,stackingId,gradtionNumber);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,columnList,mapList);
+        return success(pageList);
     }
 }