Merge branch 'test' of http://8.163.30.128:10082/java-project/baiyue-firstleg into test

warehouse-overseas-service/src/main/java/com/baiyue/warehouse/controller/InternalWarehousePalletController.java

@@ -7,14 +7,17 @@ import com.baiyue.warehouse.entity.WarehousePalletEntity;
 import com.baiyue.warehouse.dto.WarehousePalletResolveResponse;
 import com.baiyue.warehouse.security.InternalServiceTokenGuard;
 import com.baiyue.warehouse.service.WarehouseResourceService;
+import com.baiyue.warehouse.service.PalletLabelPrintService;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/internal/v1/warehouse-pallets")
 public class InternalWarehousePalletController {
     @Resource private WarehouseResourceService service;
+    @Resource private PalletLabelPrintService palletLabels;
     @Resource private InternalServiceTokenGuard tokenGuard;
 
     @PostMapping("/ensure-dropship")
@@ -49,4 +52,14 @@ public class InternalWarehousePalletController {
         return ApiResponse.success(service.resolvePublicPallet(palletId));
     }
 
+    @GetMapping("/{warehouseId}/{palletId}/label")
+    public ResponseEntity<byte[]> label(
+        @RequestHeader(value = "X-Internal-Service-Token", required = false) String token,
+        @RequestHeader(value = "X-Request-Id", required = false) String requestId,
+        @PathVariable long warehouseId, @PathVariable long palletId,
+        @RequestParam String transferNo) {
+        tokenGuard.verify(token);
+        return palletLabels.printTransfer(warehouseId, palletId, transferNo, requestId);
+    }
+
 }

warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/PalletLabelPrintService.java

@@ -25,6 +25,16 @@ public class PalletLabelPrintService {
     private String internalToken;
 
     public ResponseEntity<byte[]> print(long warehouseId, long palletId, String requestId) {
+        return print(warehouseId, palletId, requestId, "PALLET");
+    }
+
+    public ResponseEntity<byte[]> printTransfer(long warehouseId, long palletId, String transferNo,
+                                                 String requestId) {
+        String reference = transferNo == null || transferNo.isBlank() ? "转运单" : "转运单 " + transferNo.trim();
+        return print(warehouseId, palletId, requestId, reference);
+    }
+
+    private ResponseEntity<byte[]> print(long warehouseId, long palletId, String requestId, String reference) {
         var pallet = resources.pallet(WarehouseResourceService.PUBLIC_RESOURCE_SCOPE, warehouseId, palletId);
         String code = pallet.getPalletCode();
         String fbaCode = pallet.getFbaWarehouseCode();
@@ -37,8 +47,9 @@ public class PalletLabelPrintService {
         }
         var warehouse = warehouses.required(warehouseId);
         String fileName = code.replaceAll("[\\\\/:*?\"<>|]", "-") + "-托盘码.pdf";
-        var label = new PrintPdfClient.Label(code, fbaCode == null || fbaCode.isBlank() ? "—" : fbaCode,
-            "PALLET", warehouse.warehouseName(), code);
+        var label = new PrintPdfClient.Label(code,
+            fbaCode == null || fbaCode.isBlank() ? "目的仓待定" : fbaCode,
+            reference, warehouse.warehouseName(), code);
         var request = new PrintPdfClient.Request("INBOUND_MARK_V1",
             new PrintPdfClient.PageSpec(new BigDecimal("100"), new BigDecimal("100")), fileName, List.of(label));
         try {

warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehouseResourceService.java

@@ -386,9 +386,11 @@ public class WarehouseResourceService {
     }
 
     private static String generatedPalletCode(String warehouseCode, long palletId) {
-        String boundedWarehouseCode = warehouseCode.length() <= 30 ? warehouseCode : warehouseCode.substring(0, 30);
-        return "PLT-" + boundedWarehouseCode + "-" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE)
-            + "-" + Long.toUnsignedString(palletId);
+        String compactWarehouseCode = warehouseCode.replaceAll("[^A-Za-z0-9]", "").toUpperCase(java.util.Locale.ROOT);
+        if (compactWarehouseCode.length() > 9) compactWarehouseCode = compactWarehouseCode.substring(0, 9);
+        return "PLT-" + compactWarehouseCode + "-"
+            + LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd")) + "-"
+            + Long.toUnsignedString(palletId, 36).toUpperCase(java.util.Locale.ROOT);
     }
 
     private static String defaultLocationCode(String warehouseCode) {