完善

cp

2024-10-30 431f88fdade07a22b636714f1690cee3a55668d0

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java

@@ -9,6 +9,7 @@
import com.zy.asrs.common.openapi.entity.param.CombParam;
import com.zy.asrs.common.openapi.entity.param.WarehouseOutMergeBoardManyParam;
import com.zy.asrs.common.openapi.entity.param.WarehouseOutPickMergeParam;
import com.zy.asrs.common.web.BaseController;
import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.common.wms.mapper.LocDetlMapper;
import com.zy.asrs.common.wms.service.*;
@@ -399,7 +400,7 @@

    @Override
    @Transactional
    public R WarehouseOutV1(CombParam combParam, Long hostId) {
    public R WarehouseOutV1(CombParam combParam, Long hostId,Long userId) {
        //判断库位状态
        LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, combParam.getLocno()).eq(LocMast::getHostId,hostId).eq(LocMast::getWhsType,0L));
        if (Cools.isEmpty(locMast)){
@@ -427,8 +428,8 @@
            if (combMat.getAnfme() > locDetl.getAnfme()){
                return R.error("拣选数量错误，超出库存数量");
            }
            if (!Cools.isEmpty(combParam.getOrderNo())){
                Order order = orderService.selectByNo(combParam.getOrderNo(), hostId);
            if (!Cools.isEmpty(combMat.getOrderNo())){
                Order order = orderService.selectByNo(combMat.getOrderNo(), hostId);
                if (Cools.isEmpty(order)){
                    continue;
                }
@@ -443,7 +444,7 @@
                    throw new CoolException("拣选数量出错,订单剩余出库数量小于已出库数量与将拣选数量之和！！！");
                }
                // 修改订单明细作业数量
                if (!orderDetlService.increaseWorkQtyByOrderNo(combParam.getOrderNo(), combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme(), hostId)) {
                if (!orderDetlService.increaseWorkQtyByOrderNo(combMat.getOrderNo(), combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme(), hostId)) {
                    throw new CoolException("修改单据明细工作数量失败");
                }
                // 修改订单明细完成数量
@@ -451,7 +452,7 @@
                    throw new CoolException("修改单据明细完成数量失败");
                }
                // 修改订单状态 作业中 ===>> 已完成
                orderService.checkComplete(combParam.getOrderNo(), hostId);
                orderService.checkComplete(combMat.getOrderNo(), hostId);
            }
            try {
                //处理库存信息
@@ -461,8 +462,11 @@
                adjDetl.setBatch(locDetl.getBatch());
                adjDetl.setOriQty(locDetl.getAnfme());
                adjDetl.setMemo("WarehouseOutV1-pick");
                adjDetl.setModiUser(userId);
                adjDetl.setAppeUser(userId);
                adjDetl.setAppeTime(new Date());
                adjDetl.setModiTime(new Date());

                adjDetl.setOrderNo(combMat.getOrderNo());
                if (combMat.getAnfme().equals(locDetl.getAnfme())){
                    adjDetl.setAdjQty(0D);
                    //库存相等删除数据
@@ -470,8 +474,8 @@
                    int count = locDetlService.count(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo,combParam.getLocno()).eq(LocDetl::getHostId, hostId));
                    if (count == 0){
                        LocMast locMast1 = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, combParam.getLocno()).eq(LocMast::getHostId, hostId));
                        locMast1.setLocSts("O");
                        locMastService.updateById(locMast1);
//                        locMast1.setLocSts("O");
//                        locMastService.updateById(locMast1);
                    }
                } else {
                    BigDecimal subtract = BigDecimal.valueOf(locDetl.getAnfme()).subtract(BigDecimal.valueOf(combMat.getAnfme()));
@@ -492,7 +496,7 @@

    @Override
    @Transactional
    public R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long hostId) {
    public R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long hostId,Long userId) {
        //判断库位状态
        LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, param.getLocNo()).eq(LocMast::getHostId,hostId).eq(LocMast::getWhsType,0L));
        if (Cools.isEmpty(locMast)){
@@ -541,6 +545,14 @@
            locDetl.setId(null);
            locDetl.setLocNo(param.getLocNo());
            locDetl.setBarcode(locMast.getBarcode());
            Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr,locDetl.getMatnr()));
            locDetl.setHostId(hostId);
            locDetl.setMaktx(mat.getMaktx());
            if(hostId==1){
                locDetl.setOwner("宁波仓");
            }else{
                locDetl.setOwner("新昌仓");
            }

            String matKey = locDetl.getMatnr();
            if (!Cools.isEmpty(locDetl.getBatch())) {
@@ -604,7 +616,7 @@
                        continue;
                    }
                    if (orderDetl.getAnfme() < (orderDetl.getWorkQty() + orderDto.getAnfme())) {
                        throw new CoolException("拣选数量出错,订单剩余出库数量小于已出库数量与将拣选数量之和！！！");
                        throw new CoolException("并板数量出错,订单剩余出库数量小于已出库数量与将并板数量之和！！！");
                    }
                    // 修改订单明细作业数量
                    if (!orderDetlService.increaseWorkQtyByOrderNo(orderDto.getOrderNo(), locDetl.getMatnr(), locDetl.getBatch(), orderDto.getAnfme(), hostId)) {
@@ -616,34 +628,39 @@
                    }
                    // 修改订单状态 作业中 ===>> 已完成
                    orderService.checkComplete(orderDto.getOrderNo(), hostId);

                    try {
                        //处理库存信息
                        AdjDetl adjDetl = new AdjDetl();
                        adjDetl.setLocNo(locDetl.getLocNo());
                        adjDetl.setMatnr(locDetl.getMatnr());
                        adjDetl.setBatch(locDetl.getBatch());
                        adjDetl.setOriQty(originAnfme);
                        adjDetl.setAdjQty(locDetl.getAnfme());
                        adjDetl.setMemo("WarehouseOutV1-pick");
                        adjDetl.setModiUser(userId);
                        adjDetl.setAppeUser(userId);
                        adjDetl.setAppeTime(new Date());
                        adjDetl.setModiTime(new Date());
                        adjDetl.setOrderNo(order.getOrderNo());
                        if (!adjDetlService.save(adjDetl)) {
                            throw new CoolException("保存库存调整记录失败");
                        }
                    }catch (Exception e){
                        e.printStackTrace();
                        throw new CoolException("更新库存数据出错" + e.getMessage());
                    }
                }
            }

            try {
                //处理库存信息
                AdjDetl adjDetl = new AdjDetl();
                adjDetl.setLocNo(locDetl.getLocNo());
                adjDetl.setMatnr(locDetl.getMatnr());
                adjDetl.setBatch(locDetl.getBatch());
                adjDetl.setOriQty(originAnfme);
                adjDetl.setAdjQty(locDetl.getAnfme());
                adjDetl.setMemo("WarehouseOutV1-pick");
                adjDetl.setModiTime(new Date());

                if (!adjDetlService.save(adjDetl)) {
                    throw new CoolException("保存库存调整记录失败");
                }
            }catch (Exception e){
                e.printStackTrace();
                throw new CoolException("更新库存数据出错" + e.getMessage());
            }
        }
        return R.ok();
    }

    @Override
    @Transactional
    public R WarehouseOutMergeBoardMany(WarehouseOutMergeBoardManyParam param, Long hostId) {
    public R WarehouseOutMergeBoardMany(WarehouseOutMergeBoardManyParam param, Long hostId,Long userId) {
        WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode(), hostId);
        if (wrkMast == null) {
            throw new CoolException("工作档不存在");
@@ -663,7 +680,7 @@
        for (WrkDetl wrkDetl : wrkDetls) {
            String matKey = wrkDetl.getMatnr();
            if (!Cools.isEmpty(wrkDetl.getBatch())) {
                matKey += "_" + wrkDetl.getBatch();
                matKey += "_" + wrkDetl.getBatch() + "-" +wrkDetl.getOrderNo();
            }

            MergeBoardManyDto dto = new MergeBoardManyDto();
@@ -676,18 +693,25 @@
        for (OrderDetl orderDetl : param.getCombMats()) {
            String matKey = orderDetl.getMatnr();
            if (!Cools.isEmpty(orderDetl.getBatch())) {
                matKey += "_" + orderDetl.getBatch();
                matKey += "_" + orderDetl.getBatch() + "-" +orderDetl.getOrderNo();
            }

            MergeBoardManyDto dto = wrkData.get(matKey);
            if(dto == null){
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.sync(orderDetl);
                Mat mat=matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr,wrkDetl.getMatnr()));
                wrkDetl.sync(mat);
                wrkDetl.setId(null);
                wrkDetl.setWrkNo(wrkMast.getWrkNo());
                wrkDetl.setWrkMastId(wrkMast.getId());
                wrkDetl.setZpallet(wrkMast.getBarcode());
                wrkDetl.setIoTime(new Date());

                wrkDetl.setHostId(hostId);
                wrkDetl.setAppeUser(userId);
                wrkDetl.setAppeTime(new Date());
                wrkDetl.setModiUser(userId);
                wrkDetl.setModiTime(new Date());
                ArrayList<PickMergeOrderDto> orderDtos = new ArrayList<>();
                orderDtos.add(new PickMergeOrderDto(orderDetl.getOrderNo(), orderDetl.getAnfme()));

@@ -700,8 +724,11 @@
                List<PickMergeOrderDto> orders = dto.getOrders();

                wrkDetl.setAnfme(wrkDetl.getAnfme() + orderDetl.getAnfme());
                wrkDetl.setIoTime(new Date());
                wrkDetl.setHostId(hostId);
                wrkDetl.setModiUser(userId);
                wrkDetl.setModiTime(new Date());
                orders.add(new PickMergeOrderDto(orderDetl.getOrderNo(), orderDetl.getAnfme()));

                dto.setWrkDetl(wrkDetl);
                dto.setOrders(orders);
            }
@@ -750,6 +777,8 @@
                    }
                    // 修改订单状态 作业中 ===>> 已完成
                    orderService.checkComplete(orderDto.getOrderNo(), hostId);


                }
            }
        }