'采购燃辅料'

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

@@ -10,6 +10,7 @@ import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -608,4 +609,16 @@ public class OMSController {
     public List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(@RequestBody(required = false) Map<String,Object> mapvalue){
         return omsFeign.getAllRefuseOrderNumberByCapacity(mapvalue);
     }
+
+    @ApiOperation(value = "添加退货实绩关闭当前订单")
+    @PostMapping("/returnOrderCloseOrder")
+    public Map<String,Object> returnOrderCloseOrder(@RequestBody(required = false) Map<String, Object> map){
+        return omsFeign.returnOrderCloseOrder(map);
+    }
+
+    @ApiOperation(value = "根据运单id查询实绩位置")
+    @PostMapping("/getOrderResult")
+    public List<Map<String, Object>> getOrderResult(@RequestBody Map<String,Object> map){
+        return omsFeign.getOrderResult(map);
+    }
 }

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

@@ -340,5 +340,13 @@ public interface OmsFeign {
     @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
     @PostMapping("api/v1/oms/omstruckorders/getAllRefuseOrderNumberByCapacity")
     List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @ApiOperation(value = "添加退货实绩关闭当前订单")
+    @PostMapping("api/v1/oms/omstruckorderseparates/returnOrderCloseOrder")
+    Map<String, Object> returnOrderCloseOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value = "根据运单id查询实绩位置")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getOrderResult")
+    List<Map<String, Object>> getOrderResult(@RequestBody Map<String,Object> map);
 }
 

src/main/java/com/steerinfo/dil/service/UniversalService.java

@@ -13,5 +13,6 @@ public interface UniversalService {
     //打印提货单
     Map<String, Object> printTiHuoDan(String orderNumber);
 
-
+    //查询路段顺序及当前路段顺序号
+    Map<String, Object> getNowLineMes(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -32,4 +32,18 @@ public class UniversalServiceImpl implements UniversalService {
         tiHuoDanMap.put("loadMes", oomMes);
         return tiHuoDanMap;
     }
+
+
+    /**
+     * 查询路段顺序及当前路段顺序号
+     * @param map
+     * @return
+     */
+    @Override
+    public Map<String, Object> getNowLineMes(Map<String, Object> map) {
+
+        return null;
+    }
+
+
 }

src/main/resources/bootstrap.yml

@@ -27,7 +27,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:192.168.1.104:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:localhost:8078}
   BmstrainFeign: