dsk

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

@@ -195,8 +195,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 throw  new Exception("该车作业环节未全部完成！");
             }
         }
-        Map<String,Object> loadResultMap = tmstruckLoadResultMapper.getLoadResultMap(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
         if(orderType == 2){
+            Map<String,Object> loadResultMap = tmstruckLoadResultMapper.getLoadResultMap(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
             //根据总实绩ID查询该车有没有装货
             if(loadResultMap == null || loadResultMap.get("loadEndTime") == null){
                 throw new Exception("该车未扫装货，请提醒司机去扫装货");
@@ -216,6 +216,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             }
         }
         if(orderType == 13){
+            Map<String,Object> loadResultMap = tmstruckLoadResultMapper.getLoadResultMap(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
             if(loadResultMap == null || loadResultMap.get("loadEndTime") == null){
                 throw new Exception("该车未扫装货，请提醒司机去扫装货");
             }