#

Junjie

2025-05-23 3c02e5919ab81c3710bab8b0cc0e229c8f95d92b

 src/main/java/com/zy/asrs/controller/TaskWrkController.java

@@ -11,6 +11,8 @@
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.TaskWrkLog;
import com.zy.asrs.entity.param.NotifyDto;
import com.zy.asrs.entity.param.TaskOverToWms;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.CommandInfoService;
@@ -45,8 +47,8 @@
    @Autowired
    private LocMastService locMastService;

    @Value("${wms.taskStatusFeedbackPath}")
    private String taskStatusFeedbackPath;
    @Value("${wms.TaskExecCallback}")
    private String TaskExecCallback;

    @Autowired
    private ApiLogService apiLogService;
@@ -212,25 +214,24 @@
            locMast.setBarcode(taskWrk.getBarcode());

        }
        String response="";
        try{
            HashMap<String, Object> headParam = new HashMap<>();
            headParam.put("taskNo",taskWrk.getTaskNo());
            headParam.put("status",taskWrk.getStatus());
            headParam.put("ioType",taskWrk.getIoType());
            headParam.put("barcode",taskWrk.getBarcode());
            headParam.put("reportTime",new Date());
            String response;
            headParam.put("TaskNo",taskWrk.getTaskNo());
            headParam.put("Result",1);
//            headParam.put("reportTime",new Date());
            log.info("wcs手动完成任务上报wms={}", taskWrk);
            response = new HttpHandler.Builder()
                    // .setHeaders(headParam)
                    .setUri(wmsUrl)
                    .setPath(taskStatusFeedbackPath)
                    .setPath(TaskExecCallback)
                    .setJson(JSON.toJSONString(headParam))
                    .build()
                    .doPost();

            JSONObject jsonObject = JSON.parseObject(response);
            apiLogService.save("wcs派发入库任务上报wms"
                    ,wmsUrl+taskStatusFeedbackPath
            apiLogService.save("wcs手动完成任务上报wms"
                    ,wmsUrl+TaskExecCallback
                    ,null
                    ,"127.0.0.1"
                    ,JSON.toJSONString(headParam)
@@ -238,14 +239,37 @@
                    ,true
            );
        }catch (Exception e){
            log.error("wcs手动取消任务上报wms失败", taskWrk);
            throw new CoolException("wcs派发入库任务上报wms失败");
            log.error("wcs手动完成任务上报wms失{},返回值={}", taskWrk,response);
//            throw new CoolException(e);
        }
        locMastService.updateById(locMast);
        taskWrk.setStatus(7);//手动完成任务
        taskWrk.setModiTime(new Date());
        taskWrkService.updateById(taskWrk);
        return R.ok();
    }

    @PostMapping(value = "/taskWrk/returnWorkingCondition/auth")
    @ManagerAuth(memo = "重新给堆垛机下发任务")
    public R returnWorkingCondition(@RequestParam String taskNo) {
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
        if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==12){
            taskWrk.setWrkSts(11);
            if(!taskWrkService.updateById(taskWrk)){
                return R.error("更新任务状态失败");
            }
            return R.ok();
        } else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==3) {
            taskWrk.setWrkSts(2);
            taskWrkService.updateById(taskWrk);
            if(!taskWrkService.updateById(taskWrk)){
                return R.error("更新任务状态失败");
            }
            return R.ok();
        }else{
            return R.error("任务状态不对无法重新给堆垛机下发任务");
        }

    }

    @PostMapping(value = "/taskWrk/cancel/auth")
@@ -266,35 +290,35 @@
        }catch (Exception e){
            taskWrk.setModiUser(9999L);//操作员
        }
        try{
            HashMap<String, Object> headParam = new HashMap<>();
            headParam.put("taskNo",taskWrk.getTaskNo());
            headParam.put("status",taskWrk.getStatus());
            headParam.put("ioType",taskWrk.getIoType());
            headParam.put("barcode",taskWrk.getBarcode());
            headParam.put("reportTime",new Date());
            String response;
            response = new HttpHandler.Builder()
                    // .setHeaders(headParam)
                    .setUri(wmsUrl)
                    .setPath(taskStatusFeedbackPath)
                    .setJson(JSON.toJSONString(headParam))
                    .build()
                    .doPost();

            JSONObject jsonObject = JSON.parseObject(response);
            apiLogService.save("wcs派发入库任务上报wms"
                    ,wmsUrl+taskStatusFeedbackPath
                    ,null
                    ,"127.0.0.1"
                    ,JSON.toJSONString(headParam)
                    ,response
                    ,true
            );
        }catch (Exception e){
            log.error("wcs手动完结任务上报wms失败", taskWrk);
            throw new CoolException("wcs派发入库任务上报wms失败");
        }
        String response="";
//        try{
//            HashMap<String, Object> headParam = new HashMap<>();
//            headParam.put("TaskNo",taskWrk.getTaskNo());
//            headParam.put("Result",0);
////            headParam.put("reportTime",new Date());
//
//            log.info("wcs手动取消任务上报wm={}", taskWrk);
//            response = new HttpHandler.Builder()
//                    // .setHeaders(headParam)
//                    .setUri(wmsUrl)
//                    .setPath(TaskExecCallback)
//                    .setJson(JSON.toJSONString(headParam))
//                    .build()
//                    .doPost();
//            JSONObject jsonObject = JSON.parseObject(response);
//            apiLogService.save("wcs手动取消任务上报wms"
//                    ,wmsUrl+TaskExecCallback
//                    ,null
//                    ,"127.0.0.1"
//                    ,JSON.toJSONString(headParam)
//                    ,response
//                    ,true
//            );
//        }catch (Exception e){
//            log.error("wcs手动取消任务上报wms失败={},返回值={}", taskWrk,response);
////            throw new CoolException(e);
//        }
        taskWrk.setWrkSts(9);
        taskWrk.setCompleteTime(now);//完结时间
        taskWrkService.updateById(taskWrk);
        return R.ok();
@@ -328,4 +352,32 @@
        }
    }

    @PostMapping(value = "/taskWrk/state")
//    @ManagerAuth(memo = "接收RCS任务状态")
    public R taskWrkState(@RequestBody NotifyDto notifyDto) {
        log.info("接收RCS任务状态={}", notifyDto);
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(notifyDto.getSuperTaskNo());//wms任务号
        if (taskWrk == null) {
            return R.error("没有找到该任务={"+notifyDto+"}");
        }
        Date now = new Date();
        if(notifyDto.getMsgType().equals("task_complete")&&taskWrk.getIoType()==3){
            taskWrk.setWrkSts(9);//更新数据完成，直接转历史档

            //更新源库位状态为空库位
            LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
            locMast.setLocSts("O");
            locMastService.updateById(locMast);

            //更新目标库状态为在库
            LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
            locMast2.setLocSts("F");
            locMastService.updateById(locMast2);
            taskWrk.setModiTime(now);//操作时间
            taskWrk.setModiUser(9998L);//操作员
            taskWrkService.updateById(taskWrk);
        }
        return R.ok();
    }

}