#
zjj
2025-01-10 4c6ac55bbdfd2426274014047126da179bde367c
#
2个文件已修改
35 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/TaskWrkController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/TaskLogScheduler.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.param.TaskOverToWms;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.TaskWrkService;
@@ -47,6 +48,8 @@
    private CommandInfoService commandInfoService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private ApiLogService apiLogService;
    @RequestMapping(value = "/taskWrk/{wrkNo}/auth")
    @ManagerAuth
@@ -245,6 +248,14 @@
        }
        JSONObject jsonObject = JSON.parseObject(response);
        apiLogService.save("手动完成任务"
                ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
                ,null
                ,"127.0.0.1"
                ,JSON.toJSONString(taskOverToWms)
                ,response
                ,true
        );
        if (jsonObject.getInteger("code").equals(200)){
            if (taskWrk == null) {
                return R.error();
src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.*;
@@ -110,20 +111,25 @@
                            .build()
                            .doPost();
                }catch (Exception e){
                    log.error("wms任务完成请求出错"+e.getMessage());
                    continue;
                }
                if (Cools.isEmpty(response)){
                    log.error("wms任务完成,请求体:"+JSON.toJSONString(taskOverToWms)+"返回值为:"+response);
                }
                JSONObject jsonObject = JSON.parseObject(response);
                apiLogService.save("Wms任务完成接口"
                        ,wmsUrl+"/wcsManager/wcsInterface/taskStatusFeedback"
                        ,null
                        ,"127.0.0.1"
                        ,JSON.toJSONString(taskOverToWms)
                        ,response
                        ,true
                );
                if (jsonObject.getInteger("code").equals(200)){
                    apiLogService.save("Wms任务完成接口"
                            ,wmsUrl+"/wcsManager/wcsInterface/taskStatusFeedback"
                            ,null
                            ,"127.0.0.1"
                            ,JSON.toJSONString(taskOverToWms)
                            ,response
                            ,true
                    );
                }else {
                    continue;
                }