Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/config/RequestFilter.java

@@ -57,7 +57,7 @@ public class RequestFilter implements Filter {
                    }else if (cookie.getName().equals("urlFlag") && urlFlag == null) {
                        urlFlag = URLDecoder.decode(cookie.getValue(), "utf-8");
                    }
-                   else if (userId != null && userName != null && orgCode != null && roleCodes != null && dilCompanyList != null && rootCompanyMap != null && urlFlag != null) {
+                   else if (userId != null && userName != null && orgCode != null && roleCodes != null && dilCompanyList != null && rootCompanyMap != null && urlFlag != null && accessToken != null) {
                        //都查到了，退出
                        break;
                    }

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

@@ -792,6 +792,40 @@ public class AMScontroller  extends BaseRESTfulController {
         return amsFeign.getprintstr(id);
     }
 
+    @ApiOperation(value = "查询临时货位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/selectcar")
+    RESTfulResult selectcar(@RequestBody(required = false) Map<String, Object> map,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize
+    ) {
+        return amsFeign.selectcar(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+
+    }
+
+    @ApiOperation(value = "查询临时货位详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/selectcarList")
+    RESTfulResult selectcarList(@RequestBody(required = false) Map<String, Object> map,
+                            Integer apiId,
+                            Integer pageNum,
+                            Integer pageSize
+    ) {
+        return amsFeign.selectcarList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+
+    }
+
     @ApiOperation("上传凭证")
     @PostMapping("/transPlanupload")
     Map<String,Object> transPlanupload(@RequestBody Map<String,Object> map) {

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -181,7 +181,7 @@ public interface AmsFeign {
     RESTfulResult editButton(@RequestBody(required = false) HashMap<String, Object> params);
 
     @PostMapping(value = "api/v1/ams/amsrequirementchilds/deleteDlivDirno")
-    RESTfulResult deleteDlivDirno(@RequestBody(required = false) HashMap<String, Object> params);
+    RESTfulResult deleteDlivDirno(@RequestBody(required = false) Map<String, Object> params);
 
     @PostMapping(value = "api/v1/ams/amstransplans/productionPlanAdd")
     Map<String, Object> productionPlanAdd(@RequestBody(required = false)Map<String, Object> map);
@@ -287,6 +287,18 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements//getMoney/{id}")
     RESTfulResult getprintstr(@PathVariable String id);
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/selectcar")
+    RESTfulResult selectcar(@RequestBody Map<String, Object> objectMap,
+                                 @RequestParam Integer apiId,
+                                 @RequestParam Integer pageNum,
+                                 @RequestParam Integer pageSize);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/selectcarList")
+    RESTfulResult selectcarList(@RequestBody Map<String, Object> objectMap,
+                            @RequestParam Integer apiId,
+                            @RequestParam Integer pageNum,
+                            @RequestParam Integer pageSize);
+
     @PostMapping(value = "api/v1/ams/amstransplans/transPlanupload")
     Map<String, Object> transPlanupload(@RequestBody(required = false) Map<String, Object> map);