合并内转部分代码

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

@@ -45,7 +45,7 @@ public class AMScontroller extends BaseRESTfulController {
     }
 
     /*
-    不知道谁写的
+
      */
     @PostMapping("/getAllPurPlan/{apiId}")
     public RESTfulResult getDetailListByCon(@PathVariable("apiId") Integer apiId,

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

@@ -54,9 +54,10 @@ public class QMSController extends BaseRESTfulController {
     public RESTfulResult orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
                                       Integer apiId,
                                       Integer pageNum,
-                                      Integer pageSize
+                                      Integer pageSize,
+                                      Integer queueType
     ){
-        return qmsTruckFeign.orderReceive(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return qmsTruckFeign.orderReceive(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, queueType);
     }
 
 

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

@@ -707,49 +707,55 @@ public interface AmsFeign {
     /*
        AmstruckPurplanController中所有接口
     */
-    @PostMapping("api/v1/truckTms/amstruckpurplans/getAllPurPlan")
+    @PostMapping("api/v1/ams/amstruckpurplans/getAllPurPlan")
     RESTfulResult getAllPurPlan(@RequestBody(required=false) Map<String,Object> mapValue,
                                 @RequestParam("apiId") Integer apiId,
                                 @RequestParam("pageNum") Integer pageNum,
                                 @RequestParam("pageSize") Integer pageSize,
                                 @RequestParam("status") Integer status);
 
-    @PostMapping("api/v1/truckTms/amstruckpurplans/getAllPurPlan/{apiId}")
+    @PostMapping("api/v1/ams/amstruckpurplans/getAllPurPlan/{apiId}")
     public RESTfulResult getDetailListByCon(@PathVariable("apiId") Integer apiId,
                                             @RequestBody(required=false) Map<String,Object> mapValue,
                                             @RequestParam("pageNum")Integer pageNum,
                                             @RequestParam("pageSize")Integer pageSize,
                                             @RequestParam("con")String con);
 
-    @PostMapping ("api/v1/truckTms/amstruckpurplans/getPurPlanById/{planId}")
+    @PostMapping ("api/v1/ams/amstruckpurplans/getPurPlanById/{planId}")
     public RESTfulResult getPurPlanById(@PathVariable("planId")Integer planId);
 
-    @PostMapping("api/v1/truckTms/amstruckpurplans/addPurPlan")
+    @PostMapping("api/v1/ams/amstruckpurplans/addPurPlan")
     public RESTfulResult addPurPlan(@RequestBody Map<String, Object> map);
 
-    @PostMapping("api/v1/truckTms/amstruckpurplans/sendPurPlan/{planId}")
+    @PostMapping("api/v1/ams/amstruckpurplans/sendPurPlan/{planId}")
     public RESTfulResult sendPurPlan(@PathVariable("planId")Integer planId);
 
-    @PostMapping("api/v1/truckTms/amstruckpurplans/receptionPurPlan/{planId}")
+    @PostMapping("api/v1/ams/amstruckpurplans/receptionPurPlan/{planId}")
     public RESTfulResult receptionPurPlan(@PathVariable("planId")Integer planId);
 
 
 
-    @PostMapping("api/v1/truckTms/amstruckpurplans/deletePurPlan/{planId}")
+    @PostMapping("api/v1/ams/amstruckpurplans/deletePurPlan/{planId}")
     public RESTfulResult deletePurPlan(@PathVariable("planId")Integer planId);
 
-    @PostMapping("api/v1/truckTms/amstruckpurplans/getDecomposedPlan")
+    @PostMapping("api/v1/ams/amstruckpurplans/getDecomposedPlan")
     public RESTfulResult getDecomposedPlan(@RequestBody(required=false) Map<String,Object> mapValue,
                                            @RequestParam("apiId") Integer apiId,
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
                                            @RequestParam("planId") Integer planId,
                                            @RequestParam("status") Integer status);
+
     //*****************************************内转物流**************************************
     //查询汽运单价
     @PostMapping(value = "/api/v1/ams/amscontracttransportprices/getAmsContractTransportPriceForConverted")
+<<<<<<< HEAD
     Map<String,Object> getAmsContractTransportPriceForConverted(@RequestParam("lineId") BigDecimal lineId,
                                                                 @RequestParam("apiId")  Integer apiId,
+=======
+    Map<String,Object> getAmsContractTransportPriceForConverted(@RequestParam("lineId")BigDecimal lineId,
+                                                                @RequestParam("apiId")Integer apiId,
+>>>>>>> ab3706e4019b68de223c05db280a865bdd315882
                                                                 @RequestParam("pageNum")Integer pageNum,
                                                                 @RequestParam("pageSize")Integer pageSize);
     //获得运输线路

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

@@ -11,7 +11,7 @@ import java.util.Map;
  * @ time      :2021/10/28 13:28
  */
 
-@FeignClient(value = "dil-oms-dev", url = "${openfeign.QMSFeign.url}")
+@FeignClient(value = "DAL-OMS-API-DEV", url = "${openfeign.OMSFeign.url}")
 public interface OmsFeign {
 
      /*

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

@@ -34,7 +34,8 @@ public interface QmsTruckFeign {
     public RESTfulResult orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
                                       @RequestParam("apiId") Integer apiId,
                                       @RequestParam("pageNum") Integer pageNum,
-                                      @RequestParam("pageSize") Integer pageSize
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("queueType") Integer queueType
     );
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueApply")

src/main/resources/bootstrap.yml

@@ -22,7 +22,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:localhost:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8081}
+    url: ${AMSFEIGN_URL:localhost:8099}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:localhost:8078}
   BmstrainFeign:
@@ -43,6 +43,8 @@ openfeign:
     url: ${WMSFEIGN_URL:localhost:8093}
   QMSFeign:
     url: ${QMSFEIGN_URL:localhost:8082}
+  OMSFeign:
+    url: ${OMSFEIGN_URL:localhost:8095}
 
 
 genxml:
@@ -74,4 +76,5 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8097
+  port: 8080
+