自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
skyouc
3 天以前 88fc713144a877a4257b4173fbfadafd926c94de 
 src/main/java/com/zy/asrs/controller/OutController.java


@@ -5,12 +5,17 @@


import com.core.common.BaseRes;


import com.core.common.Cools;


import com.core.common.R;


import com.core.exception.CoolException;


import com.zy.asrs.entity.*;


import com.zy.asrs.enums.LocStsType;


import com.zy.asrs.service.*;


import com.zy.asrs.service.impl.BasDeviceServiceImpl;


import com.zy.asrs.service.impl.LocAroundBindServiceImpl;


import com.zy.common.model.LocDto;


import com.zy.common.model.TaskDto;


import com.zy.common.web.BaseController;


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.RequestParam;


@@ -46,6 +51,10 @@




    @Resource


    private OrderPakoutService orderPakOutService;


    @Autowired


    private BasDeviceService basDeviceService;


    @Autowired


    private LocAroundBindService locAroundBindService;






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


@@ -68,7 +77,6 @@


        }




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




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




        // 获取订单主表


@@ -80,7 +88,8 @@


                if (issued <= 0.0D) {


                    continue;


                }


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


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


                        orderDetl.getBrand(),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(),


@@ -89,6 +98,13 @@


                        locDto.setFrozen(locDetl.getFrozen());


                        locDto.setFrozenLoc(locMast.getFrozen());


                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), 107);


                        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.setStaNos(staNos);


                        locDtos.add(locDto);


                        // 剩余待出数量递减


@@ -99,6 +115,13 @@


                }


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


                }


@@ -109,7 +132,8 @@


                if (issued <= 0.0D) {


                    continue;


                }


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


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


                        orderDetl.getBrand(),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(),


@@ -119,6 +143,13 @@


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


                        // 剩余待出数量递减


@@ -129,6 +160,13 @@


                }


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


                }


@@ -139,6 +177,7 @@




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


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


    @Transactional


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


        if (Cools.isEmpty(locDtos)) {


            return R.parse(BaseRes.PARAM);


@@ -170,7 +209,7 @@


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


        for (LocDto locDto : locDtos) {


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


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


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


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


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


                assert dto != null;


@@ -182,7 +221,14 @@


        // -----------------------------------------------------------------------------------------------


        for (TaskDto taskDto : taskDtos) {


            BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());


            workService.stockOut(staNo, taskDto, getUserId());


            if (!Objects.isNull(taskDto.getDeviceNo())) {


                //生成出库任务


                workService.stockOut(staNo, taskDto, taskDto.getDeviceNo(), getUserId());


                //生成匹配的入库(出库)任务


                workService.genInStock(staNo, taskDto, taskDto.getDeviceNo(), getUserId());


            } else  {


                workService.stockOut(staNo, taskDto, null, getUserId());


            }


        }


        return R.ok();


    }