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


@@ -2,25 +2,19 @@




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;


@@ -62,10 +56,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 +179,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 +187,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,6 +362,7 @@




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


@@ -371,11 +379,28 @@


            agvLocMast.setLocType("1");


            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("/hand/control/locMove")


    @Transactional


    @ManagerAuth(memo = "手动库位转移")


    public R handControlLocMove(@RequestBody LocMoveParam param){


        agvMobileService.handControlLocMove(param, getUserId());


        return R.ok();


    }




    public static void main(String[] args) {


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


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