diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java index 6e028d112..01083420f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java @@ -234,22 +234,22 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi boolean hasMatchingSupplier = existingBatches.stream() .anyMatch(batch -> supplierCodeList.contains(batch.getSupplierCode())); - if (hasMatchingSupplier) { - // 找到匹配的批次,检查重量、体积、件数是否一致 - EmisTmsSiteBatch matchingBatch = existingBatches.stream() - .filter(batch -> supplierCodeList.contains(batch.getSupplierCode())) - .findFirst() - .orElse(null); - if (Objects.nonNull(matchingBatch)) { - result.setBatchParcelQty( - matchingBatch.getTotalParcelQty() != null ? matchingBatch.getTotalParcelQty() : 0); - result.setBatchWeight( - matchingBatch.getTotalWeight() != null ? matchingBatch.getTotalWeight() : BigDecimal.ZERO); - result.setBatchVolume( - matchingBatch.getTotalVolume() != null ? matchingBatch.getTotalVolume() : BigDecimal.ZERO); - return result; - } - } +// if (hasMatchingSupplier) { +// // 找到匹配的批次,检查重量、体积、件数是否一致 +// EmisTmsSiteBatch matchingBatch = existingBatches.stream() +// .filter(batch -> supplierCodeList.contains(batch.getSupplierCode())) +// .findFirst() +// .orElse(null); +// if (Objects.nonNull(matchingBatch)) { +// result.setBatchParcelQty( +// matchingBatch.getTotalParcelQty() != null ? matchingBatch.getTotalParcelQty() : 0); +// result.setBatchWeight( +// matchingBatch.getTotalWeight() != null ? matchingBatch.getTotalWeight() : BigDecimal.ZERO); +// result.setBatchVolume( +// matchingBatch.getTotalVolume() != null ? matchingBatch.getTotalVolume() : BigDecimal.ZERO); +// return result; +// } +// } } // 先过滤出包含多个供应商编码的rules