贴标申请，仓储转运

lastleg-service/src/main/java/com/baiyue/lastleg/mapper/LastlegOrderMapper.java

@@ -84,7 +84,7 @@ public interface LastlegOrderMapper extends BaseMapper<LastlegOrder> {
         "ORDER BY r.signed_at DESC,r.id DESC) AS measurementNo " +
         "FROM ll_return_receipt r JOIN ll_return_order o ON o.id=r.return_order_id AND o.customer_id=r.customer_id " +
         "WHERE o.lastleg_order_id IN <foreach collection='orderIds' item='id' open='(' separator=',' close=')'>#{id}</foreach> " +
-        "AND r.unit_type IN ('PALLET','BOX') AND r.length IS NOT NULL AND r.width IS NOT NULL AND r.height IS NOT NULL" +
+        "AND r.unit_type IN ('PALLET','BOX','PARCEL') AND r.length IS NOT NULL AND r.width IS NOT NULL AND r.height IS NOT NULL" +
         ") m WHERE m.measurementNo=1 GROUP BY m.orderId</script>")
     List<ReturnVolumeRow> findReturnVolumes(@Param("orderIds") List<Long> orderIds);
 

lastleg-service/src/main/java/com/baiyue/lastleg/relabel/dto/RelabelResponses.java

@@ -20,7 +20,7 @@ public final class RelabelResponses {
                           String fulfillmentStatus, String outboundOrderNo, LocalDateTime customerConfirmedAt,
                           String reviewChannel, String reviewRemark, LocalDateTime createdAt,
                           LocalDateTime reviewedAt, LocalDateTime relabelCompletedAt, LocalDateTime outboundAt,
-                          String productNameZh, String labelRequirement) {}
+                          String productNameZh, String labelRequirement, List<String> operationTypes) {}
     public record Milestones(LocalDateTime reviewedAt, LocalDateTime relabelCompletedAt,
                              LocalDateTime outboundAt) {}
     public record Item(Long id, String skuCode, String productImageFileId, String productImageFileName,

lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java

@@ -1226,7 +1226,9 @@ public class RelabelApplicationService implements WalletResultHandler {
             detailItems.stream().map(RelabelItem::getProductNameZh).filter(StringUtils::hasText)
                 .map(String::trim).distinct().collect(Collectors.joining("、")),
             detailItems.stream().map(RelabelItem::getLabelRequirement).filter(StringUtils::hasText)
-                .map(String::trim).distinct().collect(Collectors.joining("；")));
+                .map(String::trim).distinct().collect(Collectors.joining("；")),
+            detailItems.stream().map(RelabelItem::getOperationType).filter(StringUtils::hasText)
+                .map(String::trim).distinct().toList());
     }
 
     @Override public boolean supports(String businessType) { return "RELABEL_ORDER".equals(businessType); }

lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptService.java

@@ -768,7 +768,7 @@ public class ReturnReceiptService {
         tail.setPackageCount(actualBoxes); tail.setReceivedPackageCount(actualBoxes);
         tail.setProductQuantity(actualUnits); tail.setPalletCount(palletCodes.size());
         for (ReturnReceipt signed : signedReceipts) {
-            if (signed.getLength() == null || signed.getWidth() == null || signed.getHeight() == null || "PARCEL".equals(signed.getUnitType())) continue;
+            if (signed.getLength() == null || signed.getWidth() == null || signed.getHeight() == null) continue;
             String code = text(signed.getUnitCode()) == null ? signed.getReceiptNo() : signed.getUnitCode();
             measuredUnits.putIfAbsent(signed.getUnitType() + ":" + code, signed);
         }