'焦炭一车多趟'

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

@@ -1505,8 +1505,27 @@ public class AMScontroller{
         return amsFeign.dispatchTruckOrderBySale(mapValue);
     }
 
+    @ApiOperation(value="展示销售焦炭订单")
+    @PostMapping("/getCokeSaleOrderList")
+    public RESTfulResult getCokeSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId,
+                                                         String con) {
+        return amsFeign.getCokeSaleOrderList(mapValue == null ? new HashMap<>() : mapValue, pageNum, pageSize, apiId, con);
+    }
 
+    @ApiOperation(value="承运商直接选择车牌号派发运输订单")
+    @PostMapping("/dispatchTruckOrderByCarrier")
+    public Map<String,Object> dispatchTruckOrderByCarrier(@RequestBody Map<String,Object> mapValue){
+        return amsFeign.dispatchTruckOrderByCarrier(mapValue);
+    }
 
+    @ApiOperation(value="关闭销售订单")
+    @PostMapping("closeSaleOrder")
+    public Map<String,Object> closeSaleOrder(@RequestParam Integer saleOrderId){
+        return amsFeign.closeSaleOrder(saleOrderId);
+    }
 
 
     @ApiOperation(value="新增公告信息", notes="根据DilNotice对象创建")

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

@@ -1434,4 +1434,17 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amssaleordermaterials/dispatchTruckOrderBySale")
     Map<String, Object> dispatchTruckOrderBySale(Map<String, Object> mapValue);
+
+    @PostMapping(value = "api/v1/ams/amssaleorders/getCokeSaleOrderList")
+    RESTfulResult getCokeSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("con") String con);
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/dispatchTruckOrderByCarrier")
+    Map<String, Object> dispatchTruckOrderByCarrier(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/closeSaleOrder")
+    Map<String, Object> closeSaleOrder(@RequestParam Integer saleOrderId);
 }

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:192.168.1.107:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -30,7 +30,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:192.168.1.107:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}