1

zhangc

2025-03-30 396dfb3eba1725868ab2e01d7c1af5e64bf108d3

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

@@ -6,6 +6,7 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.constant.AsrsConstants;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.model.LocDto;
@@ -13,6 +14,7 @@
import com.zy.common.model.OrderMergeVo;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
import com.zy.system.service.ConfigService;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -60,6 +62,13 @@
    @Autowired
    private AgvLocDetlService agvLocDetlService;

    @Autowired
    private ConfigService configService;


    @Autowired
    private AgvWrkMastService agvWrkMastService;

    @PostMapping("/out/pakout/orderDetlIds/auth")
    @ManagerAuth
    public R pakoutOrderDetlIds(@RequestParam Long orderId) throws InterruptedException {
@@ -80,28 +89,32 @@
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
            Order order = orderService.selectByNo(orderDetl.getOrderNo());
            DocType docType = docTypeService.selectById(order.getDocType());
            if("人工补货单".equals(docType.getDocName())){
                if (issued <= 0.0D) { continue; }
                issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
            if ("人工补货单".equals(docType.getDocName())) {
                if (issued <= 0.0D) {
                    continue;
                }
                issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime());
                if (issued > 0) {
                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getProcessSts());
                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
                    locDto.setLack(Boolean.TRUE);
                    locDtoList.add(locDto);
                }
            }else {
                if (issued <= 0.0D) { continue; }
            } else {
                if (issued <= 0.0D) {
                    continue;
                }

                //从平库寻找
                //issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());

                //先找AGV的库存，如果返回的issued大于0，则去四项库找
                issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime(),null);
                issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime(), null);

                //从四项库的库存里面找，
                //issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());

                if (issued > 0) {
                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getProcessSts());
                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
                    locDto.setLack(Boolean.TRUE);
                    locDtoList.add(locDto);
                }
@@ -126,28 +139,86 @@
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
            Order order = orderService.selectByNo(orderDetl.getOrderNo());
            DocType docType = docTypeService.selectById(order.getDocType());
            if("人工补货单".equals(docType.getDocName())){
                if (issued <= 0.0D) { continue; }
                issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
            if ("人工补货单".equals(docType.getDocName())) {
                if (issued <= 0.0D) {
                    continue;
                }
                issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime());
                if (issued > 0) {
                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getProcessSts());
                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
                    locDto.setLack(Boolean.TRUE);
                    locDtoList.add(locDto);
                }
            }else {
                if (issued <= 0.0D) { continue; }
            } else {
                if (issued <= 0.0D) {
                    continue;
                }

                //从平库寻找
                //issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());

                //先找AGV的库存，如果返回的issued大于0，则去四项库找
                issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime(),"bcp");
                issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime(), "bcp");

                //从四项库的库存里面找，
                //issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());

                if (issued > 0) {
                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getProcessSts());
                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
                    locDto.setLack(Boolean.TRUE);
                    locDtoList.add(locDto);
                }
            }


        }
        return R.ok().add(locDtoList);

    }

    /**
     * 二厂
     * @param ids
     * @return
     */
    @PostMapping("/bcp/out/pakout/preview/auth/v2")
    @ManagerAuth
    public R bcpPakoutPreviewV2(@RequestBody List<Long> ids) {

        List<OrderDetl> orderDetlList = orderDetlService.selectBatchIds(ids);
        //返回给前端的库位以及站点信息
        List<LocDto> locDtoList = new ArrayList<>();

        for (OrderDetl orderDetl : orderDetlList) {
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
            Order order = orderService.selectByNo(orderDetl.getOrderNo());
            DocType docType = docTypeService.selectById(order.getDocType());
            if ("人工补货单".equals(docType.getDocName())) {
                if (issued <= 0.0D) {
                    continue;
                }
                issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime());
                if (issued > 0) {
                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
                    locDto.setLack(Boolean.TRUE);
                    locDtoList.add(locDto);
                }
            } else {
                if (issued <= 0.0D) {
                    continue;
                }

                //从平库寻找
                //issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());

                //先找AGV的库存，如果返回的issued大于0，则去四项库找
                issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime(), AsrsConstants.ERCHANG);

                //从四项库的库存里面找，
                //issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());

                if (issued > 0) {
                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
                    locDto.setLack(Boolean.TRUE);
                    locDtoList.add(locDto);
                }
@@ -167,22 +238,44 @@

        for (LocDto locDto : locDtos) {
            if (locDto.getAnfme() == 0) {
                return R.error(locDto.getMatnr()+"：出库数量为0");
                return R.error(locDto.getMatnr() + "：出库数量为0");
            }
        }
        //判断是否可以生成出库工作档
        boolean lack = true;
        for (LocDto locDto : locDtos) {
            //如果AGV出库站为空 和 四项库出库站为空 并且 有库存的情况下 则返回
            if (Cools.isEmpty(locDto.getStaNo()) && Cools.isEmpty(locDto.getAgvStaNo()) &&!locDto.isLack()) {
                return R.error(locDto.getLocNo()+"库位请选择出库站");
            if (Cools.isEmpty(locDto.getStaNo()) && Cools.isEmpty(locDto.getAgvStaNo()) && !locDto.isLack()) {
                return R.error(locDto.getLocNo() + "库位请选择出库站");
            }

            AgvLocMast agvLocMast = agvLocMastService.selectById(locDto.getLocNo());
            List<String> staNoList = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1());

            if(!staNoList.contains(locDto.getAgvStaNo())){
                return R.error(locDto.getAgvStaNo()+"该站点已有出库任务，无法选择该站点出库");

//            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "FOUR"));
//            if (config != null) {
//                if (config.getStatus().intValue() == 1) {
//                    List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", locDto.getAgvStaNo()));
//                    if (agvWrkMasts != null && !agvWrkMasts.isEmpty()) {
//                        for (AgvWrkMast agvWrkMast : agvWrkMasts) {
//                            if (agvWrkMast.getWrkSts() < 204) {
//                                return R.error(locDto.getAgvStaNo() + "该站点已有任务，等任务完成或者货架搬走再叫料");
//                            }
//                        }
//                    }
//                }
//            }


            if (!staNoList.contains(locDto.getAgvStaNo())) {
                AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locDto.getAgvStaNo()));
                if (Cools.isEmpty(agvWrkMast.getPdcType())) {
                    return R.error(locDto.getAgvStaNo() + "该站点已有出库任务,工作号：" + agvWrkMast.getWrkNo() + ",物料库位号：" + agvWrkMast.getSourceLocNo() + ",任务状态：" + agvWrkMast.getWrkSts$());
                } else {
                    return R.error(locDto.getAgvStaNo() + "该站点已有出库任务,工作号：" + agvWrkMast.getWrkNo() + ",物料库位号：" + agvWrkMast.getSourceLocNo() + ",任务状态：" + agvWrkMast.getWrkSts$() + ",小车编号：" + agvWrkMast.getPdcType());

                }
            }
        }
        //如果所有库都没有库存，则返回
@@ -202,7 +295,7 @@

        List<TaskDto> taskDtos = new ArrayList<>();
        List<TaskDto> agvTaskDtos = new ArrayList<>();
        generateTaskDto(locDtos,taskDtos,agvTaskDtos);
        generateTaskDto(locDtos, taskDtos, agvTaskDtos);

        //生成AGV出库任务
        agvWorkService.stockOutWrkMast(agvTaskDtos, getUserId());
@@ -215,6 +308,7 @@
        }
        return R.ok();
    }

    @PostMapping("/process/out/pakout/auth")
    @ManagerAuth(memo = "加工出库")
    @Transactional
@@ -225,15 +319,15 @@
        boolean lack = true;
        for (LocDto locDto : locDtos) {
            //如果AGV出库站为空 和 四项库出库站为空 并且 有库存的情况下 则返回
            if (Cools.isEmpty(locDto.getStaNo()) && Cools.isEmpty(locDto.getAgvStaNo()) &&!locDto.isLack()) {
                return R.error(locDto.getLocNo()+"库位请选择出库站");
            if (Cools.isEmpty(locDto.getStaNo()) && Cools.isEmpty(locDto.getAgvStaNo()) && !locDto.isLack()) {
                return R.error(locDto.getLocNo() + "库位请选择出库站");
            }

            AgvLocMast agvLocMast = agvLocMastService.selectById(locDto.getLocNo());
            List<String> staNoList = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(),agvLocMast.getFloor());
            List<String> staNoList = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(), agvLocMast.getFloor());

            if(!staNoList.contains(locDto.getAgvStaNo())){
                return R.error(locDto.getAgvStaNo()+"该站点已有出库任务，无法选择该站点出库");
            if (!staNoList.contains(locDto.getAgvStaNo())) {
                return R.error(locDto.getAgvStaNo() + "该站点已有出库任务，无法选择该站点出库");
            }

        }
@@ -254,7 +348,7 @@

        List<TaskDto> taskDtos = new ArrayList<>();
        List<TaskDto> agvTaskDtos = new ArrayList<>();
        generateTaskDto(locDtos,taskDtos,agvTaskDtos);
        generateTaskDto(locDtos, taskDtos, agvTaskDtos);

        //生成AGV出库任务
        agvWorkService.processOut(agvTaskDtos, getUserId());
@@ -268,7 +362,7 @@
     */
    @RequestMapping(value = "/order/merge/preview/auth")
    @ManagerAuth
    public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds){
    public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds) {
        return R.ok().add(orderService.mergePreview(orderIds));
    }

@@ -285,9 +379,9 @@
                continue;
            }
            //先找AGV的库存，如果返回的issued大于0，则去四项库找
            issued = agvLocDetlService.queryStockAndSetLocDto(vo.getMatnr(),vo.getBatch(),JSON.toJSONString(vo.getOrderDtos()),locDtoList,issued, vo.getCsocode(), vo.getIsoseq(),null);
            issued = agvLocDetlService.queryStockAndSetLocDto(vo.getMatnr(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), locDtoList, issued, vo.getCsocode(), vo.getIsoseq(), null);
            //从四项库的库存里面找，
            issued = locDetlService.queryStockAndSetLocDto(vo.getMatnr(),vo.getBatch(),JSON.toJSONString(vo.getOrderDtos()),locDtoList,issued, vo.getCsocode(), vo.getIsoseq());
            issued = locDetlService.queryStockAndSetLocDto(vo.getMatnr(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), locDtoList, issued, vo.getCsocode(), vo.getIsoseq());

            if (issued > 0) {
                LocDto locDto = new LocDto(null, vo.getMatnr(), vo.getMaktx(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), issued);
@@ -305,21 +399,23 @@
    /*
    生成出库任务dto
     */
    private void generateTaskDto(List<LocDto> locDtos, List<TaskDto> taskDtos, List<TaskDto> agvTaskDtos){
    private void generateTaskDto(List<LocDto> locDtos, List<TaskDto> taskDtos, List<TaskDto> agvTaskDtos) {
        // 根据 （库位 & 出库站） 分组； 理想状态：一组为一次出库任务
        for (LocDto locDto : locDtos) {
            if (locDto.isLack()) { continue; }
            if (locDto.isLack()) {
                continue;
            }
            //AGV库
            if(!Cools.isEmpty(locDto.getAgvStaNos())){
            if (!Cools.isEmpty(locDto.getAgvStaNos())) {
                //平库
                if("无需站点".equals(locDto.getAgvStaNo())){
                if ("无需站点".equals(locDto.getAgvStaNo())) {
                    generateManPakout(locDto);
                }else {
                    generateTaskDtoForAgv(locDto,agvTaskDtos);
                } else {
                    generateTaskDtoForAgv(locDto, agvTaskDtos);
                }
                //四项库
            }else{
                generateTaskDtoForBase(locDto,taskDtos);
            } else {
                generateTaskDtoForBase(locDto, taskDtos);
            }

        }
@@ -328,10 +424,10 @@
    /*
    生成AGV的任务dto
     */
    private void generateTaskDtoForAgv(LocDto locDto, List<TaskDto> agvTaskDtos){
    private void generateTaskDtoForAgv(LocDto locDto, List<TaskDto> agvTaskDtos) {
        // 防止前端页面提取库位信息后，在其他地方对该库位生成了出库任务(库位状态非F状态)
        AgvLocMast agvLocMast = agvLocMastService.selectById(locDto.getLocNo());
        if(!Cools.isEmpty(agvLocMast) && !agvLocMast.getLocSts().equals("F")){
        if (!Cools.isEmpty(agvLocMast) && !agvLocMast.getLocSts().equals("F")) {
            throw new CoolException("库位号非在库状态，请重新选择出库库位===>>" + locDto.getLocNo());
        }
        TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getAgvStaNo(), locDto);
@@ -349,10 +445,10 @@
    /*
    生成四项库的任务dto
     */
    private void generateTaskDtoForBase(LocDto locDto, List<TaskDto> taskDtos){
    private void generateTaskDtoForBase(LocDto locDto, List<TaskDto> taskDtos) {
        // 防止前端页面提取库位信息后，在其他地方对该库位生成了出库任务(库位状态非F状态)
        LocMast locMast = locMastService.selectById(locDto.getLocNo());
        if(!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")){
        if (!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")) {
            throw new CoolException("库位号非在库状态，请重新选择出库库位===>>" + locDto.getLocNo());
        }

@@ -370,40 +466,40 @@
    /*
    生成平库拣货单
     */
    private void generateManPakout(LocDto locDto){
        ManLocDetl manLocDetl = manLocDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getCsocode(),locDto.getIsoseq(),locDto.getContainerCode());
        if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme()>manLocDetl.getAnfme())) {
    private void generateManPakout(LocDto locDto) {
        ManLocDetl manLocDetl = manLocDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq(), locDto.getContainerCode());
        if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme() > manLocDetl.getAnfme())) {
            manLocDetl.setStatus(0);
            manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("loc_no", manLocDetl.getLocNo()).eq("matnr",manLocDetl.getMatnr()));
            manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("loc_no", manLocDetl.getLocNo()).eq("matnr", manLocDetl.getMatnr()));
            //addPakOUT 生成拣货单成功
            if (addPakOUT(locDto).equals(R.ok())) {
                Order order = orderService.selectByNo(locDto.getOrderNo());
                if (Cools.isEmpty(order)){
                    throw new CoolException("查询订单失败，请联系管理员"+locDto.getOrderNo());
                if (Cools.isEmpty(order)) {
                    throw new CoolException("查询订单失败，请联系管理员" + locDto.getOrderNo());
                }
                if (order.getSettle()==1){
                    if (!orderService.updateSettle(order.getId(),2L,null)){
                        throw new CoolException("修改订单状态失败，请联系管理员"+locDto.getOrderNo());
                if (order.getSettle() == 1) {
                    if (!orderService.updateSettle(order.getId(), 2L, null)) {
                        throw new CoolException("修改订单状态失败，请联系管理员" + locDto.getOrderNo());
                    }
                }
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", locDto.getOrderNo()).eq("matnr", locDto.getMatnr()));
                if (Cools.isEmpty(orderDetl)){
                    throw new CoolException("查询订单明细失败，请联系管理员"+locDto.getOrderNo()+locDto.getMatnr());
                if (Cools.isEmpty(orderDetl)) {
                    throw new CoolException("查询订单明细失败，请联系管理员" + locDto.getOrderNo() + locDto.getMatnr());
                }
                orderDetl.setQty(orderDetl.getQty() + locDto.getAnfme());
                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no", locDto.getOrderNo()).eq("matnr", locDto.getMatnr()))){
                    throw new CoolException("修改订单明细失败，请联系管理员"+locDto.getOrderNo()+locDto.getMatnr());
                if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", locDto.getOrderNo()).eq("matnr", locDto.getMatnr()))) {
                    throw new CoolException("修改订单明细失败，请联系管理员" + locDto.getOrderNo() + locDto.getMatnr());
                }
            }
        }else {
        } else {
            throw new CoolException("库存不足");
        }
    }

    private R addPakOUT(LocDto locDto){
        ManPakOut manPakOut=new ManPakOut();
        manPakOut.setWrkNo(locDto.getOrderNo()+"-"+System.currentTimeMillis());
        manPakOut.setWrkSts((long)1);
    private R addPakOUT(LocDto locDto) {
        ManPakOut manPakOut = new ManPakOut();
        manPakOut.setWrkNo(locDto.getOrderNo() + "-" + System.currentTimeMillis());
        manPakOut.setWrkSts((long) 1);
        manPakOut.setAnfme(locDto.getAnfme());
        manPakOut.setLocNo(locDto.getLocNo());
        manPakOut.setMatnr(locDto.getMatnr());
@@ -421,9 +517,9 @@
        manPakOut.setIsoseq(locDto.getIsoseq());

        ManPakOut manPakOutExist = manPakOutService.selectOne(new EntityWrapper<ManPakOut>().eq("doc_num", locDto.getOrderNo()));
        if (Cools.isEmpty(manPakOutExist)){
        if (Cools.isEmpty(manPakOutExist)) {
            manPakOut.setName(locDto.getMaktx());
        }else{
        } else {
            manPakOut.setUuid(manPakOutExist.getUuid());
        }
        manPakOutService.insert(manPakOut);
@@ -441,12 +537,14 @@
    /*
    订单预校验  ===>> 1.订单状态； 2.订单带出数量
     */
    private List<OrderDto> orderPreVerification(List<LocDto> locDtos){
    private List<OrderDto> orderPreVerification(List<LocDto> locDtos) {
        List<OrderDto> orderDtos = new ArrayList<>();
        for (LocDto locDto : locDtos) {
            if (!isJSON(locDto.getOrderNo())) {
            //if (!Cools.isEmpty(locDto.getOrderNo())) {
                if (Cools.isEmpty(locDto.getOrderNo())) { continue; }
                //if (!Cools.isEmpty(locDto.getOrderNo())) {
                if (Cools.isEmpty(locDto.getOrderNo())) {
                    continue;
                }
                OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme());
                if (OrderDto.has(orderDtos, orderDto)) {
                    OrderDto dto = OrderDto.find(orderDtos, orderDto);