'销售'

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

@@ -341,4 +341,5 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     //销售：接收运输订单展示pc端界面
     List<Map<String, Object>> getDriverInfoForSale2(Map<String, Object> map);
+    List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue);
 }

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

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

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

@@ -258,6 +258,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 8:
             case 17:
             case 18:
+                if (map.get("loadNameId")!=null) omstruckOrder.setDriverConfirmation(DataChange.dataToBigDecimal(map.get("loadNameId")));//装货点
                 if (map.get("purchaseOrderId") != null)  omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("purchaseOrderId"))); //订单ID
                 if (map.get("unloadPointId") != null)  omstruckOrder.setUnloadPointId(DataChange.dataToBigDecimal(map.get("unloadPointId")));// 添加卸货点
                 break;
@@ -750,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

@@ -790,6 +790,7 @@
                 OO.INSERT_TIME "insertTime",
                 OO.ORDER_NUMBER "orderNumber",
                 RW.WAREHOUSE_NAME "warehouseName", --卸货点
+                RW2.WAREHOUSE_NAME "loadName",
                 to_char(OO.ORDER_ENTRY_TIME, 'yyyy-mm-dd') "orderEntryTime", --进厂时间
                 RS.SUPPLIER_NAME "supplierName", --发货单位
                 RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName", --收货单位
@@ -814,6 +815,8 @@
         on RM.MATERIAL_ID = OOM.MATERIAL_ID
         left join RMS_WAREHOUSE RW
         on OO.UNLOAD_POINT_ID = RW.WAREHOUSE_ID
+        left join RMS_WAREHOUSE RW2
+        ON OO.DRIVER_CONFIRMATION = RW2.WAREHOUSE_ID
         left join RMS_SUPPLIER RS
         on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
         left join RMS_CONSIGNEE RCSE
@@ -3016,6 +3019,7 @@
                RCON.CONSIGNEE_COMPANY_NAME  "consigneeCompanyName",
                RW.WAREHOUSE_NAME  "unloadName",
                OO.ORDER_TYPE      "orderType",
+               RW2.WAREHOUSE_NAME "loadName",
                (case when APO.PURCHASING_ORGANIZATION_ID = 1
                      then '一厂'
                      when APO.PURCHASING_ORGANIZATION_ID = 2
@@ -3028,6 +3032,8 @@
                            ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
                  LEFT JOIN AMS_PURCHASE_ORDER APO
                            ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+                 left join RMS_WAREHOUSE RW2
+                 ON RW2.WAREHOUSE_ID=OO.DRIVER_CONFIRMATION
                  LEFT JOIN RMS_SUPPLIER RS
                            ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
                  LEFT JOIN RMS_CONSIGNEE RCON
@@ -3839,4 +3845,15 @@
         </if>
         ORDER BY OO.ORDER_NUMBER DESC
     </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>