修改运单

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

@@ -358,6 +358,38 @@ public class OmstruckOrderController extends BaseRESTfulController {
         return success(pageList);
     }
 
+
+
+
+    @ApiOperation(value = "查询运输订单对应的车牌以及车辆的状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(85)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getTransportOrder")
+    public RESTfulResult getTransportOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize,
+                                          Integer orderId,
+                                         Integer orderStatus
+    ) {
+        if (orderId!=null){
+            mapValue.put("orderId",orderId);
+        }
+        if (orderStatus!=null||!orderStatus.equals("")){
+            mapValue.put("orderStatus",orderStatus);
+        }
+        //不分页筛选数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = omstruckOrderService.getTransportOrder(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, capacity);
+        return success(pageList);
+    }
+
     @ApiOperation(value = "分解运输计划后 新增订单  或者直接新增订单 ")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),

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

@@ -338,4 +338,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     BigDecimal getLineSeq(BigDecimal orderId);
 
     String getCapacityNumberByCapacityId(BigDecimal capacityNumber);
+
+    List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue);
 }

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

@@ -205,4 +205,5 @@ public interface IOmstruckOrderService {
 
     int refuseCtrlZ(Map<String, Object> map);
 
+    List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue);
 }

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

@@ -751,6 +751,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         return omstruckOrderMapper.refuseCtrlZ(map);
     }
 
+    //获取运输订单对应的车牌以及车辆状态
+    @Override
+    public List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue) {
+        return omstruckOrderMapper.getTransportOrder(mapValue);
+    }
+
     /**
      * 销售物流，下发订单
      *

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

@@ -3783,4 +3783,14 @@
     <select id="getCapacityNumberByCapacityId" parameterType="java.math.BigDecimal" resultType="java.lang.String">
         select CAPACITY_NUMBER from RMS_CAPACITY  where CAPACITY_ID = #{capacityId}
     </select>
+    <select id="getTransportOrder" resultType="java.util.Map" parameterType="java.util.Map">
+        select  OO.DRIVER_CONFIRMATION "loadName",
+                RC.CAPACITY_NUMBER   "capacityNumber",
+                OO.ORDER_NUMBER  "orderNumber",
+                OO.ORDER_RECEIVE_REFUSE_TIME "receiveTime"
+        from OMSTRUCK_ORDER OO
+        LEFT JOIN RMS_CAPACITY RC
+        ON OO.CAPACITY_ID=RC.CAPACITY_ID
+        where  OO.ORDER_ID=#{orderId} and OO.ORDER_STATUS = #{orderStatus}
+    </select>
 </mapper>