root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:刻字输送线任务下发控制

Browse Source
This commit is contained in:
zhangzhiqiang
2023-08-25 16:01:17 +08:00
parent eeb28c7361
commit b10f1d806a
2 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
View File

@@ -35,7 +35,7 @@ public class RedissonUtils {
if (isLock){ if (isLock){
process.process(); process.process();
} else { } else {
throw new BadRequestException("当前业务 key:"+key+"正在执行请稍后再试"); throw new BadRequestException("当前业务:"+key+"正在执行请稍后再试");
} }
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java
View File

@@ -234,6 +234,7 @@ public class TmpKZController {
@Log("刻字任务重新下发") @Log("刻字任务重新下发")
@SaIgnore @SaIgnore
public ResponseEntity<Object> resend(@RequestBody JSONObject param){ public ResponseEntity<Object> resend(@RequestBody JSONObject param){
RedissonUtils.lock(()->{
SchBaseTask baseTask = taskService.getById(param.getString("task_id")); SchBaseTask baseTask = taskService.getById(param.getString("task_id"));
if (baseTask.getTask_status().equals(StatusEnum.TASK_FINISH.getCode())){ if (baseTask.getTask_status().equals(StatusEnum.TASK_FINISH.getCode())){
throw new BadRequestException("任务已经完成"); throw new BadRequestException("任务已经完成");
@@ -270,8 +271,11 @@ public class TmpKZController {
taskService.updateById(baseTask); taskService.updateById(baseTask);
} }
}else { }else {
taskService.operation(MapOf.of("method_name","immediateNotifyAcs","task_id",param.getString("task_id"))); throw new BadRequestException("搬运任务不允许直接下发");
//taskService.operation(MapOf.of("method_name","immediateNotifyAcs","task_id",param.getString("task_id")));
} }
},"刻字输送线下发",null);
return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
} }