#

cp

2024-08-13 12e16a4e48fa33ead5aae7ca065fdea636135527

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

@@ -426,7 +426,7 @@
        // 获取路径
        int ioType = taskDto.isAll() ? 101 : 103;
        // 获取路径
        StaDesc staDesc = staDescService.getOne(new LambdaQueryWrapper<StaDesc>().eq(StaDesc::getTypeNo, ioType).eq(StaDesc::getDeviceStn, staNo).eq(StaDesc::getHostId, hostId));
        StaDesc staDesc = staDescService.getOne(new LambdaQueryWrapper<StaDesc>().eq(StaDesc::getTypeNo, ioType).eq(StaDesc::getStnNo, staNo).eq(StaDesc::getHostId, hostId));
        // 生成工作号
        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
        // 生成工作档
@@ -443,6 +443,7 @@
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setCrnNo(locMast.getCrnNo());
        wrkMast.setBarcode(locMast.getBarcode());
        wrkMast.setAppeUser(String.valueOf(userId)); // 操作人员数据
        wrkMast.setAppeTime(now);
@@ -484,7 +485,7 @@
                throw new CoolException("保存工作档明细失败");
            }
            // 修改订单明细
            if (!orderDetlService.increase(orderDetl.getOrderId(), hostId, orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
            if (!orderDetlService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(), hostId)) {
                throw new CoolException("修改订单明细数量失败");
            }
            orderService.updateSettle(orderDetl.getOrderId(), 2L, userId, hostId);
@@ -591,6 +592,7 @@
        } else {
            throw new CoolException("当前工作状态无法取消");
        }

        // 订单关联
        List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId));
        for (WrkDetl wrkDetl : wrkDetls) {
@@ -598,6 +600,30 @@
                if (!orderDetlService.decrease(wrkDetl.getOrderNo(), hostId, wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
                    throw new CoolException("订单数据回滚失败");
                }

                //修改订单主表状态,没有作业数量时才可以修改
                boolean flag = true;
                List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
                        .eq(OrderDetl::getOrderNo, wrkDetl.getOrderNo())
                        .eq(OrderDetl::getHostId, hostId));
                for(OrderDetl orderDetl : orderDetls){
                    if(orderDetl.getWorkQty() > 0){
                        flag = false;
                    }
                }
                if(flag){
                    Order order = orderService.getOne(new LambdaQueryWrapper<Order>()
                            .eq(Order::getOrderNo, wrkDetl.getOrderNo())
                            .eq(Order::getHostId, hostId));
                    if(!Cools.isEmpty(order) && order.getSettle()==2){
                        order.setSettle(1L);
                        order.setUpdateBy(userId);
                        order.setUpdateTime(new Date());
                    }
                    if(!orderService.updateById(order)){
                        throw new CoolException("修改订单状态失败");
                    }
                }
            }
        }
        // 取消操作人员记录