#

whycq

2024-04-07 06a901e11f9ec144b709efa3610f5abd0e5936d6

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

@@ -6,7 +6,10 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocMastInitParam;
@@ -15,7 +18,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;

@@ -112,6 +114,7 @@
        }
        agvBasDevp.setLocSts("O");
        agvBasDevp.setBarcode("");
        agvBasDevp.setLocType2(null);
        agvBasDevpService.update(agvBasDevp,new EntityWrapper<AgvBasDevp>().eq("dev_no",agvBasDevp.getDevNo()));

        return R.ok();
@@ -205,7 +208,7 @@
        return R.ok(result);
    }
    /*
    容器离场
    任务完成
     */
    @RequestMapping(value = "/basDevp/visualized/container/moveOut")
    public R visualiZedContainerMoveOut(@RequestBody Map<String,Object> map) {
@@ -238,26 +241,31 @@
//            return agvWrkMast;
//        }).collect(Collectors.toList());

        try {
           int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
           if(code == 0){
               //将工作党状态改为容器离场
               agvWrkMastList.forEach(agvWrkMast -> {
                   agvWrkMast.setWrkSts(206L);
                   agvWrkMastService.updateById(agvWrkMast);
               });
               //修改站点状态
               devNos.forEach(devNo -> {
                   AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
                   agvBasDevp.setBarcode("");
                   agvBasDevp.setLocSts("O");
                   agvBasDevpService.updateById(agvBasDevp);
               });
           }
        } catch (IOException e) {
            e.printStackTrace();
            return R.error("容器离场失败");
        }
        agvWrkMastList.forEach(agvWrkMast -> {
            agvWrkMast.setWrkSts(206L);
            agvWrkMastService.updateById(agvWrkMast);
        });

//        try {
//           int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
//           if(code == 0){
//               //将工作党状态改为容器离场
//               agvWrkMastList.forEach(agvWrkMast -> {
//                   agvWrkMast.setWrkSts(206L);
//                   agvWrkMastService.updateById(agvWrkMast);
//               });
//               //修改站点状态
////               devNos.forEach(devNo -> {
////                   AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
////                   agvBasDevp.setBarcode("");
////                   agvBasDevp.setLocSts("O");
////                   agvBasDevpService.updateById(agvBasDevp);
////               });
//           }
//        } catch (IOException e) {
//            e.printStackTrace();
//            return R.error("容器离场失败");
//        }

        return R.ok("容器离场成功");
    }