#

1

2025-05-13 7c315b53808a66a2f1faf90930ecffdc85ba455f

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

@@ -7,10 +7,10 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
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.CommandInfoService;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.TaskWrkService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -23,6 +23,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
import java.util.*;

@RestController
@@ -36,7 +37,13 @@
    private TaskWrkService taskWrkService;

    @Autowired
    private CommandInfoService commandInfoService;
    private LocMastService locMastService;

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

    @Autowired
    private ApiLogService apiLogService;

    @RequestMapping(value = "/taskWrk/{wrkNo}/auth")
    @ManagerAuth
@@ -51,11 +58,45 @@
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(taskWrkService.selectPage(new Page<>(curr, limit), wrapper));

        try{
            Integer wrkNo = null;
            Integer taskNo = null;
            Integer status = null;
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
                String val = String.valueOf(entry.getValue());
                if (Cools.isEmpty(val)) {
                    continue;
                }
                if (val.contains(RANGE_TIME_LINK)) {
                    String[] dates = val.split(RANGE_TIME_LINK);
                    modiTimeStart = DateUtils.convert(dates[0]);
                    modiTimeEnd = DateUtils.convert(dates[1]);
                } else if (entry.getKey().equals("wrk_no")) {
                    wrkNo = Integer.parseInt(val);
                } else if (entry.getKey().equals("task_no")) {
                    taskNo = Integer.parseInt(val);
                } else if (entry.getKey().equals("status")) {
                    status = Integer.parseInt(val);
                }
            }

            EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
            excludeTrash(param);
            convert(param, wrapper);
            if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}

            List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
            Page<TaskWrk> page = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList);
            page.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
            return R.ok(page);
//        return R.ok(taskWrkService.selectPage(new Page<>(curr, limit), wrapper));

        } catch (Exception e) {
            return R.error("查询失败,请检查参数:"+e.getMessage());
        }

    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -108,10 +149,30 @@

    @RequestMapping(value = "/taskWrk/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            taskWrkService.deleteById(id);
    public R delete(@RequestParam String taskNo){
//         for (Long id : ids){
//            taskWrkService.deleteById(id);
//        }
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
        if (taskWrk == null) {
            return R.error();
        }
        Date now = new Date();
        taskWrk.setMemo("手动强制删除！！！");
        taskWrk.setModiTime(now);
        taskWrk.setModiUser(getUserId());
        if (!taskWrkService.updateById(taskWrk)){
            log.error("删除失败" + taskWrk);
            return R.error("删除失败" + taskWrk);

        }
        if (taskWrkService.saveToHistoryD(taskWrk.getTaskNo()) == 0) {
            log.error("任务档转任务历史档失败" + taskWrk);
            return R.error("任务档转任务历史档失败" + taskWrk);

        }
        //删除任务
        taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
        return R.ok();
    }

@@ -163,79 +224,82 @@
    @ManagerAuth(memo = "手动完成任务")
    public R complete(@RequestParam String taskNo) {
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);


        Map<String, Object> map = new HashMap<>();
        map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
        TaskOverToWms taskOverToWms = new TaskOverToWms();
        taskOverToWms.setFeedbackFrom("WCS"); //来源
        taskOverToWms.setWarehouseId("1688469798893297665"); //仓库标识
        taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //任务号
        taskOverToWms.setTaskType(getTaskType(taskWrk.getIoType())); // 任务类型
        taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 容器编码
        if (taskWrk.getIoType() ==1 ){
            taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //设备编码
            taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //目标库位
        }else if (taskWrk.getIoType() ==2){
            Map<Integer,String> map1 = new HashMap<>();
            map1.put(102,"J-1101");
            map1.put(106,"J-1103");
            map1.put(110,"J-1105");
            map1.put(114,"J-1107");
            map1.put(118,"J-1109");
            map1.put(122,"J-1111");
            taskOverToWms.setEquipmentCode(map1.get(taskWrk.getTargetPoint())); //设备编码
            taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //源库位
        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());

        taskOverToWms.setTaskStatus("handle"); //任务状态
        String response = null;
        try {
            response = new HttpHandler.Builder()
                    .setHeaders(map)
                    .setUri(wmsUrl)
                    .setPath("wcsManager/wcsInterface/taskStatusFeedback")
                    .setJson(JSON.toJSONString(taskOverToWms))
                    .build()
                    .doPost();
        }catch (Exception e){
            log.error("wms连接失败");
        }
        String response="";

        JSONObject jsonObject = JSON.parseObject(response);
        if (jsonObject.getInteger("code").equals(200)){
            if (taskWrk == null) {
                return R.error();
            }
            if (taskWrk.getStatus().equals(TaskStatusType.COMPLETE.id)) {
                return R.error(taskWrk.getTaskNo() + "已完结");
            }
            Date now = new Date();
            taskWrk.setStatus(TaskStatusType.COMPLETE.id);
            taskWrk.setModiTime(now);//操作时间
            try{
                taskWrk.setModiUser(getUserId());//操作员
            }catch (Exception e){
                taskWrk.setModiUser(9999L);//操作员
            }
            taskWrk.setCompleteTime(now);//完结时间
            taskWrkService.updateById(taskWrk);


            if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) {
                //任务已经转日志，将该任务下面的指令转日志
                commandInfoService.saveToHistory(taskWrk.getTaskNo());

                //删除任务
                taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
                //删除指令
                commandInfoService.delete(new EntityWrapper<CommandInfo>().eq("task_no", taskWrk.getTaskNo()));
            }
        }else {
            return R.error("wms通讯失败");
        }


        Date now = new Date();
        locMast.setModiTime(now);
        taskWrk.setStatus(7);//手动完成任务
        taskWrk.setModiTime(now);
        taskWrk.setCompleteTime(now);
//        try{
//            HashMap<String, Object> headParam = new HashMap<>();
//            headParam.put("taskNo",taskWrk.getTaskNo());
//            headParam.put("taskStatus",taskWrk.getStatusWms());
//            headParam.put("ioType",taskWrk.getIoTypeWms());
//            headParam.put("barCode",taskWrk.getBarcode());
//            headParam.put("reportTime", LocalDateTime.now());
//            headParam.put("weight",taskWrk.getScWeight().doubleValue());
//
//            log.info("wcs手动完成任务上报wms={}", taskWrk);
//            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,response);
////            throw new CoolException(e);
//        }
        locMastService.updateById(locMast);
        taskWrkService.updateById(taskWrk);
        return R.ok();
    }

@@ -252,27 +316,45 @@
        Date now = new Date();
        taskWrk.setStatus(TaskStatusType.CANCEL.id);
        taskWrk.setModiTime(now);//操作时间
        taskWrk.setCancelTime(now);
        try{
            taskWrk.setModiUser(getUserId());//操作员
        }catch (Exception e){
            taskWrk.setModiUser(9999L);//操作员
            taskWrk.setModiUser(1111L);//操作员
        }
        String response="";
//        try{
//            HashMap<String, Object> headParam = new HashMap<>();
//            headParam.put("taskNo",taskWrk.getTaskNo());
//            headParam.put("taskStatus",taskWrk.getStatusWms());
//            headParam.put("ioType",taskWrk.getIoTypeWms());
//            headParam.put("barCode",taskWrk.getBarcode());
//            headParam.put("reportTime", LocalDateTime.now());
//            headParam.put("weight",taskWrk.getScWeight().doubleValue());
//
//
//            log.info("wcs手动取消任务上报wm={}", taskWrk);
//            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,response);
////            throw new CoolException(e);
//        }
        taskWrk.setCompleteTime(now);//完结时间
        taskWrkService.updateById(taskWrk);
        return R.ok();
    }

    @PostMapping(value = "/taskWrk/updateCommandStep")
    @ManagerAuth(memo = "更新步序")
    public R updateCommandStep(@RequestParam Integer wrkNo, @RequestParam Integer commandStep) {
        TaskWrk taskWrk = taskWrkService.selectByWrkNo(wrkNo);
        if (taskWrk == null) {
            return R.error();
        }
        Date now = new Date();
        taskWrk.setCommandStep(commandStep);
        taskWrk.setModiTime(now);//操作时间
        taskWrk.setModiUser(getUserId());//操作员
        taskWrkService.updateById(taskWrk);
        return R.ok();
    }
@@ -289,5 +371,29 @@
                return "未知";
        }
    }
    @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);
            taskWrk.setStatus(TaskStatusType.RECEIVE.id);//派发状态
            taskWrkService.updateById(taskWrk);
            if(!taskWrkService.updateById(taskWrk)){
                return R.error("更新任务状态失败");
            }
            return R.ok();
        }else{
            return R.error("任务状态不对无法重新给堆垛机下发任务");
        }

    }


}