'销售'

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

@@ -1879,4 +1879,15 @@ public class AMScontroller{
     public RESTfulResult matchingDriverTelRecently(@RequestParam String capacityNumber) {
         return amsFeign.matchingDriverTelRecently(capacityNumber);
     }
+
+    @ApiOperation(value = "展示副产品销售订单列表(apiId=481)")
+    @PostMapping("/getFuSaleOrderList")
+    public Map<String, Object> getFuSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  String con
+    ) {
+        return amsFeign.getFuSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
 }

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

@@ -303,11 +303,10 @@ public class OMSController {
                                             Integer pageNum,
                                             Integer pageSize,
                                             Integer orderStatus,
-                                            String con,
-                                            @RequestParam Integer saleOrderId
+                                            String con
     )
     {
-        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,orderStatus, con,saleOrderId);
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,orderStatus, con);
     }
     @PostMapping("/getDriverInfoForSale1")
     public Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,

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

@@ -1655,4 +1655,12 @@ public interface AmsFeign {
     // 自动匹配上一条运单的司机电话
     @PostMapping(value = "/api/v1/ams/amssaleorders/matchingDriverTelRecently")
     RESTfulResult matchingDriverTelRecently(@RequestParam String capacityNumber);
+
+    // 展示副产品销售订单列表
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getFuSaleOrderList")
+    Map<String, Object> getFuSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam String con);
 }

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

@@ -135,8 +135,7 @@ public interface OmsFeign {
                                             @RequestParam("pageNum")    Integer pageNum,
                                             @RequestParam("pageSize")   Integer pageSize,
                                             @RequestParam("orderStatus")Integer orderStatus,
-                                            @RequestParam("con")        String con,
-                                            @RequestParam("saleOrderId") Integer saleOrderId
+                                            @RequestParam("con")        String con
     );
 
 

src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:
@@ -23,7 +23,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:192.168.1.105:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:
@@ -31,9 +31,9 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.33.166:8060}
+    url: ${RMSFEIGN_URL:192.168.1.105:8060}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
   OTMSFeign: