修改

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

@@ -235,8 +235,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         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("该车未扫装货，请提醒司机去扫装货");
+            if(loadResultMap == null || (loadResultMap != null && loadResultMap.get("loadEndTime") == null)){
+                throw new Exception("该车未扫装货，请提醒司机去补扫装货");
             }
             // 查询运单所属的销售订单id
             BigDecimal saleOrderId = tmstruckLeaveFactoryResultMapper.getSaleOrderId(orderNumber);
@@ -266,15 +266,15 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             //检查是否装货
             if(materials!=null && materials.size()>0){
                 Map<String,Object> loadResultMap = tmstruckLoadResultMapper.getLoadResultMap(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
-                if(loadResultMap == null || loadResultMap.get("loadEndTime") == null){
-                    throw new Exception("该车未扫装货，请提醒司机去扫装货");
+                if(loadResultMap == null || (loadResultMap != null && loadResultMap.get("loadEndTime") == null)){
+                    throw new Exception("该车未扫装货，请提醒司机去补扫装货");
                 }
             }
         }
         if(orderType == 23 || orderType == 24) {
             //查询卸货
             Map<String,Object> unloadMap = tmstruckLeaveFactoryResultMapper.getUnloadResult(DataChange.dataToBigDecimal(mesMap.get("orderId")));
-            if (unloadMap != null && unloadMap.get("resultEndTime") == null) {
+            if (unloadMap == null ||  (unloadMap != null && unloadMap.get("resultEndTime") == null)) {
                 throw new Exception("该车未扫卸货，请提醒司机去补扫卸货");
             }
         }

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

@@ -773,6 +773,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             jsonData = HTTPRequestUtils.send(daXingUrl, jsonObject, "utf-8");
         } catch (IOException e) {
             e.printStackTrace();
+            return -99;
         }
         //写入文件
         try{