Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

src/main/java/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.java

@@ -126,4 +126,6 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
     int copyQmsResult(Map<String, Object> updateMap);
 
     int updateOmstruckStatus(Map<String, Object> updateMap);
+
+    int updateOrderStatus(Map<String, Object> updateMap);
 }

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

@@ -111,6 +111,12 @@ public class TmstruckTotalResultServiceImpl implements ITmstruckTotalResultServi
             serachMap.put("resultTotalId",maxId);
             serachMap.put("resultTotalIdOld",resultTotalIdOld);
             tmstruckWeightResultMapper.copyQmsResult(serachMap);
+        }else{
+            //未进厂，状态为待接收
+            Map<String,Object> orderMap=new HashMap<>();
+            orderMap.put("orderId",orderId);
+            orderMap.put("orderStatus",4);
+            tmstruckWeightResultMapper.updateOrderStatus(orderMap);
         }
         return maxId.intValue();
     }

src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -2874,4 +2874,9 @@
         SET ORDER_LINE_SEQUENCE=#{seq}
         WHERE ORDER_ID=#{orderId}
     </update>
+    <update id="updateOrderStatus">
+        update OMSTRUCK_ORDER
+        SET ORDER_STATUS=#{orderStatus}
+        where ORDER_ID=#{orderId}
+    </update>
 </mapper>