#

whycq

2024-05-18 076611c29cfbe624a5ee4d21c454785bc5c79021

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

@@ -2,30 +2,21 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.AgvMobileStartPakin;
import com.zy.asrs.entity.param.AgvMobileStartParam;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.PickParam;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import io.swagger.models.auth.In;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -48,6 +39,8 @@
    private OrderDetlService orderDetlService;
    @Autowired
    private AgvLocDetlService agvLocDetlService;
    @Autowired
    private AgvWrkMastService agvWrkMastService;


    /*
@@ -62,10 +55,10 @@

    //    再次拣料
    @RequestMapping("/pick/again/auth")
//    @ManagerAuth(memo = "组托")
    @ManagerAuth(memo = "再次拣料")
    public R pickAgain(@RequestBody PickParam pickParams){
        agvMobileService.pickAgain(pickParams, 1l);
        return R.ok("组托成功");
        return R.ok("拣料成功");
    }

    /*
@@ -185,6 +178,7 @@
        String orderNo = params.get("orderNo");
        String threeCode = params.get("threeCode");
        String matnr = params.get("matnr");
        String floor = params.get("floor");

        Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);

@@ -192,15 +186,27 @@

        wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);

        if (threeCode.substring(0,2).equals(30)) {
            wrapper.isNull("specs").or().eq("specs","").eq("floor",1);
        }
        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);

        List<AgvLocDetl> locDetls = new ArrayList<>();
        for (AgvLocDetl agvLocDetl : agvLocDetls) {
            AgvLocMast locNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()));
            agvLocDetl.setLocSts(locNo.getLocSts());
            agvLocDetl.setLocSts$(locNo.getLocSts$());
            AgvLocMast agvLocMast = new AgvLocMast();
            if (Cools.isEmpty(floor)) {
                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
            } else {
                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
            }

            if (Cools.isEmpty(agvLocMast)) continue;
            agvLocDetl.setLocSts(agvLocMast.getLocSts());
            agvLocDetl.setLocSts$(agvLocMast.getLocSts$());
            locDetls.add(agvLocDetl);
        }

        return R.ok(agvLocDetls);

        return R.ok(locDetls);
    }

    /*
@@ -355,27 +361,128 @@

    @PostMapping("/agv/v1/locMove")
    @Transactional
    @ManagerAuth(memo = "调拨单任务下发")
    public R agvLocMove(@RequestBody HashMap<String,Object> params){
        String fl = String.valueOf(params.get("floor"));
        short floor =(short)Integer.parseInt(fl.substring(0, 1));
        List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
         params.get("dbList");
        Object moveType = params.get("moveType");
        if (moveType == "unAuto") {
            return R.error("手动功能暂时无法使用");
        Object mT = params.get("moveType");
        String moveType = "";
        if (mT.equals("unAuto")) {
            moveType = "2";
        } else {
            moveType = "1";
        }
        for (HashMap<String, String> map : dbList) {
            String locNo = map.get("locNo");
            Wrapper<AgvLocMast> wrapper = new EntityWrapper<AgvLocMast>().eq("loc_no", locNo);
            AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
            agvLocMast.setLocType("1");
            agvLocMast.setLocType(moveType);
            agvLocMast.setLocType3(floor);
            agvLocMastService.update(agvLocMast,wrapper);
            //System.out.println(locNo);
            // 同步调拨单
            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
            for (AgvLocDetl agvLocDetl : agvLocDetls) {
                // 更新订单
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                    throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
                }
            }
        }
        return R.ok();
    }

    @PostMapping("/agv/v2/locMove")
    @Transactional
    @ManagerAuth(memo = "调拨单任务下发")
    public R agvLocMove2(@RequestBody HashMap<String,Object> params){
        Date now = new Date();
        String fl = String.valueOf(params.get("floor"));
        Integer floor = Integer.parseInt(fl.substring(0, 1));
        List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
        params.get("dbList");
        Object mT = params.get("moveType");
        String moveType = "";
        Integer ioType = 0;
        if (mT.equals("unAuto")) {
            moveType = "2";
            ioType = 111;
        } else {
            moveType = "1";
            ioType = 108;
        }
        for (HashMap<String, String> map : dbList) {
            String locNo = map.get("locNo");
            String barcode = map.get("barcode");
            //生成工作档
            AgvWrkMast mast = new AgvWrkMast();
            //工作状态
            mast.setWrkSts(22L);
            //入出库类型
            mast.setIoType(ioType);
            mast.setIoTime(now);
            //优先级
            mast.setIoPri(300.0);
            //源站点
            mast.setSourceLocNo(locNo);
            //目标站点
            mast.setLocNo("");
            //容器编码
            mast.setBarcode(barcode);
            //容器类型
            mast.setWhsType(30);
            // 目标楼层
            mast.setCrnNo(floor);
            mast.setAppeUser(getUserId());
            mast.setAppeTime(now);
            mast.setModiUser(getUserId());
            mast.setModiTime(now);
            if (!agvWrkMastService.insertByIncrease(mast)) {
                throw new CoolException("保存工作档失败");
            }
            // 同步调拨单
            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
            for (AgvLocDetl agvLocDetl : agvLocDetls) {
                // 更新订单
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                    throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
                }
            }
            // 更新源库位

        }
        return R.ok();
    }

    @PostMapping("/hand/control/locMove")
    @Transactional
    @ManagerAuth(memo = "手动库位转移")
    public R handControlLocMove(@RequestBody LocMoveParam param){
        agvMobileService.handControlLocMove(param, getUserId());
        return R.ok();
    }

    @PostMapping("/hand/control/allocationOut")
    @Transactional
    @ManagerAuth(memo = "调拨离场")
    public R allocationOut(@RequestBody AgvMobileStartPakin param){
        agvMobileService.allocationOut(param, getUserId());
        return R.ok();
    }

    @PostMapping("/hand/control/allocationIn")
    @Transactional
    @ManagerAuth(memo = "调拨进场")
    public R allocationIn(@RequestBody AgvMobileStartPakin param){
        agvMobileService.allocationIn(param, getUserId());
        return R.ok();
    }

    public static void main(String[] args) {
        List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();
        List<AgvLocDetl> agvLocDetls2 = new ArrayList<>();