| | |
|---|
| | | if (Objects.isNull(param) || StringUtils.isBlank(param.getLocCode())) { |
|---|
| | | continue; |
|---|
| | | } |
|---|
| | | Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, param.getLocCode()).eq(Loc::getBarcode, param.getBarcode())); |
|---|
| | | // 修复：构建库位查询条件，如果barcode为空，只按locCode查询 |
|---|
| | | LambdaQueryWrapper<Loc> locQueryWrapper = new LambdaQueryWrapper<Loc>() |
|---|
| | | .eq(Loc::getCode, param.getLocCode()); |
|---|
| | | if (StringUtils.isNotBlank(param.getBarcode())) { |
|---|
| | | locQueryWrapper.eq(Loc::getBarcode, param.getBarcode()); |
|---|
| | | } |
|---|
| | | Loc loc = locService.getOne(locQueryWrapper); |
|---|
| | | if (!Objects.isNull(loc)) { |
|---|
| | | List<LocItem> locItems = new ArrayList<>(); |
|---|
| | | LocItem locItem = locItemService.getById(param.getId()); |
|---|
| | | |
|---|
| | | WkOrderItem orderItem = outStockItemService.getOne(new LambdaQueryWrapper<WkOrderItem>() |
|---|
| | | // 修复：构建查询条件，先构建基础条件，再根据值是否为空动态添加 |
|---|
| | | LambdaQueryWrapper<WkOrderItem> orderItemWrapper = new LambdaQueryWrapper<WkOrderItem>() |
|---|
| | | .eq(WkOrderItem::getOrderId, outId) |
|---|
| | | .eq(StringUtils.isNotBlank(locItem.getBatch()), WkOrderItem::getSplrBatch, locItem.getBatch()) |
|---|
| | | .eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), WkOrderItem::getFieldsIndex, locItem.getFieldsIndex()) |
|---|
| | | .eq(WkOrderItem::getMatnrId, locItem.getMatnrId())); |
|---|
| | | .eq(WkOrderItem::getMatnrId, locItem.getMatnrId()); |
|---|
| | | if (StringUtils.isNotBlank(locItem.getBatch())) { |
|---|
| | | orderItemWrapper.eq(WkOrderItem::getSplrBatch, locItem.getBatch()); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(locItem.getFieldsIndex())) { |
|---|
| | | orderItemWrapper.eq(WkOrderItem::getFieldsIndex, locItem.getFieldsIndex()); |
|---|
| | | } |
|---|
| | | WkOrderItem orderItem = outStockItemService.getOne(orderItemWrapper); |
|---|
| | | |
|---|
| | | if (Objects.isNull(orderItem)) { |
|---|
| | | throw new CoolException("单据明细不存在！！"); |
|---|
