Merge branch 'master' into dev

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

@@ -740,8 +740,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         //新增运输订单
         omstruckOrderMapper.insertSelective(omstruckOrder);
         //更新运力状态为待运输：2
-        map.put("capacityStatus", 2);
-        omstruckOrderMapper.updateCapacityById(map);
+//        map.put("capacityStatus", 2);
+//        omstruckOrderMapper.updateCapacityById(map);
         //新增运输订单子表
         addOrderMaterial(map, omstruckOrder.getOrderId());
         //新增实绩总表关联订单 feign调用
@@ -1194,7 +1194,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             capacityMap.put("capacityNumber",capacityNumber);
             List<RmsCapacity> rmsCapacities = rmsCapacityMapper.selectByParameters(capacityMap);
             RmsCapacity rmsCapacity = rmsCapacities.get(0);
-            rmsCapacity.setCapacityStatus(new BigDecimal(2));
+//            rmsCapacity.setCapacityStatus(new BigDecimal(2));
             result +=rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
             BigDecimal capacityId = rmsCapacity.getCapacityId();
             capacityMap.clear();

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

@@ -187,19 +187,12 @@
 <!--    通过总实绩ID和路段顺序号查询装货实绩数据-->
     <select id="getLoadMes" parameterType="map" resultType="java.util.Map">
         select TLR.RESULT_LOAD_END_TIME "pointDate",
-               (case
-                   when OO.ORDER_TYPE in (1, 4)
-                   then (select RPP.PLATFORM_NAME
-                            from RMS_PWAREHOUSE_PLATFORM RPP
-                            where RPP.PLATFORM_ID = TLR.LOADING_ID )
-                   else (select RW.WAREHOUSE_NAME from RMS_WAREHOUSE RW
-                         where RW.WAREHOUSE_ID = TLR.LOADING_ID)
-               end) "pointName"
+               RW.WAREHOUSE_NAME "pointName"
         from TMSTRUCK_LOAD_RESULT TLR
         left join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
-        left join OMSTRUCK_ORDER OO
-            on OO.ORDER_ID = TTR.ORDER_ID
+        left join RMS_WAREHOUSE RW
+            on RW.WAREHOUSE_ID = TLR.LOADING_ID
         where TLR.RESULT_TOTAL_ID = #{resultTotalId} and TLR.SEGMENT_SQE = #{segmentSqe}
     </select>