修改

src/main/java/com/steerinfo/dil/controller/OffSiteTransportationController.java

@@ -279,7 +279,17 @@ public class OffSiteTransportationController extends BaseRESTfulController {
         map.put("resultArrivalAddress",resultArrivalAddress);
         map.putAll(value);
         //添加入库实绩
-        Integer resTfulResult = offSiteTransportationService.addTmstruckReceiptResult(map);
+        Integer resTfulResult=0;
+        try {
+            resTfulResult = offSiteTransportationService.addTmstruckReceiptResult(map);
+        }catch (Exception e){
+            e.printStackTrace();
+            if(e.getMessage()==null||e.getMessage().contains("Exception")){
+                return failed("订单异常，请刷新重试！");
+            }else{
+                return failed(e.getMessage());
+            }
+        }
         if (resTfulResult!=4){
             //关闭运输订单
             offSiteTransportationService.orderClose(orderNumber);

src/main/java/com/steerinfo/dil/controller/TmstruckReceiptResultController.java

@@ -102,7 +102,7 @@ public class TmstruckReceiptResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "map", value = "收货实绩map", required = false, dataType = "java.util.Map")
     })
     @PostMapping(value = "/addTmstruckReceiptResult")
-    public RESTfulResult addTmstruckReceiptResult(@RequestBody(required = false) Map<String, Object> map){
+    public RESTfulResult addTmstruckReceiptResult(@RequestBody(required = false) Map<String, Object> map) throws Exception {
         BigDecimal alreadyExistsArrivalResult = tmstruckArrivalResultMapper.alreadyExistsArrivalResult((String) map.get("orderNumber"));
         if(alreadyExistsArrivalResult!=null){
             TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();

src/main/java/com/steerinfo/dil/service/ITmstruckReceiptResultService.java

@@ -30,7 +30,7 @@ public interface ITmstruckReceiptResultService{
     int addSteelNzReceiptResult(Map<String, Object> map);
 
     //添加收货实绩主表
-    BigDecimal addTmstruckReceiptResult(String orderNumber, TmstruckReceiptResult tmstruckReceiptResult);
+    BigDecimal addTmstruckReceiptResult(String orderNumber, TmstruckReceiptResult tmstruckReceiptResult) throws Exception;
     //获取收货实绩信息
     List<Map<String, Object>> getReceiptResultInfo(Map<String, Object> map);
     //获取抵达作业照片

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

@@ -241,7 +241,7 @@ public class OffSiteTransportationServiceImpl implements OffSiteTransportationSe
         return routeService.saveRoute(parem).toString();
     }
 
-    public Integer addTmstruckReceiptResult(@RequestBody(required = false) Map<String,Object> map){
+    public Integer addTmstruckReceiptResult(@RequestBody(required = false) Map<String,Object> map) throws Exception {
         BigDecimal alreadyExistsArrivalResult = tmstruckArrivalResultMapper.alreadyExistsArrivalResult((String) map.get("orderNumber"));
         if(alreadyExistsArrivalResult!=null){
             TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();

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

@@ -47,7 +47,7 @@ public class TmstruckReceiptResultServiceImpl implements ITmstruckReceiptResultS
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public synchronized BigDecimal addTmstruckReceiptResult(String orderNumber, TmstruckReceiptResult tmstruckReceiptResult) {
+    public synchronized BigDecimal addTmstruckReceiptResult(String orderNumber, TmstruckReceiptResult tmstruckReceiptResult) throws Exception {
         long id;
         if(tmstruckReceiptResultMapper.selectMaxId()==null){
             id = 1;
@@ -60,6 +60,9 @@ public class TmstruckReceiptResultServiceImpl implements ITmstruckReceiptResultS
         tmstruckReceiptResult.setResultId(new BigDecimal(id));
         //获取并插入总实绩Id
         BigDecimal truckTotalId = tmstruckArrivalResultMapper.getTotalIdByOrderNumber(orderNumber);
+        if(truckTotalId==null){
+            throw new Exception("运单状态异常，无法上传图片，请刷新!");
+        }
         tmstruckReceiptResult.setResultTotalId(truckTotalId);
         //常规字段
         tmstruckReceiptResult.setInsertUsername("admin");

src/main/resources/com/steerinfo/route/mapper/TmstruckArrivalResultMapper.xml

@@ -530,7 +530,7 @@
         from TMSTRUCK_TOTAL_RESULT t_total
                left join OMSTRUCK_ORDER o_order
                          on t_total.ORDER_ID=o_order.ORDER_ID
-        where o_order.ORDER_NUMBER = #{orderNumber}
+        where o_order.ORDER_NUMBER = #{orderNumber} AND o_order.ORDER_STATUS IN (2,5)
   </select>