Skip to content

孙克 / Gree

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 8e0bf381 由 sunke
选项

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

1 个父辈 5e46f9f7
内嵌 并排
正在显示 4 个修改的文件 包含 42 行增加 和 6 行删除
myproject/src/main/java/com/myproject/dao/mongo/IDataLogDao.java
...@@ -30,6 +30,8 @@ public interface IDataLogDao extends IMongoDao { ...@@ -30,6 +30,8 @@ public interface IDataLogDao extends IMongoDao {
DataLog findLastOut(String areaId, String barcode); DataLog findLastOut(String areaId, String barcode);
List<DataLog> findUnExecuteTasks(String barcode, int opType);
List<DataLog> findUnFinishedTasks(String hSerial); List<DataLog> findUnFinishedTasks(String hSerial);
List<InventoryItem> getStorageLockCount(String storageId); List<InventoryItem> getStorageLockCount(String storageId);
......
myproject/src/main/java/com/myproject/dao/mongo/impl/DataLogDaoImpl.java
...@@ -100,7 +100,20 @@ public class DataLogDaoImpl extends AbstractMongoDao implements IDataLogDao { ...@@ -100,7 +100,20 @@ public class DataLogDaoImpl extends AbstractMongoDao implements IDataLogDao {
return findOne(query); 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()); 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); Query query = Query.query(c);
List<DataLog> feederTasks = findByQuery(query); List<DataLog> feederTasks = findByQuery(query);
......
myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java
...@@ -755,11 +755,15 @@ public class TaskService implements ITaskService { ...@@ -755,11 +755,15 @@ public class TaskService implements ITaskService {
@Override @Override
public boolean cancelTask(String taskId) { public boolean cancelTask(String taskId) {
DataLog task = dataLogDao.findOneById(taskId); DataLog task = dataLogDao.findOneById(taskId);
// if(task.isCheckOutTask()){ if(task != null){
// log.info(task.getBarcode() + "出库任务取消失败: 不允许取消"); List<DataLog> tasks = dataLogDao.findUnExecuteTasks(task.getBarcode(), task.getType());
// return false; for (DataLog dataLog : tasks) {
// } cancelTask(dataLog);
return cancelTask(task); }
return true;
}
return false;
} }
/** /**
......
myproject/src/main/webapp/WEB-INF/pages/updateHistory.jsp
...@@ -12,6 +12,23 @@ ...@@ -12,6 +12,23 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<ul class="timeline"> <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"> <li class="timeline-purple">
<div class="timeline-time"> <div class="timeline-time">
<span class="date">2021</span> <span class="date">2021</span>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!