'焦炭派车'

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

@@ -260,4 +260,11 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         return success(result);
     }
 
+    @ApiOperation(value = "根据运单id查询出所有销售数据")
+    @PostMapping("/getSaleAllMessages")
+    public Map<String,Object> getSaleAllMessages(@RequestParam Integer orderId){
+        Map<String, Object> mapValue = omstruckOrderSeparateService.getSaleAllMessages(new BigDecimal(orderId));
+        return mapValue;
+    }
+
 }

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

@@ -85,6 +85,15 @@ public interface OmstruckOrderSeparateMapper {
     //查询订单发货日期（订单类型为2）
     Integer getDeliveryDate(Object orderId);
 
+    // 查询销售焦炭所需的map
+    Map<String, Object> getSaleAllMessages(BigDecimal orderId);
+
+    // 查询销售焦炭所需的mapList
+    List<Map<String, Object>> getMapList(BigDecimal orderId);
+
+    // 查询销售焦炭的最大车序号
+    List<Map<String, Object>> getMaxTruckNo(BigDecimal saleOrderId);
+
 
 //    int updateTimes(@Param("orderPlanId") BigDecimal orderPlanId, @Param("times")int times);
 

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

@@ -29,4 +29,7 @@ public interface IOmstruckOrderSeparateService {
 
     //更改趟次
     int updateTimes(BigDecimal orderPlanId, int i);
+
+    // 根据运单id查询出所有销售数据
+    Map<String, Object> getSaleAllMessages(BigDecimal orderId);
 }

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

@@ -428,4 +428,24 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
 //    public int updateTimes(BigDecimal orderPlanId, int times) {
 //         return omstruckOrderSeparateMapper.updateTimes(orderPlanId,times);
 //       }
+
+    /**
+     * 根据运单id查询出所有销售数据
+     * @param orderId
+     * @return
+     */
+    @Override
+    public Map<String, Object> getSaleAllMessages(BigDecimal orderId) {
+        // 销售订单id
+        Map<String,Object> mapValue = omstruckOrderSeparateMapper.getSaleAllMessages(orderId);
+        BigDecimal saleOrderId = (BigDecimal) mapValue.get("saleOrderId");
+        // 车序号
+        List<Map<String, Object>> truckList = omstruckOrderSeparateMapper.getMaxTruckNo(saleOrderId);
+        Map<String, Object> map = truckList.get(0);
+        mapValue.putAll(map);
+        // mapList中的数据
+        List<Map<String,Object>> mapList = omstruckOrderSeparateMapper.getMapList(orderId);
+        mapValue.put("mapList",mapList);
+        return mapValue;
+    }
 }

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

@@ -514,4 +514,47 @@
 <!--          where sporadic_order_id= #{orderPlanId}-->
 <!--      </update>-->
 
+    <select id="getSaleAllMessages" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT ASOM.SALE_ORDER_ID AS "saleOrderId",
+               ASO.CLOSE_STATUS   AS "closeStatus"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <select id="getMaxTruckNo" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT ASOM.SALE_ORDER_MATERIAL_TRUCK_NO AS "truckNo"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
+        ORDER BY ASOM.SALE_ORDER_MATERIAL_TRUCK_NO DESC
+    </select>
+
+    <select id="getMapList" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT ASOM.SALE_SHIPPING_ADDRESS_ID AS "saleShippingAddressId",
+               ASOM.SALE_ORDER_CONSIGNEE     AS "saleOrderConsignee",
+               ASOM.SALE_ORDER_CONSIGNEE_TEL AS "saleOrderConsigneeTel",
+               ASM.SALE_MATERIAL_ID          AS "saleMaterialId",
+               ADSO.CARRIER_ID               AS "carrierId",
+               OO.LINE_ID                    AS "lineId",
+               OOM.MATERIAL_ID               AS "materialId",
+               OOM.ORDER_MATERIAL_WEIGHT     AS "orderPlanWeight",
+               RC.CAPACITY_NUMBER            AS "capacityNumber"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+                           ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_MATERIAL ASM
+                           ON ASM.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                           ON OOM.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>