1

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

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

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

@@ -478,7 +478,7 @@ public class AMScontroller  extends BaseRESTfulController {
     @ApiOperation(value = "删除发货单信息", notes = "根据填写的数据将发货单进行删除")
     @ApiImplicitParam(name = "params", value = "查询内容", required = false, dataType = "HashMap<String, Object>")
     @PostMapping(value = "/deleteDlivDirno")
-    public RESTfulResult deleteDlivDirno(@RequestBody(required = false) HashMap<String, Object> params) {
+    public RESTfulResult deleteDlivDirno(@RequestBody(required = false) Map<String, Object> params) {
         return amsFeign.deleteDlivDirno(params);
     }
 
@@ -791,4 +791,38 @@ public class AMScontroller  extends BaseRESTfulController {
     public RESTfulResult getMoney(@PathVariable String id) {
         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);
+
+    }
 }

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);
@@ -284,7 +284,18 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/saleAddPl")
     RESTfulResult saleAddPl(@RequestBody Map<String, Object> map);
 
-    @PostMapping(value = "api/v1/ams/amstransrequirements//getMoney/{id}")
+    @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);
 }