Tiroble 3 年之前
父节点
当前提交
95fa7d566c

+ 23 - 0
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -1626,4 +1626,27 @@ public class AMScontroller{
     public Map<String, Object> lockDispatchSaleOrderList(@RequestBody Map<String,Object> mapValue) {
         return amsFeign.lockDispatchSaleOrderList(mapValue);
     }
+
+    @ApiModelProperty(value = "销售订单批量授权给承运商")
+    @PostMapping("/saleOrderEmpowerCarrier")
+    public RESTfulResult saleOrderEmpowerCarrier(@RequestBody(required = false) Map<String,Object> mapValue){
+        return amsFeign.saleOrderEmpowerCarrier(mapValue);
+    }
+
+    @ApiModelProperty(value = "展示销售公司下发给承运商的销售订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "409", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSaleOrderListByCarrierSsoId")
+    public RESTfulResult getSaleOrderListByCarrierSsoId(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                        String carrierSsoId,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+
+                                                        Integer apiId,
+                                                        String con) {
+        return amsFeign.getSaleOrderListByCarrierSsoId(mapValue!=null?mapValue:new HashMap<>(),carrierSsoId,pageNum,pageSize,apiId,con);
+    }
 }

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

@@ -1501,5 +1501,14 @@ public interface AmsFeign {
                                               @RequestParam String planStatus);
 
 
-
+    @PostMapping("/api/v1/ams/amssaleorders/saleOrderEmpowerCarrier")
+    public RESTfulResult saleOrderEmpowerCarrier(@RequestBody(required = false) Map<String,Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListByCarrierSsoId")
+    public RESTfulResult getSaleOrderListByCarrierSsoId(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                        @RequestParam String carrierSsoId,
+                                                        @RequestParam Integer pageNum,
+                                                        @RequestParam Integer pageSize,
+                                                        @RequestParam Integer apiId,
+                                                        @RequestParam String con);
 }

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

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -28,11 +28,11 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8012}
+    url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.166:8014}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
 server:
   port: 8019