liyg 2 gadi atpakaļ
vecāks
revīzija
deadaae912

+ 9 - 0
src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -425,6 +425,15 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.purchaseTrainLoad(map,userId,userName);
         return tmsFeign.purchaseTrainLoad(map,userId,userName);
     }
     }
 
 
+    @ApiOperation(value = "查询采购火运装货")
+    @PostMapping("/purchaseTrainLoadList")
+    public Map<String, Object> purchaseTrainLoadList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.purchaseTrainLoadList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
     @ApiOperation(value="更改销售运输订单状态")
     @ApiOperation(value="更改销售运输订单状态")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/changeSaleTransOrder")
     @PostMapping(value = "/changeSaleTransOrder")

+ 6 - 0
src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -136,6 +136,12 @@ public interface TmsFeign {
                                                    @RequestParam  Integer pageNum,
                                                    @RequestParam  Integer pageNum,
                                                    @RequestParam  Integer pageSize);
                                                    @RequestParam  Integer pageSize);
 
 
+    @PostMapping("api/v1/tms/tmsloadresults/purchaseTrainLoadList")
+    Map<String, Object> purchaseTrainLoadList(@RequestBody(required = false) Map<String, Object> map,
+                                          @RequestParam  Integer apiId,
+                                          @RequestParam  Integer pageNum,
+                                          @RequestParam  Integer pageSize);
+
     @PostMapping("api/v1/tms/tmsunloadresults/getUnloadResultList")
     @PostMapping("api/v1/tms/tmsunloadresults/getUnloadResultList")
     Map<String, Object> getUnloadResultList(@RequestBody(required = false) Map<String, Object> map,
     Map<String, Object> getUnloadResultList(@RequestBody(required = false) Map<String, Object> map,
                                           @RequestParam  Integer apiId,
                                           @RequestParam  Integer apiId,

+ 1 - 1
src/main/resources/application-dev.yml

@@ -51,7 +51,7 @@ openfeign:
   OMSFeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
     url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
   RmsFeign:
-    url: ${RMSFEIGN_URL:localhost:8060}
+    url: ${RMSFEIGN_URL:172.16.90.214:8060}
   IntegrationFeign:
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:localhost:8066}
     url: ${INTEGRATIONFEIGN_URL:localhost:8066}
   OTMSFeign:
   OTMSFeign:

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

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