自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
zwl
2025-12-27 f14bb52ddab40bf589304b6b43331ddaccea69f6 
 src/main/java/com/zy/asrs/controller/OutController.java


@@ -11,6 +11,7 @@


import com.zy.common.model.LocDto;


import com.zy.common.model.TaskDto;


import com.zy.common.web.BaseController;


import lombok.Synchronized;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


@@ -172,9 +173,10 @@


        return R.ok().add(locDtos);


    }




    @Synchronized


    @PostMapping("/out/pakout/auth")


    @ManagerAuth(memo = "订单出库")


    public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {


    public R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {


        if (Cools.isEmpty(locDtos)) {


            return R.parse(BaseRes.PARAM);


        }


@@ -204,7 +206,9 @@


        List<TaskDto> taskDtos = new ArrayList<>();


        // 根据 （库位 & 出库站） 分组； 理想状态：一组为一次出库任务


        for (LocDto locDto : locDtos) {


            if (locDto.isLack()) { continue; }


            if (locDto.isLack()) {


                continue;


            }


            TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);


            if (TaskDto.has(taskDtos, taskDto)) {


                TaskDto dto = TaskDto.find(taskDtos, taskDto);


@@ -234,6 +238,12 @@


            if (orderPakout.getDocType() == 11) {


                if (i==size){


                    for (;j<=orderPakout.getPayType();j++){


                        LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", taskDto.getLocNo()));


                        Integer locType = Integer.valueOf(locMast1.getLocType2());


                        //配盘 出库单出库区域时Q-L4时,出大托盘空板


                        if(orderPakout.getCstmrName().equals("Q-L4")){


                            locType = 2;


                        }


                        String bar="";


                        //具体待定


//                        if(!Cools.isEmpty(orderPakout.getShipCode())&&orderPakout.getShipCode().equals("A01")){


@@ -242,10 +252,10 @@


                        LocMast locMast = new  LocMast();


                        if(Cools.isEmpty(bar)){


                            locMast=locMastService.selectOne(new EntityWrapper<LocMast>()


                                    .eq("loc_sts", "D"));


                                    .eq("loc_sts", "D").eq("loc_type2", locType));


                        }else {


                            locMast=locMastService.selectOne(new EntityWrapper<LocMast>()


                                    .eq("loc_sts", "D").like("barcode", bar));


                                    .eq("loc_sts", "D").eq("loc_type2", locType).like("barcode", bar));


                        }




                        if (Cools.isEmpty(locMast)) {


@@ -254,7 +264,9 @@


                        String locNo = locMast.getLocNo();


                        EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();


                        emptyPlateOutParam.setOutSite(303);


                        emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locNo);}});


                        emptyPlateOutParam.setLocNos(new ArrayList<String>() {{


                            add(locNo);


                        }});


                        String agvSta = "";


                        if(locMast.getLocType3()==2){




@@ -266,6 +278,13 @@




                    }


                }else if(i == 4){


                    LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", taskDto.getLocNo()));


                    Integer locType = Integer.valueOf(locMast1.getLocType2());


                    //配盘 出库单出库区域时Q-L4时,出大托盘空板


                    if(orderPakout.getCstmrName().equals("Q-L4")){


                        locType = 2;


                    }




                    String bar="";


                    if(!Cools.isEmpty(orderPakout.getShipCode())&&orderPakout.getShipCode().equals("A01")){


                        bar = "A01";


@@ -273,10 +292,10 @@


                    LocMast locMast = null;


                    if(Cools.isEmpty(bar)){


                        locMast=locMastService.selectOne(new EntityWrapper<LocMast>()


                                .eq("loc_sts", "D"));


                                .eq("loc_sts", "D").eq("loc_type2", locType));


                    }else {


                        locMast=locMastService.selectOne(new EntityWrapper<LocMast>()


                                .eq("loc_sts", "D").like("barcode", bar));


                                .eq("loc_sts", "D").eq("loc_type2", locType).like("barcode", bar));


                    }




                    if (Cools.isEmpty(locMast)) {


@@ -285,7 +304,9 @@


                    String locNo = locMast.getLocNo();


                    EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();


                    emptyPlateOutParam.setOutSite(303);


                    emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locNo);}});


                    emptyPlateOutParam.setLocNos(new ArrayList<String>() {{


                        add(locNo);


                    }});


                    String agvSta = "";


                    if(locMast.getLocType3()==2){




@@ -294,10 +315,80 @@


                    }


                    WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam,ioPri,agvSta);


                    ioPri--;


                    j++;


                }


            }


        }


        return R.ok();


    }




    @PostMapping("/out/pakout/preview/auth1")


    @ManagerAuth


    public R pakoutPreview1(@RequestBody String orderNo) throws InterruptedException {


        if (Cools.isEmpty(orderNo)) {


            return R.parse(BaseRes.PARAM);


        }


        List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));




        if (orderDetlPakouts.size() == 0) {


            return R.parse("订单明细为空");


        }




        List<LocDto> locDtos = new ArrayList<>();




        Set<String> exist = new HashSet<>();




        // 获取订单主表


        OrderPakout orderPakOut = orderPakOutService.selectByNo(orderDetlPakouts.get(0).getOrderNo());




        for (OrderDetlPakout orderDetl : orderDetlPakouts) {


            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);


            if (issued <= 0.0D) {


                continue;


            }




            List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(),


                    orderDetl.getBrand(), orderPakOut.getDocType() == 11 ? null : orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());


            for (LocDetl locDetl : locDetls) {


                if (issued > 0) {


                    LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),


                            issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);


                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));


                    locDto.setFrozen(locDetl.getFrozen());


                    locDto.setFrozenLoc(locMast.getFrozen());


                    List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);


                    locDto.setStaNos(staNos);


                    locDto.setBrand(orderDetl.getBrand());




                    locDto.setStandby1(orderDetl.getStandby1());


                    locDto.setStandby2(orderDetl.getStandby2());


                    locDto.setStandby3(orderDetl.getStandby3());


                    locDto.setBoxType1(orderDetl.getBoxType1());


                    locDto.setBoxType2(orderDetl.getBoxType2());


                    locDto.setBoxType3(orderDetl.getBoxType3());


                    locDtos.add(locDto);


                    exist.add(locDetl.getLocNo());


                    // 剩余待出数量递减


                    issued = issued - locDetl.getAnfme();


                } else {


                    break;


                }


            }


            if (issued > 0) {


                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);


                locDto.setBrand(orderDetl.getBrand());


                locDto.setStandby1(orderDetl.getStandby1());


                locDto.setStandby2(orderDetl.getStandby2());


                locDto.setStandby3(orderDetl.getStandby3());


                locDto.setBoxType1(orderDetl.getBoxType1());


                locDto.setBoxType2(orderDetl.getBoxType2());


                locDto.setBoxType3(orderDetl.getBoxType3());


                locDto.setLack(Boolean.TRUE);


                locDtos.add(locDto);


            }


        }


        R pakout = pakout(locDtos);


        return R.ok().add(pakout);


    }




}