tijio

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -1218,15 +1219,16 @@ public class AMScontroller{
     })
     @PostMapping("/getSporadicOrdersList")
     public RESTfulResult getSporadicOrdersList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer orderType,
-                                            Integer issueStatus,
-                                            String con,
-                                            Integer dispatchStatus,
-                                            Integer sporadicStatus) {
-        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus);
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               Integer issueStatus,
+                                               String con,
+                                               Integer dispatchStatus,
+                                               Integer sporadicStatus,
+                                               String carrierSsoId) {
+        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId);
     }
 
     @ApiModelProperty(value = "查看物资详情")

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

@@ -1247,7 +1247,8 @@ public interface AmsFeign {
                                               @RequestParam Integer issueStatus,
                                               @RequestParam String con,
                                               @RequestParam Integer dispatchStatus,
-                                              @RequestParam Integer sporadicStatus);
+                                              @RequestParam Integer sporadicStatus,
+                                              @RequestParam String carrierSsoId);
 
     @PostMapping("/api/v1/ams/amstrucksporadicorders/seeAllMaterials")
     RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String, Object> mapValue,

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -22,7 +22,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:192.168.1.108:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign: