一楼反修入库修改

pang.jiabao

2024-09-03 587fee18e22ed0ceee502ca12025a40e9d63989f

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

@@ -1,16 +1,15 @@
package com.zy.asrs.controller;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.WorkServiceImpl;
import com.zy.asrs.utils.OutboundAllocationUtil;
import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDetlDto;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.model.enums.IoWorkType;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -63,48 +62,69 @@
        if (Cools.isEmpty(ids)) {
            return R.parse(BaseRes.PARAM);
        }

        // 订单明细
        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
        List<LocDto> locDtos = new ArrayList<>();
        for (OrderDetl orderDetl : orderDetls) {
            if (orderDetl.getAnfme()-orderDetl.getWorkQty()-orderDetl.getQty()==0.0){
                continue;
            }
            LocDto locDto = new LocDto(orderDetl.getManu(), orderDetl.getMatnr(), orderDetl.getMaktx(),orderDetl.getModel(),orderDetl.getSpecs(),
                    orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getBarcode(), orderDetl.getOrderNo(),orderDetl.getAnfme());
            locDto.setOrderDetlId(orderDetl.getId());
            locDto.setTkType(orderDetl.getTkType());
            locDtos.add(locDto);
        if (orderDetls.isEmpty()) {
            return R.parse("请选择数据");
        }

        // 获取订单主表
        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderDetls.get(0).getOrderNo()));
        if (order == null) {
            return R.parse("订单数据为空");
        }

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

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

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

//        for (OrderDetl orderDetl : orderDetls) {
//            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
//            if (issued <= 0.0D) { continue; }
//            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
//            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);
//                    List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
//                    locDto.setStaNos(staNos);
//                    locDtos.add(locDto);
        for (OrderDetl orderDetl : orderDetls) {
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
            if (issued <= 0.0D) { continue; }
            List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("brand",orderDetl.getBrand()));
                if (issued > 0 && !locDetls.isEmpty()) {
                    // 根据单据类型返回出库口列表 21出库口，22盘点口，23反修品出库口
                    List<Integer> staNos  = new ArrayList<>();
                    if (order.getDocType() == 21) {
                      staNos.add(3077);
                      staNos.add(3106);
                    } else if(order.getDocType() == 22) {
                        staNos.add(3092);
                        staNos.add(3102);
                        staNos.add(3095);
                    } else if(order.getDocType() == 23) {
                        staNos.add(3041);
                    }
                    LocDto locDto = new LocDto();
                    locDto.setLocNo(locDetls.get(0).getLocNo());
//                    wrkDetl.setMatnr(roll.getSpecs()); // 规格
//                    wrkDetl.setMaktx(roll.getSpecs()); //规格
//                    locDto.setBatch(locDetl.getBatch()); // 箱号
//                    locDto.setModel(locDetl.getModel()); // 卷号
                    locDto.setBrand(orderDetl.getBrand()); // 包装组号
//                    locDto.setOrigin(locDetl.getOrigin()); // 木箱在托盘位置
//                    locDto.setWeight(locDetl.getWeight()); // 净重
//                    locDto.setVolume(locDetl.getVolume()); // 毛重
//                    locDto.setPrice(locDetl.getPrice());
//                    locDto.setSpecs(locDetl.getSpecs());
//                    locDto.setZpallet(locDetl.getZpallet());
                    locDto.setOrderNo(orderDetl.getOrderNo());
                    locDto.setStaNos(staNos);
                    locDto.setOrderDetlId(orderDetl.getId());
                    locDtos.add(locDto);
//                    exist.add(locDetl.getLocNo());
//                    // 剩余待出数量递减
//                    issued = issued - locDetl.getAnfme();
//                } else {
//                    break;
//                }
//            }
                } else {
                    break;
                }
//            if (issued > 0) {
//                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
//                locDto.setLack(Boolean.TRUE);
//                locDtos.add(locDto);
//            }
//        }
        }
        return R.ok().add(locDtos);
    }

@@ -134,57 +154,121 @@
    @PostMapping("/out/pakout/auth")
    @ManagerAuth(memo = "订单出库")
    public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
        StockOutParam param = new StockOutParam();
        ArrayList<StockOutParam.LocDetl> locDetls = new ArrayList<>();
        for (LocDto locDto:locDtos){
            StockOutParam.LocDetl locDetl = new StockOutParam.LocDetl();
            locDetl.setBrand(locDto.getBrand());
            locDetl.setLocNo(locDto.getLocNo());
            locDetl.setAnfme(locDto.getAnfme());
            locDetl.setMatnr(locDto.getMatnr());
            locDetl.setBatch(locDto.getBatch());
            locDetl.setModel(locDto.getModel());
            locDetl.setSpecs(locDto.getSpecs());
            locDetl.setZpallet(locDto.getZpallet());

            param.setOrderNo(locDto.getOrderNo());

            locDetls.add(locDetl);
        }
        param.setLocDetls(locDetls);

        List<StockOutParam> stockOutParams = OutboundAllocationUtil.OutboundClassification(param);
        for (StockOutParam stockOutParam : stockOutParams){
            workService.startupFullTakeStore(stockOutParam, getUserId());
        }

        for (LocDto locDto:locDtos){
            OrderDetl orderDetl = orderDetlService.selectById(locDto.getOrderDetlId());
            orderDetl.setWorkQty(locDto.getAnfme());
            orderDetlService.updateById(orderDetl);
        }

        Order order = orderService.selectByNo(param.getOrderNo());
        order.setSettle(2L);
        orderService.updateById(order);


//        if (Cools.isEmpty(locDtos)) {
//            return R.parse(BaseRes.PARAM);
//        StockOutParam param = new StockOutParam();
//        ArrayList<StockOutParam.LocDetl> locDetls = new ArrayList<>();
//        for (LocDto locDto:locDtos){
//            StockOutParam.LocDetl locDetl = new StockOutParam.LocDetl();
//            locDetl.setBrand(locDto.getBrand());
//            locDetl.setLocNo(locDto.getLocNo());
//            locDetl.setAnfme(locDto.getAnfme());
//            locDetl.setMatnr(locDto.getMatnr());
//            locDetl.setBatch(locDto.getBatch());
//            locDetl.setModel(locDto.getModel());
//            locDetl.setSpecs(locDto.getSpecs());
//            locDetl.setZpallet(locDto.getZpallet());
//
//            param.setOrderNo(locDto.getOrderNo());
//
//            locDetls.add(locDetl);
//        }
//        boolean lack = true;
//        for (LocDto locDto : locDtos) {
//            if (!locDto.isLack()) {
//                lack = false;
//                break;
//            }
//        }
//        if (lack) {
//            return R.error("库存不足");
//        param.setLocDetls(locDetls);
//
//        List<StockOutParam> stockOutParams = OutboundAllocationUtil.OutboundClassification(param);
//        for (StockOutParam stockOutParam : stockOutParams){
//            workService.startupFullTakeStore(stockOutParam, getUserId());
//        }
//
//        Thread.sleep(1000L);
//        for (LocDto locDto:locDtos){
//            OrderDetl orderDetl = orderDetlService.selectById(locDto.getOrderDetlId());
//            orderDetl.setWorkQty(locDto.getAnfme());
//            orderDetlService.updateById(orderDetl);
//        }
//
//        Order order = orderService.selectByNo(param.getOrderNo());
//        order.setSettle(2L);
//        orderService.updateById(order);


        if (Cools.isEmpty(locDtos)) {
            return R.parse(BaseRes.PARAM);
        }
        boolean lack = true;
        for (LocDto locDto : locDtos) {
            if (!locDto.isLack()) {
                lack = false;
                break;
            }
        }
        if (lack) {
            return R.error("库存不足");
        }

        Thread.sleep(1000L);

        List<StockOutParam> stockOutParams = new ArrayList<>();
        for (LocDto locDto : locDtos) {
            boolean flag1 = true;
            for(StockOutParam stockOutParam: stockOutParams) {
                if(stockOutParam.getOutSite().equals(locDto.getStaNo())) { // 有一样的出库口
                    List<StockOutParam.LocDetl> locDetls = new ArrayList<>();
                    List<LocDetl> locDetls1 = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("brand", locDto.getBrand()));
                    for(LocDetl locDetl:locDetls1) {
                        StockOutParam.LocDetl  locDetl1 = new StockOutParam.LocDetl();
                        locDetl1.setLocNo(locDetl.getLocNo());
                        locDetl1.setBrand(locDetl.getBrand());
                        locDetl1.setModel(locDetl.getModel());
                        locDetl1.setCount(locDetl.getAnfme());
                        locDetls.add(locDetl1);
                    }
                    stockOutParam.getLocDetls().addAll(locDetls);
                    flag1 = false;
                    break;
                }
            }
            if(flag1) { // 没有一样的出库口
                StockOutParam stockOutParam = new StockOutParam();
                stockOutParam.setOutSite(locDto.getStaNo());
                stockOutParam.setOrderNo(locDto.getOrderNo());
                List<StockOutParam.LocDetl> locDetls = new ArrayList<>();
                List<LocDetl> locDetls1 = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("brand", locDto.getBrand()));
                for(LocDetl locDetl:locDetls1) {
                    StockOutParam.LocDetl  locDetl1 = new StockOutParam.LocDetl();
                    locDetl1.setLocNo(locDetl.getLocNo());
                    locDetl1.setBrand(locDetl.getBrand());
                    locDetl1.setModel(locDetl.getModel());
                    locDetl1.setCount(locDetl.getAnfme());
                    locDetls.add(locDetl1);
                }
                stockOutParam.setLocDetls(locDetls);
                stockOutParams.add(stockOutParam);
            }
        }

        for(StockOutParam stockOutParam :stockOutParams) {
            BasDevp staNo = basDevpService.checkSiteStatus(stockOutParam.getOutSite());
            // 获取库位明细
            List<LocDetlDto> locDetlDtos = new ArrayList<>();
            for (StockOutParam.LocDetl paramLocDetl : stockOutParam.getLocDetls()) {
                LocDetl one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",paramLocDetl.getLocNo())
                        .eq("brand",paramLocDetl.getBrand()).eq("model",paramLocDetl.getModel()));
                if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
            }
            if (!locDetlDtos.isEmpty()) {
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
                if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
                    // 根据订单类型判断出库类型
                    Order order = orderService.selectByNo(stockOutParam.getOrderNo());

                    // 启动出库开始
                    workService.stockOut(staNo, locDetlDtos, order.getDocType() ==  22 ? IoWorkType.CHECK_OUT : null, getUserId());
                }else {
                    throw new CoolException("所选库位存在状态不为F、D的库位，库位号："+locMast.getLocNo()+" 、当前状态："+locMast.getLocSts()+"-"+locMast.getLocSts$());
                }
            } else {
                throw new CoolException("库存不存在");
            }
        }

//        List<TaskDto> taskDtos = new ArrayList<>();
//        // 根据 （库位 & 出库站） 分组； 理想状态：一组为一次出库任务
//        for (LocDto locDto : locDtos) {
@@ -198,11 +282,13 @@
//                taskDtos.add(taskDto);
//            }
//        }
//        // -----------------------------------------------------------------------------------------------
        // -----------------------------------------------------------------------------------------------
//        for (TaskDto taskDto : taskDtos) {
//            BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
//            workService.stockOut(staNo, taskDto, getUserId());
//        }
//
//        stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId);
        return R.ok();
    }

@@ -256,7 +342,15 @@
        }
        // 单据明细档
        int i=0;
        List<LocDto> locDtosList = new ArrayList<>();
        List<String> batchList = new ArrayList<>();
        for (LocDto locDto : locDtos) {
            if (!batchList.contains(locDto.getBatch())){
                batchList.add(locDto.getBatch());
                locDtosList.add(locDto);
            }
        }
        for (LocDto locDto : locDtosList) {
            i++;
            Mat mat = matService.selectByMatnr(locDto.getMatnr());
            if (Cools.isEmpty(mat)) {