修改采购查找运单

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

@@ -286,6 +286,39 @@ public class OMSController {
                                                     ) {
         return omsFeign.selectAllOrderForSale(mapValue==null?new HashMap<>():mapValue, carrierId, apiId, pageNum, pageSize, orderType, orderStatus, saleOrderMaterialId, con);
     }
+    /**
+     * 展示承运商接收销售公司已接受的销售订单
+     *
+     * @param
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("/getTransportOrder")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "168", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getTransportOrder( @RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                   Integer orderId,
+                                                  Integer orderStatus
+    ) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return omsFeign.getTransportOrder(mapValue,apiId,pageNum,pageSize,orderId,orderStatus);
+    }
+
+
+
+
+
+
+
+
     /**
      * 销售物流：司机接单pc端
      */

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

@@ -497,5 +497,13 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckmatetialorders/updateMaterialMes")
     public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map);
 
+
+    @PostMapping("api/v1/oms/omstruckorders/getTransportOrder")
+    Map<String, Object> getTransportOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("orderId") Integer orderId,
+                                          @RequestParam("orderStatus") Integer orderStatus);
 }
 

src/main/resources/application-dev.yml

@@ -33,7 +33,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8060}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   OTMSFeign: