zx 3 years ago
parent
commit
011aeb051f

+ 3 - 2
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -1224,8 +1224,9 @@ public class AMScontroller{
                                             Integer orderType,
                                             Integer issueStatus,
                                             String con,
-                                            Integer dispatchStatus) {
-        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus);
+                                            Integer dispatchStatus,
+                                            Integer sporadicStatus) {
+        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus);
     }
 
     @ApiModelProperty(value = "查看物资详情")

+ 2 - 1
src/main/java/com/steerinfo/dil/feign/AmsFeign.java

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

+ 2 - 2
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.162:8015}
+    url: ${AMSFEIGN_URL:192.168.1.113:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -30,7 +30,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:192.168.1.113:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8