Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -667,7 +667,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         Map<String, Object> map = omstruckOrderMapper.selectInwardTimeByOrderId(new BigDecimal(orderId));
         //根据运输订单id查找需求日期是否超过一个月
         if (map != null && i != 0) {
-            if (DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 11) {
+            if (DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 11 || DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 25) {
                 Date dueDate = (Date) map.get("dueTime");
                 //当前时间小于截至日期
                 long DueTime = dueDate.getTime() + 86400000;