#

Junjie

2025-06-23 116ab17ceb0c77aef99fa10b8a88fc055bb839f0

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

@@ -6,11 +6,12 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.domain.dto.NotifyCustomDataDto;
import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.CommandInfo;
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;
@@ -18,6 +19,7 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.utils.NotifyUtils;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -33,15 +35,18 @@

    @Value("${wms.url}")
    private String wmsUrl;

    @Autowired
    private TaskWrkService taskWrkService;

    @Autowired
    private CommandInfoService commandInfoService;

    @Autowired
    private LocMastService locMastService;
    @Value("${wms.TaskExecCallback}")
    private String TaskExecCallback;
    @Autowired
    private ApiLogService apiLogService;
    @Autowired
    private NotifyUtils notifyUtils;

    @RequestMapping(value = "/taskWrk/{wrkNo}/auth")
    @ManagerAuth
@@ -157,12 +162,12 @@
        return R.ok();
    }

    @PostMapping(value = "/taskWrk/distribute/auth")
    @ManagerAuth(memo = "手动派发任务")
    public R distribute(@RequestParam String taskNo) {
        taskWrkService.distribute(taskNo, getUserId());
        return R.ok();
    }
//    @PostMapping(value = "/taskWrk/distribute/auth")
//    @ManagerAuth(memo = "手动派发任务")
//    public R distribute(@RequestParam String taskNo) {
//        taskWrkService.distribute(taskNo, getUserId());
//        return R.ok();
//    }

    @PostMapping(value = "/taskWrk/complete/auth")
    @ManagerAuth(memo = "手动完成任务")
@@ -171,45 +176,68 @@
        if (Cools.isEmpty(taskWrk) || taskWrk.getStatus()>=3){
            return R.error("已完结或已取消") ;
        }
        LocMast locMast=new LocMast();
            if(taskWrk.getIoType()==1){//入库任务完成库位为F
                locMast=locMastService.selectByLocNo(taskWrk.getTargetPoint());
                if(Cools.isEmpty(locMast)){
                  R.error("没有找到该库位") ;
                }
                locMast.setLocSts("F");
                locMast.setModiTime(new Date());
                locMast.setBarcode(taskWrk.getBarcode());
            }else if(taskWrk.getIoType()==2){//出库任务完成库位为O
                locMast=locMastService.selectByLocNo(taskWrk.getStartPoint());
                if(Cools.isEmpty(locMast)){
                    R.error("没有找到该库位") ;
                }
                locMast.setLocSts("O");
                locMast.setModiTime(new Date());
            }else if(taskWrk.getIoType()==3){
                locMast=locMastService.selectByLocNo(taskWrk.getStartPoint());
                if(Cools.isEmpty(locMast)){
                    R.error("没有找到该库位") ;
                }
                locMast.setLocSts("O");
                locMast.setModiTime(new Date());
                locMastService.updateById(locMast);
                locMast=locMastService.selectByLocNo(taskWrk.getTargetPoint());
                if(Cools.isEmpty(locMast)){
                    R.error("没有找到该库位") ;
                }
                locMast.setLocSts("F");
                locMast.setModiTime(new Date());
                locMast.setBarcode(taskWrk.getBarcode());

        LocMast locMast = new LocMast();
        if(taskWrk.getIoType()==1){//入库任务完成库位为F
            locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
            if(Cools.isEmpty(locMast)){
              R.error("没有找到该库位") ;
            }
            locMast.setLocSts("F");
            locMast.setModiTime(new Date());
            locMast.setBarcode(taskWrk.getBarcode());
        }else if(taskWrk.getIoType()==2){//出库任务完成库位为O
            locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
            if(Cools.isEmpty(locMast)){
                R.error("没有找到该库位") ;
            }
            locMast.setLocSts("O");
            locMast.setModiTime(new Date());
        }else if(taskWrk.getIoType()==3){
            locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
            if(Cools.isEmpty(locMast)){
                R.error("没有找到该库位") ;
            }
            locMast.setLocSts("O");
            locMast.setModiTime(new Date());
            locMastService.updateById(locMast);
            taskWrk.setStatus(7);//手动完成任务
            taskWrk.setModiTime(new Date());
            taskWrkService.updateById(taskWrk);
            locMast=locMastService.selectByLocNo(taskWrk.getTargetPoint());
            if(Cools.isEmpty(locMast)){
                R.error("没有找到该库位") ;
            }
            locMast.setLocSts("F");
            locMast.setModiTime(new Date());
            locMast.setBarcode(taskWrk.getBarcode());

        }

        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")
@@ -230,6 +258,7 @@
        }catch (Exception e){
            taskWrk.setModiUser(9999L);//操作员
        }

        taskWrk.setCompleteTime(now);//完结时间
        taskWrkService.updateById(taskWrk);
        return R.ok();