luobang %!s(int64=2) %!d(string=hai) anos
pai
achega
885a5c1b8b

+ 1 - 1
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderSeparateServiceImpl.java

@@ -683,7 +683,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 || DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 25) {
+            if ((DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 11 || DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 25) && map.get("dueTime") != null) {
                 Date dueDate = (Date) map.get("dueTime");
                 //当前时间小于截至日期
                 long DueTime = dueDate.getTime() + 86400000;