958836976@qq.com
2024-12-23 19d3488298119d50a94a54903623bf0088d3359c
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -778,7 +778,7 @@
    }
    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public void orderOutMergeWave(OrderOutMergeParamDto dto) {
        if(dto == null){
            throw new CoolException("参数不能为空");
@@ -929,8 +929,10 @@
                    }
                }
                //TODO 确认后,需将注释打开
                String matUniqueKey = Utils.getMatUniqueKey(taskDetl.getMatnr(), taskDetl.getBatch(), taskDetl.getUniqueField());
                WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, waveId));
//                WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, waveId));
                WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, waveId));
                if (waveDetl == null) {
                    throw new CoolException("波次数据不存在");
                }
@@ -939,7 +941,6 @@
                if (!waveDetlService.updateById(waveDetl)) {
                    throw new CoolException("波次数据更新失败");
                }
            }
            //库位F => R