#

whycq

2024-06-13 e6d092d364c5f11f864b34a7dfe81977e65fb232

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

@@ -14,6 +14,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.CodeDetectionUtil;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -167,6 +168,9 @@
                               @RequestParam(defaultValue = "10")Integer limit,
                               @RequestParam Map<String, Object> param){
        String devNo = param.get("devNo").toString();
        if (Cools.isEmpty(devNo) || !CodeDetectionUtil.carCodeDetection(devNo)){
            throw new CoolException(devNo + "小车地码有误，请正确扫码！！！");
        }
        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
        if("F".equals(agvBasDevp.getLocSts()) || "R".equals(agvBasDevp.getLocSts())){
            //先去入库通知档找明细
@@ -221,42 +225,45 @@
    任务完成
     */
    @RequestMapping(value = "/basDevp/visualized/container/moveOut")
    @ManagerAuth(memo = "确认出库")
    public R visualiZedContainerMoveOut(@RequestBody Map<String,Object> map) {

        String barcode = map.get("barcode").toString();
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts",205L));
        if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
            throw new CoolException("工作号为" + agvWrkMast.getWrkNo() + "类型不为101.出库，无法执行容器离场任务，请重新选择站点。");
            throw new CoolException("工作号为" + agvWrkMast.getWrkNo() + "类型不为101.出库，无法执行货架离场任务，请重新选择站点。");
        }

        agvWrkMast.setWrkSts(206L);
        agvWrkMastService.updateById(agvWrkMast);

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

    /*
   任务完成
    */
    @RequestMapping(value = "/basDevp/visualized/container/moveOut2")
    @ManagerAuth(memo = "确认出库2")
    public R visualiZedContainerMoveOut2(@RequestBody Map<String,Object> map) {

        String barcode = map.get("barcode").toString();
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts",205L));
        if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
            throw new CoolException("工作号为" + agvWrkMast.getWrkNo() + "类型不为101.出库，无法执行容器离场任务，请重新选择站点。");
            throw new CoolException("工作号为" + agvWrkMast.getWrkNo() + "类型不为101.出库，无法执行货架离场任务，请重新选择站点。");
        }

        agvWrkMast.setWrkSts(208L);
        agvWrkMastService.updateById(agvWrkMast);

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

    /*
    拣料/盘点入库
     */
    @RequestMapping(value = "/basDevp/visualized/container/pickIn")
    @ManagerAuth(memo = "已拣料回库")
    public R visualiZedPickIn(@RequestBody Map<String,Object> map){
        List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
        String devNo = map.get("devNo").toString();
@@ -268,11 +275,14 @@
            }
            agvWrkMast.setLocNo(devNo);
            agvWrkMastList.add(agvWrkMast);
            agvWorkService.pickIn(agvWrkMastList);
        } else {
            return R.error("查不到拣料出库任务");
        }

        agvWorkService.pickIn(agvWrkMastList);

        return R.ok("生成拣料出库任务成功");

        return R.ok("生成拣料回库任务成功");
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){