修正导入工单需求数量为0的情况

This commit is contained in:
梁州 2025-03-02 17:29:15 +08:00
parent 93645a8695
commit ade4d84ec9
2 changed files with 11 additions and 4 deletions

View File

@ -973,6 +973,15 @@ public class TaskController {
response.setMessage("获取不到正确的站台号"); response.setMessage("获取不到正确的站台号");
return convertJsonString(response); return convertJsonString(response);
} }
// 判断当前站台是否还有亮灯数据
if (etagLocationService.exists(new LambdaQueryWrapper<ETagLocation>()
.eq(ETagLocation::getWorkStation, standId)
.eq(ETagLocation::getPickStatus, 1))) {
logger.error("站台灯光未全部拍灭,请检查。");
response.setCode(ResponseCode.ERROR.getCode());
response.setMessage("站台灯光未全部拍灭,请检查。");
return convertJsonString(response);
}
// 根据站台号查找对应的载具号 // 根据站台号查找对应的载具号
PickTask pickTask = pickTaskService.getOne(new LambdaQueryWrapper<PickTask>() PickTask pickTask = pickTaskService.getOne(new LambdaQueryWrapper<PickTask>()
.eq(PickTask::getStandId, standId) .eq(PickTask::getStandId, standId)

View File

@ -65,11 +65,10 @@ public class WorkServiceImplements implements IWorkService {
* 新版创建工作 * 新版创建工作
* *
* @param workStation 工作站台 * @param workStation 工作站台
* @throws Exception 异常
*/ */
@Override @Override
@Transactional(isolation = Isolation.REPEATABLE_READ, propagation = Propagation.REQUIRED) @Transactional(isolation = Isolation.REPEATABLE_READ, propagation = Propagation.REQUIRED)
public void createWork(String workStation) throws Exception { public void createWork(String workStation) {
if (workCreatingStations.contains(workStation)) { if (workCreatingStations.contains(workStation)) {
// 当前站台正在创建任务 // 当前站台正在创建任务
return; return;
@ -230,11 +229,10 @@ public class WorkServiceImplements implements IWorkService {
* 新版开始工作 * 新版开始工作
* *
* @param workStation 工作站台 * @param workStation 工作站台
* @throws Exception 异常
*/ */
@Override @Override
@Transactional(isolation = Isolation.REPEATABLE_READ, propagation = Propagation.REQUIRED) @Transactional(isolation = Isolation.REPEATABLE_READ, propagation = Propagation.REQUIRED)
public void doWork(String workStation) throws Exception { public void doWork(String workStation) {
if (workDoingStations.contains(workStation)) { if (workDoingStations.contains(workStation)) {
// 当前站台正在创建任务 // 当前站台正在创建任务
return; return;