fix(lastleg): trace return carton sources and generate scannable labels

lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/MerchantReturnInventoryController.java

@@ -37,6 +37,13 @@ public class MerchantReturnInventoryController {
         return ApiResponse.success(service.summaryPage(customer(user), request));
     }
 
+    @GetMapping("/cartons")
+    @PreAuthorize("hasAuthority('" + LIST_PERMISSION + "')")
+    public ApiResponse<PageResult<ReturnInventoryResponses.CartonSummary>> cartons(@AuthenticationPrincipal AuthenticatedUser user,
+        @Valid ReturnInventoryRequests.Query request) {
+        return ApiResponse.success(service.cartonPage(customer(user), request));
+    }
+
     @GetMapping("/cartons/{cartonMark}")
     @PreAuthorize("hasAuthority('" + LIST_PERMISSION + "')")
     public ApiResponse<ReturnInventoryResponses.CartonDetail> carton(@AuthenticationPrincipal AuthenticatedUser user,

lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/ReturnInventoryResponses.java

@@ -7,6 +7,11 @@ import java.util.List;
 public final class ReturnInventoryResponses {
     private ReturnInventoryResponses() { }
 
+    public record CartonSummary(String cartonMark, String overseasWarehouseId, String sourceBatchNo,
+                                String sourceReturnNo, String status, int skuTypes, long totalQuantity,
+                                BigDecimal length, BigDecimal width, BigDecimal height, BigDecimal weight,
+                                LocalDateTime createdAt) { }
+
     public record InventoryItem(String overseasWarehouseId, String cartonMark, String sourceBatchNo, String status, String skuCode,
                                 String productNameZh, long quantity, int cartonSkuTypes, long cartonTotalQuantity,
                                 LocalDateTime receivedAt) { }

lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryCartonMapper.java

@@ -9,6 +9,21 @@ import java.util.List;
 
 @Mapper
 public interface ReturnInventoryCartonMapper extends BaseMapper<ReturnInventoryCarton> {
+    String MERCHANT_FILTER = " FROM ll_return_inventory_carton c WHERE c.customer_id=#{customerId} " +
+        "<if test='query.overseasWarehouseId != null and query.overseasWarehouseId != \"\"'>AND c.overseas_warehouse_id=#{query.overseasWarehouseId} </if>" +
+        "<if test='query.cartonMark != null and query.cartonMark != \"\"'>AND c.carton_mark LIKE CONCAT('%',#{query.cartonMark},'%') </if>" +
+        "<if test='query.returnNo != null and query.returnNo != \"\"'>AND c.source_return_no LIKE CONCAT('%',#{query.returnNo},'%') </if>" +
+        "<if test='query.status != null and query.status != \"\"'>AND c.status=#{query.status} </if>" +
+        "<if test='query.skuCode != null and query.skuCode != \"\"'>AND EXISTS(SELECT 1 FROM ll_return_inventory_carton_item i WHERE i.carton_id=c.id AND i.sku_code LIKE CONCAT('%',#{query.skuCode},'%')) </if>";
+
+    @Select("<script>SELECT COUNT(*)" + MERCHANT_FILTER + "</script>")
+    long merchantCount(@Param("customerId") String customerId,
+        @Param("query") com.baiyue.lastleg.returnreceipt.dto.ReturnInventoryRequests.Query query);
+
+    @Select("<script>SELECT c.*" + MERCHANT_FILTER + "ORDER BY c.created_at DESC,c.id DESC LIMIT #{offset},#{query.size}</script>")
+    List<ReturnInventoryCarton> merchantPage(@Param("customerId") String customerId,
+        @Param("query") com.baiyue.lastleg.returnreceipt.dto.ReturnInventoryRequests.Query query, @Param("offset") long offset);
+
     @Select("SELECT * FROM ll_return_inventory_carton WHERE customer_id=#{customerId} AND overseas_warehouse_id=#{warehouseId} AND status='AVAILABLE' ORDER BY created_at DESC,id DESC LIMIT 500")
     List<ReturnInventoryCarton> findAvailable(@Param("customerId") String customerId, @Param("warehouseId") String warehouseId);
     @Select("SELECT * FROM ll_return_inventory_carton WHERE carton_mark=#{cartonMark} LIMIT 1")

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

@@ -0,0 +1,26 @@
+package com.baiyue.lastleg.returnreceipt.service;
+
+import com.google.zxing.oned.Code128Writer;
+
+/** Inline vector bars remain printable even when browser background printing is disabled. */
+final class ReturnCartonBarcode {
+    private static final int QUIET_ZONE = 10;
+
+    private ReturnCartonBarcode() { }
+
+    static String svg(String cartonMark) {
+        boolean[] modules = new Code128Writer().encode(cartonMark);
+        int width = modules.length + QUIET_ZONE * 2;
+        StringBuilder svg = new StringBuilder("<svg xmlns=\"http://www.w3.org/2000/svg\" role=\"img\" aria-label=\"箱号条码\" viewBox=\"0 0 ")
+            .append(width).append(" 50\" preserveAspectRatio=\"none\" style=\"display:block;width:100%;height:15mm\">")
+            .append("<rect width=\"100%\" height=\"100%\" fill=\"white\"/>");
+        for (int index = 0; index < modules.length;) {
+            if (!modules[index]) { index++; continue; }
+            int start = index;
+            while (index < modules.length && modules[index]) index++;
+            svg.append("<rect x=\"").append(start + QUIET_ZONE).append("\" y=\"0\" width=\"")
+                .append(index - start).append("\" height=\"50\" fill=\"black\"/>");
+        }
+        return svg.append("</svg>").toString();
+    }
+}

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

@@ -91,6 +91,19 @@ public class ReturnInventoryService {
         return new PageResult<>(records, request.page(), request.size(), total, (total + request.size() - 1) / request.size());
     }
 
+    @Transactional(readOnly = true)
+    public PageResult<ReturnInventoryResponses.CartonSummary> cartonPage(String customerId, ReturnInventoryRequests.Query request) {
+        required(customerId, "客户身份不能为空");
+        long total = cartons.merchantCount(customerId, request);
+        List<ReturnInventoryResponses.CartonSummary> records = total == 0 ? List.of() :
+            cartons.merchantPage(customerId, request, (request.page() - 1) * request.size()).stream()
+                .map(carton -> new ReturnInventoryResponses.CartonSummary(carton.getCartonMark(), carton.getOverseasWarehouseId(),
+                    carton.getSourceBatchNo(), carton.getSourceReturnNo(), carton.getStatus(),
+                    carton.getSkuTypes() == null ? 0 : carton.getSkuTypes(), value(carton.getTotalQuantity()),
+                    carton.getLength(), carton.getWidth(), carton.getHeight(), carton.getWeight(), carton.getCreatedAt())).toList();
+        return new PageResult<>(records, request.page(), request.size(), total, (total + request.size() - 1) / request.size());
+    }
+
     @Transactional(readOnly = true)
     public PageResult<ReturnInventoryResponses.SummaryItem> summaryPage(String customerId, ReturnInventoryRequests.SummaryQuery request) {
         String warehouseId = text(request.overseasWarehouseId());
@@ -230,6 +243,8 @@ public class ReturnInventoryService {
         }
         Map<String, Long> remaining = new LinkedHashMap<>(requested);
         Map<String, Integer> emptiedBySku = new LinkedHashMap<>();
+        LinkedHashSet<String> consumedBatchNos = new LinkedHashSet<>();
+        LinkedHashSet<String> consumedReturnNos = new LinkedHashSet<>();
         long total = 0;
         for (ReturnInventoryCarton source : sources) {
             List<ReturnInventoryCartonItem> sourceItems = cartonItems.listCarton(source.getId());
@@ -238,6 +253,8 @@ public class ReturnInventoryService {
                 String sku = item.getSkuCode().toUpperCase(java.util.Locale.ROOT);
                 long take = Math.min(value(remaining.get(sku)), value(item.getQuantity()));
                 if (take > 0) {
+                    consumedBatchNos.add(required(source.getSourceBatchNo(), "来源签收批次缺失，无法合箱"));
+                    consumedReturnNos.add(required(source.getSourceReturnNo(), "来源退货单缺失，无法合箱"));
                     remaining.put(sku, remaining.get(sku) - take); total = Math.addExact(total, take);
                     productNames.putIfAbsent(sku, item.getProductNameZh());
                     item.setQuantity(item.getQuantity() - take);
@@ -256,7 +273,7 @@ public class ReturnInventoryService {
         long targetId = IdWorker.getId();
         ReturnInventoryCarton target = new ReturnInventoryCarton();
         target.setId(targetId); target.setCustomerId(customerId); target.setOverseasWarehouseId(sources.get(0).getOverseasWarehouseId());
-        target.setCartonMark(numbers.next("RETURN_CARTON", target.getOverseasWarehouseId(), targetId)); target.setSourceBatchNo("MERGED"); target.setSourceReturnNo(String.join(",", returnNos)); target.setStatus(AVAILABLE);
+        target.setCartonMark(numbers.next("RETURN_CARTON", target.getOverseasWarehouseId(), targetId)); target.setSourceBatchNo(String.join(",", consumedBatchNos)); target.setSourceReturnNo(String.join(",", consumedReturnNos)); target.setStatus(AVAILABLE);
         target.setSkuTypes(requested.size()); target.setTotalQuantity(total); target.setLength(request.length()); target.setWidth(request.width()); target.setHeight(request.height()); target.setWeight(request.weight()); target.setCreatedAt(now); target.setUpdatedAt(now); cartons.insert(target);
         for (Map.Entry<String, Long> entry : requested.entrySet()) {
             ReturnInventoryCartonItem targetItem = new ReturnInventoryCartonItem();
@@ -312,13 +329,14 @@ public class ReturnInventoryService {
         for (ReturnInventoryResponses.CartonItem item : items) rows.append("<tr><td>").append(escape(item.skuCode())).append("</td><td>")
             .append(escape(item.productNameZh())).append("</td><td class=\"qty\">").append(item.quantity()).append("</td></tr>");
         return "<!doctype html><html><head><meta charset=\"utf-8\"><title>退货箱唛</title><style>"
-            + "@page{size:100mm 150mm;margin:5mm}body{font-family:Arial,'Microsoft YaHei',sans-serif;color:#111;margin:0}.label{border:2px solid #111;padding:5mm;min-height:136mm}.brand{font-size:16px;font-weight:700}.title{font-size:22px;font-weight:700;margin:3mm 0 5mm}.mark{font:700 18px monospace;letter-spacing:1px;word-break:break-all}.meta{font-size:11px;margin:4mm 0;border-top:1px solid #111;border-bottom:1px solid #111;padding:3mm 0}.barcode{height:11mm;margin:3mm 0;background:repeating-linear-gradient(90deg,#111 0 2px,#fff 2px 4px,#111 4px 5px,#fff 5px 8px)}table{width:100%;border-collapse:collapse;font-size:11px}th,td{border:1px solid #111;padding:2mm;text-align:left}.qty{text-align:right;font-weight:700}.total{font-size:14px;font-weight:700;text-align:right;margin-top:4mm}</style></head><body><div class=\"label\"><div class=\"brand\">BAIYUE OVERSEAS WAREHOUSE</div><div class=\"title\">RETURN CARTON LABEL / 退货箱唛</div><div class=\"mark\">"
-            + escape(carton.getCartonMark()) + "</div><div class=\"barcode\" aria-label=\"" + escape(carton.getCartonMark()) + "\"></div>"
-            + "<div class=\"meta\">仓库：" + escape(carton.getOverseasWarehouseId()) + "<br>客户：" + escape(carton.getCustomerId())
-            + "<br>箱规：" + escape(String.valueOf(carton.getLength())) + " × " + escape(String.valueOf(carton.getWidth())) + " × " + escape(String.valueOf(carton.getHeight())) + " cm / " + escape(String.valueOf(carton.getWeight())) + " kg"
+            + "@page{size:100mm 150mm;margin:5mm}body{font-family:Arial,'Microsoft YaHei',sans-serif;color:#111;margin:0}.label{box-sizing:border-box;width:90mm;border:2px solid #111;padding:3mm;min-height:138mm}.brand{font-size:12px;font-weight:700}.title{font-size:16px;font-weight:700;margin:3mm 0}.mark{font:700 16px monospace;word-break:break-all}.meta{font-size:11px;margin:3mm 0;border-top:1px solid #111;border-bottom:1px solid #111;padding:2mm 0;overflow-wrap:anywhere}.barcode{margin:3mm 0}table{width:100%;border-collapse:collapse;font-size:11px;table-layout:fixed}th,td{border:1px solid #111;padding:1mm;text-align:left;overflow-wrap:anywhere}tr{break-inside:avoid}.qty{text-align:right;font-weight:700}.total{font-size:14px;font-weight:700;text-align:right;margin-top:3mm}</style></head><body><div class=\"label\"><div class=\"brand\">BAIYUE OVERSEAS WAREHOUSE</div><div class=\"title\">RETURN CARTON LABEL / 退货箱唛</div><div class=\"mark\">"
+            + escape(carton.getCartonMark()) + "</div><div class=\"barcode\">" + ReturnCartonBarcode.svg(carton.getCartonMark()) + "</div>"
+            + "<div class=\"meta\">来源退货单：" + escape(carton.getSourceReturnNo())
+            + "<br>箱规：" + dimension(carton.getLength()) + " × " + dimension(carton.getWidth()) + " × " + dimension(carton.getHeight()) + " cm / " + dimension(carton.getWeight()) + " kg"
             + "<br>签收批次：" + escape(carton.getSourceBatchNo()) + "</div><table><thead><tr><th>SKU</th><th>品名</th><th>数量</th></tr></thead><tbody>"
             + rows + "</tbody></table><div class=\"total\">合计：" + carton.getTotalQuantity() + " 件 / " + carton.getSkuTypes() + " 种 SKU</div></div></body></html>";
     }
+    private static String dimension(BigDecimal value) { return value == null ? "—" : value.stripTrailingZeros().toPlainString(); }
     private String hash(Object request) { try { return java.util.HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256")
         .digest(String.valueOf(request).getBytes(StandardCharsets.UTF_8))); }
         catch (Exception exception) { throw new IllegalStateException("无法生成请求哈希", exception); } }