Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -2252,4 +2252,17 @@ public class AMScontroller{
     public Map<String,Object> getMakeOrderDate(@RequestBody Map<String,Object> map) {
         return amsFeign.getMakeOrderDate(map);
     }
+
+    @ApiOperation("合并运单")
+    @PostMapping("/mergeOrder")
+    public Map<String,Object> mergeOrder(@RequestBody Map<String,Object> map) {
+        return amsFeign.mergeOrder(map);
+    }
+
+    @ApiOperation("拆分运单")
+    @PostMapping("/splitOrder")
+    public Map<String,Object> splitOrder(@RequestBody Map<String,Object> map) {
+        return amsFeign.splitOrder(map);
+    }
+
 }

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

@@ -1891,4 +1891,9 @@ public interface AmsFeign {
     @PostMapping("/api/v1/ams/amssaleorders/getMakeOrderDate")
     Map<String, Object> getMakeOrderDate(@RequestBody Map<String, Object> map);
 
+    @PostMapping("/api/v1/ams/amssaleorders/mergeOrder")
+    Map<String, Object> mergeOrder(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/ams/amssaleorders/splitOrder")
+    Map<String, Object> splitOrder(@RequestBody Map<String, Object> map);
 }