src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/task/TaskReportScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -138,12 +138,10 @@ } else { staProtocol1 = staProtocol1.clone(); } if (staProtocol1.isLoading()) { return R.error(staProtocol.getSiteId() + "站点有物!"); } if (staProtocol.isLoading()) { return R.error(staProtocol.getSiteId() + "站点有物!"); } // if (staProtocol1.isLoading()) { // return R.error(staProtocol1.getSiteId() + "站点有物!"); // } if (!staProtocol.isAutoing()) { return R.error(staProtocol.getSiteId() + "站点fei自动"); } src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import java.io.IOException; @@ -42,20 +43,24 @@ case 5: break; } exe(taskWrk); } } @Transactional public void exe(TaskWrk taskWrk) { TaskWrkReport taskWrkReport = new TaskWrkReport(); TaskWrkLog taskWrkLog = new TaskWrkLog(); Synchro.Copy(taskWrk, taskWrkReport); Synchro.Copy(taskWrk, taskWrkLog); if (!taskWrkReportService.insert(taskWrkReport)) { throw new CoolException("转移至上报表" + taskWrk); } if (!wrkLogService.insert(taskWrkLog)) { throw new CoolException("转历史档失败" + taskWrk); } if (!taskWrkService.deleteById(taskWrk)) { throw new CoolException("任务档删除失败" + taskWrk); } if (!taskWrkReportService.insert(taskWrkReport)) { throw new CoolException("转移至上报表" + taskWrk); } } } src/main/java/com/zy/asrs/task/TaskReportScheduler.java
@@ -31,6 +31,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.io.IOException; @@ -83,6 +84,7 @@ // WMS分配入库库位异常上报 @Scheduled(cron = "0/5 * * * * ? ") @Transactional public synchronized void locationAssignmentExceptionEscalation() { List<TaskWrk> taskWrkList = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>().eq("wrk_sts", 5));