修改撤单接口

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

@@ -372,4 +372,11 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     int getGoBeyondCount(Object orderId);
 
+    int getMaterialNumByOrderId(BigDecimal orderId);
+
+    int deleteQueueList(BigDecimal capacityId);
+
+    int deleteQueueResult(BigDecimal resultTotalId);
+
+    int deleteQueueSpellList(BigDecimal capacityId);
 }

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

@@ -608,6 +608,16 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         omstruckOrder.setOrderStatus(new BigDecimal(7));
         if(orderType == 1) {
             omstruckOrder.setOrderStatus(new BigDecimal(4));
+            //判断该车是几拼
+            int materialMesCount = omstruckOrderMapper.getMaterialNumByOrderId(orderId);
+            if (materialMesCount == 1) {
+                //如果是单拼,则删除排队实绩
+                omstruckOrderMapper.deleteQueueList(DataChange.dataToBigDecimal(mesMap.get("capacityId")));
+                omstruckOrderMapper.deleteQueueResult(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+            }else{
+                omstruckOrderMapper.deleteQueueSpellList(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+                omstruckOrderMapper.deleteQueueResult(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+            }
         }
         if (DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 1) {
             omstruckOrder.setOrderStatus(new BigDecimal(4));
@@ -632,18 +642,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 result += omstruckOrderMapper.deleteTimeTaskByTotalId(resultTotalId);
             }
         }
-        if(orderType == 1||orderType == 4){
-            //取消订阅车辆
-            String remark = String.valueOf(mesMap.get("insertUpdateRemark"));
-            if("电子围栏订阅成功".equals(remark)){
-                String capacityNumber = String.valueOf(map.get("capacityNumber"));
-                map.put("capacityNumber", capacityNumber + "_2");
-                int i = zjxlUtilService.cancelSubsCapacity(map, 1);
-                if(i == 1){
-                    zjxlUtilMapper.cancelSubCapacity(capacityNumber);
-                }
-            }
-        }
         //通过总实绩ID删除所有已经生成的实绩
         result += omstruckOrderMapper.deleteEnResult(resultTotalId);
         result += omstruckOrderMapper.deleteWeightResult(resultTotalId);

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

@@ -4361,4 +4361,18 @@
         WHERE sysdate - oo.INSERT_TIME <= 5
         and oo.ORDER_ID = #{orderId}
     </select>
+    <select id="getMaterialNumByOrderId" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+        SELECT count(oom.ORDER_MATERIAL_ID) FROM  OMSTRUCK_ORDER_MATERIAL OOM
+        WHERE OOM.ORDER_ID = #{orderId}
+    </select>
+    <delete id="deleteQueueList">
+        delete from QMS_QUEUE_LIST QQL where CAPACITY_ID = #{capacityId}
+    </delete>
+    <delete id="deleteQueueResult">
+        delete from QMS_QUEUE_RESULT QQR WHERE QQR.RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+    <delete id="deleteQueueSpellList">
+        delete from QMS_QUEUE_SPELLING_LIST QQSL where QQSL.QUEUE_RESULT_ID =
+        (SELECT QQR.RESULT_ID FROM QMS_QUEUE_RESULT QQR WHERE QQR.RESULT_TOTAL_ID = #{resultTotalId})
+    </delete>
 </mapper>

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

@@ -761,7 +761,8 @@
                TTR.RESULT_TOTAL_ID  "resultTotalId",
                OO.INSERT_UPDATE_REMARK  "insertUpdateRemark",
                OO.ORDER_LINE_SEQUENCE   "lineSqe",
-                OO.ORDER_NUMBER "orderNumber"
+                OO.ORDER_NUMBER "orderNumber",
+               OO.CAPACITY_ID   "capacityId"
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
         where OO.ORDER_ID = #{orderId}