修改

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

@@ -397,4 +397,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     List<BigDecimal> selectContinueOrderId(BigDecimal orderId);
 
+    int updateTotalResultNull(BigDecimal resultTotalId);
+
 }

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

@@ -598,7 +598,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             throw new Exception("已过磅，撤单失败！");
         }
         //如果是老区已进场或者内转，则删除计量委托
-        if(orderType !=4 && (omstruckOrderSeparateMapper.countEnFactory(orderId) > 0 || orderType==11 || orderType == 15 || orderType == 16)){
+        if(orderType != 6 && orderType != 17 &&  orderType !=4 && (omstruckOrderSeparateMapper.countEnFactory(orderId) > 0 || orderType==11 || orderType == 15 || orderType == 16)){
             //获取运输订单号
             String orderNumber = (String) mesMap.get("orderNumber");
             //撤销订单的同时删除计量数据
@@ -635,6 +635,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderMapper.deleteQueueSpellList(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
                 omstruckOrderMapper.deleteQueueResult(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
             }
+            //撤单需要将总实绩里面的部分信息去掉
+            try {
+                omstruckOrderMapper.updateTotalResultNull(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         if (DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 1) {
             omstruckOrder.setOrderStatus(new BigDecimal(4));

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

@@ -4300,6 +4300,14 @@
         AND OO.ORDER_STATUS = 4
         AND OO.ORDER_TYPE = 11
     </update>
+    <update id="updateTotalResultNull" parameterType="DECIMAL">
+        UPDATE TMSTRUCK_TOTAL_RESULT TTR
+        SET TTR.QUEUE_ALLOW_TIME = NULL,
+            TTR.ENFACTORY_TIME = NULL,
+            TTR.QUEUE_START_TIME = NULL,
+            TTR.ORDER_STATUS = '已派单'
+        WHERE TTR.RESULT_TOTAL_ID = #{resultTotalId}
+    </update>
 
     <select id="getMulInwardOrderMessageToApp" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT DISTINCT