一车多趟 、批量删除订单

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

@@ -332,11 +332,12 @@ public class AMScontroller{
     public Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              Integer apiId) {
+                                              Integer apiId,
+                                              String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getPurchaseOrderList(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getPurchaseOrderList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     /**

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

@@ -696,4 +696,10 @@ public class OMSController {
     public Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map) {
         return omsFeign.getDriverConfirmation(map);
     }
+
+    @ApiOperation(value = "一键删除多个订单")
+    @PostMapping("/deleteOrders")
+    public Map<String, Object>  deleteOrders(@RequestBody(required = false) Map<String, Object> map){
+        return omsFeign.deleteOrders(map);
+    }
 }

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

@@ -509,5 +509,9 @@ public class UniversalController extends BaseRESTfulController {
         return saleStatus;
     }
 
-
+    @ApiOperation("查询所有的汽车衡")
+    @GetMapping("/getAllCalculateMes")
+    public List<Map<String, Object>> getAllCalculateMes() {
+        return universalMapper.getAllCalculateMes();
+    }
 }

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

@@ -283,7 +283,8 @@ public interface AmsFeign {
     Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId);
+                                       @RequestParam Integer apiId, @RequestParam String con
+                                             );
 
 
 

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

@@ -401,5 +401,9 @@ public interface OmsFeign {
     @ApiOperation(value = "查询订单是否确认")
     @PostMapping("api/v1/oms/omstruckorders/getDriverConfirmation")
     Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map);
+
+    @ApiOperation(value = "一键删除多个订单")
+    @PostMapping("api/v1/oms/omstruckorderseparates/deleteOrders")
+    Map<String, Object> deleteOrders(@RequestBody(required = false) Map<String, Object> map);
 }
 

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -90,4 +90,8 @@ public interface UniversalMapper {
 
     //通过运输订单号查询订单类型和ID
         Map<String, Object> getOrderMesByOrderNumber(String orderNumber);
+
+    //查询所有的门岗（下拉框）
+    List<Map<String, Object>> getAllCalculateMes();
+
 }

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -593,4 +593,14 @@
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
 
+<!--   查询所有的汽车衡  -->
+    <select id="getAllCalculateMes" resultType="java.util.Map">
+        select
+            RTC.TRUCK_CALCULATE_ID "id",
+            RTC.TRUCK_CALCULATE_ID "value",
+            RTC.TRUCK_CALCULATE_NUMBER "label"
+        from
+            RMS_TRUCK_CALCULATE RTC
+    </select>
+
 </mapper>