取消时取消该条码所有未完成的任务

myproject/src/main/java/com/myproject/dao/mongo/IDataLogDao.java

@@ -30,6 +30,8 @@ public interface IDataLogDao extends IMongoDao {
 
     DataLog findLastOut(String areaId, String barcode);
 
+    List<DataLog> findUnExecuteTasks(String barcode, int opType);
+
     List<DataLog> findUnFinishedTasks(String hSerial);
 
     List<InventoryItem> getStorageLockCount(String storageId);

myproject/src/main/java/com/myproject/dao/mongo/impl/DataLogDaoImpl.java

@@ -100,12 +100,25 @@ public class DataLogDaoImpl extends AbstractMongoDao implements IDataLogDao {
         return findOne(query);
     }
 
-    private List<DataLog> findUnExecuteTasks(String executingHSerial) {
+    @Override
+    public List<DataLog> findUnExecuteTasks(String barcode, int opType) {
+        Criteria c = Criteria.where("barcode").is(barcode)
+                .and("type").is(opType)
+                .and("status").in(StorageConstants.OP_STATUS.WAIT.name(),StorageConstants.OP_STATUS.EXECUTING.name(),StorageConstants.OP_STATUS.PAUSE.name());
+        Query query = Query.query(c);
+        List<DataLog> tasks = findByQuery(query);
+        if(tasks == null){
+            tasks = new ArrayList<>();
+        }
+        return tasks;
+    }
+
+    public List<DataLog> findUnExecuteTasks(String executingHSerial) {
         Criteria c = Criteria.where("appendInfo.hSerial").ne(executingHSerial).and("status").in(StorageConstants.OP_STATUS.WAIT.name(),StorageConstants.OP_STATUS.EXECUTING.name(),StorageConstants.OP_STATUS.PAUSE.name());
         Query query = Query.query(c);
         List<DataLog> feederTasks = findByQuery(query);
         if(feederTasks == null){
-           feederTasks = new ArrayList<>();
+            feederTasks = new ArrayList<>();
         }
         return feederTasks;
     }

myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java

@@ -755,11 +755,15 @@ public class TaskService implements ITaskService {
     @Override
     public boolean cancelTask(String taskId) {
         DataLog task = dataLogDao.findOneById(taskId);
-//        if(task.isCheckOutTask()){
-//            log.info(task.getBarcode() + "出库任务取消失败: 不允许取消");
-//            return false;
-//        }
-        return cancelTask(task);
+        if(task != null){
+            List<DataLog> tasks = dataLogDao.findUnExecuteTasks(task.getBarcode(), task.getType());
+            for (DataLog dataLog : tasks) {
+                cancelTask(dataLog);
+            }
+            return true;
+        }
+
+        return false;
     }
 
     /**

myproject/src/main/webapp/WEB-INF/pages/updateHistory.jsp

@@ -12,6 +12,23 @@
 <div class="row">
     <div class="col-md-12">
         <ul class="timeline">
+            <li class="timeline-grey">
+                <div class="timeline-time">
+                    <span class="date">2021</span>
+                    <span class="time">02-07</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2021020710</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>取消任务时同时取消同一条码未完成的其他任务</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
             <li class="timeline-purple">
                 <div class="timeline-time">
                     <span class="date">2021</span>