#
taisheng
2025-05-23 b5a0b7e2980676daf22b2440b43d9e1db6aea197
src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -61,50 +61,63 @@
    @Scheduled(cron = "0/3 * * * * ? ")
    public void execute() throws IOException {
        for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
            HashMap<String, Object> headParam = new HashMap<>();
            if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)||taskWrk.getStatus()==7) {//完成
                headParam.put("Result", 1);
            } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
                headParam.put("Result", 2);
        //入库9转历史档
        List<TaskWrk> taskWrkList = taskWrkService.selectList(new EntityWrapper<TaskWrk>().eq("wrk_sts", 9));
        for (TaskWrk taskWrk : taskWrkList) {
            TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
            if (!wrkLogService.insert(taskWrkLog)) {
                throw new CoolException("转历史档失败" + taskWrkLog);
            }
            String response = "";
            Boolean bool = false;
            try {
                headParam.put("TaskNo", taskWrk.getTaskNo());
                log.info("wcs手动完成任务上报wms={}", taskWrk);
                response = new HttpHandler.Builder()
                        // .setHeaders(headParam)
                        .setUri(wmsUrl)
                        .setPath(TaskExecCallback)
                        .setJson(JSON.toJSONString(headParam))
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
            if (!taskWrkService.deleteById(taskWrk)) {
                throw new CoolException("任务档删除失败" + taskWrkLog);
            }
                if(jsonObject.get("ReturnStatus").equals(0)){
                    TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk);
                    if(!wrkLogService.insert(taskWrkLog)){
                        throw new CoolException("转历史档失败"+taskWrkLog);
                    }
                    if(!taskWrkService.deleteById(taskWrk)){
                        throw new CoolException("任务档删除失败"+taskWrkLog);
                    }
                    bool = true;
                }
            } catch (Exception e) {
                log.error("wcs手动完成任务上报wms失败{},返回值={}", taskWrk, response);
            }finally {
                apiLogService.save("wcs完成或者取消任务上报wms"
                        , wmsUrl + TaskExecCallback
                        , null
                        , "127.0.0.1"
                        , JSON.toJSONString(headParam)
                        , response
                        , bool
                );
            }
        }
//        for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
//            HashMap<String, Object> headParam = new HashMap<>();
//            if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus() == 7) {//完成
//                headParam.put("Result", 1);
//            } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
//                headParam.put("Result", 2);
//            }
//            String response = "";
//            Boolean bool = false;
//            try {
//                headParam.put("TaskNo", taskWrk.getTaskNo());
//                log.info("wcs手动完成任务上报wms={}", taskWrk);
//                response = new HttpHandler.Builder()
//                        // .setHeaders(headParam)
//                        .setUri(wmsUrl)
//                        .setPath(TaskExecCallback)
//                        .setJson(JSON.toJSONString(headParam))
//                        .build()
//                        .doPost();
//                JSONObject jsonObject = JSON.parseObject(response);
//        TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
//               if(jsonObject.get("ReturnStatus").equals(0)){
//                    taskWrkLog.setWrkSts(8);
//        if (!wrkLogService.insert(taskWrkLog)) {
//            throw new CoolException("转历史档失败" + taskWrkLog);
//        }
//        if (!taskWrkService.deleteById(taskWrk)) {
//            throw new CoolException("任务档删除失败" + taskWrkLog);
//        }
//                    bool = true;
//                }
//            } catch (Exception e) {
//                log.error("wcs手动完成任务上报wms失败{},返回值={}", taskWrk, response);
//            } finally {
//                apiLogService.save("wcs完成或者取消任务上报wms"
//                        , wmsUrl + TaskExecCallback
//                        , null
//                        , "127.0.0.1"
//                        , JSON.toJSONString(headParam)
//                        , response
//                        , bool
//                );
//            }
//        }
    }
}