自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
#
whycq
2024-05-21 7e8c8abedab8d33ea5faff80545e566aa71306d6 
 src/main/java/com/zy/asrs/controller/AgvMobileController.java


@@ -2,28 +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.param.AgvMobileStartPakin;


import com.zy.asrs.entity.param.AgvMobileStartParam;


import com.zy.asrs.entity.param.CombParam;


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;




/**


@@ -46,6 +39,10 @@


    private OrderDetlService orderDetlService;


    @Autowired


    private AgvLocDetlService agvLocDetlService;


    @Autowired


    private AgvWrkMastService agvWrkMastService;


    @Autowired


    private AgvWrkDetlService agvWrkDetlService;






    /*


@@ -56,6 +53,14 @@


        agvMobileService.comb(combParam, getUserId());




        return R.ok();


    }




    //    再次拣料


    @RequestMapping("/pick/again/auth")


    @ManagerAuth(memo = "再次拣料")


    public R pickAgain(@RequestBody PickParam pickParams){


        agvMobileService.pickAgain(pickParams, 1l);


        return R.ok("拣料成功");


    }




    /*


@@ -175,6 +180,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);




@@ -182,9 +188,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 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));


            }




        return R.ok(agvLocDetls);


            if (Cools.isEmpty(agvLocMast)) continue;


            agvLocDetl.setLocSts(agvLocMast.getLocSts());


            agvLocDetl.setLocSts$(agvLocMast.getLocSts$());


            locDetls.add(agvLocDetl);


        }






        return R.ok(locDetls);


    }




    /*


@@ -337,6 +361,127 @@




    }




    @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 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(moveType);


            agvLocMast.setLocType3(floor);


            agvLocMastService.update(agvLocMast,wrapper);


            // 同步调拨单


            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("suppCode");


            AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30,floor);


            // 同步调拨单


            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));


            for (AgvLocDetl agvLocDetl : agvLocDetls) {


                AgvWrkDetl wrkDetl = new AgvWrkDetl();


                wrkDetl.setWrkNo(wrkMast.getWrkNo());


                wrkDetl.sync(agvLocDetl);


                wrkDetl.setSuppCode(agvLocDetl.getSuppCode());


                wrkDetl.setIoTime(now);


                wrkDetl.setAppeUser(getUserId());


                wrkDetl.setAppeTime(now);


                wrkDetl.setModiUser(getUserId());


                wrkDetl.setModiTime(now);


                if (!agvWrkDetlService.insert(wrkDetl)) {


                    throw new CoolException("保存工作明细失败");


                }


                // 更新订单


                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());


                }


            }


            // 更新源库位


            AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));


            locMast.setLocSts("R");


            agvLocMastService.updateById(locMast);


        }


        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();


    }




    @PostMapping("/hand/control/doBack")


    @Transactional


    @ManagerAuth(memo = "站点回退")


    public R doBack(@RequestBody AgvMobileStartPakin param){


        agvMobileService.doBack(param, getUserId());


        return R.ok();


    }




    public static void main(String[] args) {


        List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();


        List<AgvLocDetl> agvLocDetls2 = new ArrayList<>();


@@ -355,5 +500,41 @@




        System.out.println(agvLocDetls22.equals(agvLocDetls2));


    }


    /*


   生成工作档


    */


    private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode,  Date now, Long userId, int containerType,int floor){


        AgvWrkMast wrkMast = new AgvWrkMast();


        //工作状态


        wrkMast.setWrkSts(wrkSts);


        //入出库类型


        wrkMast.setIoType(ioType);


        wrkMast.setIoTime(now);


        //优先级


        wrkMast.setIoPri(300.0);


        //源站点


        wrkMast.setSourceLocNo(sourceLocNo);


        //目标站点


        wrkMast.setLocNo(locNo);


        //容器编码


        wrkMast.setBarcode(barcode);


        //容器类型


        wrkMast.setWhsType(containerType);


        // 目标楼层


        wrkMast.setCrnNo(floor);




        wrkMast.setAppeUser(userId);


        wrkMast.setAppeTime(now);


        wrkMast.setModiUser(userId);


        wrkMast.setModiTime(now);




        if (!agvWrkMastService.insertByIncrease(wrkMast)) {


            throw new CoolException("保存工作档失败");


        }




        wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no",sourceLocNo));




        return wrkMast;


    }




}