Merge remote-tracking branch 'origin/master'

src/main/java/com/ffii/core/utils/ZebraPrinterUtil.kt

@@ -59,7 +59,7 @@ open class ZebraPrinterUtil {
                             println("DEBUG: Processing page ${pageIndex + 1} of $totalPages")
 
                             // 2. Render each page of the PDF as a monochrome image
-                            val image = renderer.renderImage(pageIndex, 300 / 72f, ImageType.BINARY)
+                            val image = renderer.renderImage(pageIndex, 203 / 72f, ImageType.BINARY)
 
                             // 3. Convert the image to a ZPL format string
                             val zplCommand = convertImageToZpl(image, printDirection)

src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DoPickOrderRepository.kt

@@ -31,4 +31,7 @@ fun findByStoreIdAndRequiredDeliveryDateAndTicketStatusIn(
     status: List<DoPickOrderStatus>
 ): List<DoPickOrder>
 
+    @Query("SELECT d FROM DoPickOrder d WHERE d.deleted = false ORDER BY d.requiredDeliveryDate ASC, d.truckDepartureTime ASC")
+    fun findAllByDeletedFalseOrderByTicketReleaseTimeDesc(): List<DoPickOrder>
+
 }

src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt

@@ -58,6 +58,7 @@ import org.springframework.core.io.ClassPathResource
 import java.io.File
 import java.io.FileNotFoundException
 import com.ffii.core.support.JdbcDao;
+import com.ffii.fpsms.modules.deliveryOrder.entity.DoPickOrderLineRecordRepository
 import com.ffii.fpsms.modules.deliveryOrder.entity.DoPickOrderLineRepository
 import com.ffii.fpsms.modules.deliveryOrder.entity.DoPickOrderRecord
 import com.ffii.fpsms.modules.deliveryOrder.entity.DoPickOrderRecordRepository
@@ -104,6 +105,7 @@ open class DeliveryOrderService(
     private val pickExecutionIssueRepository: PickExecutionIssueRepository,
     private val doPickOrderRepository: DoPickOrderRepository,
     private val doPickOrderLineRepository: DoPickOrderLineRepository,
+    private val doPickOrderLineRecordRepository: DoPickOrderLineRecordRepository
 ) {
 
     open fun findByM18DataLogId(m18DataLogId: Long): DeliveryOrder? {
@@ -851,7 +853,9 @@ open class DeliveryOrderService(
             for (info in cartonLabelInfo) {
                 val field = mutableMapOf<String, Any>()
             }
+            if(cartonLabelInfo.size > 1){
 
+            }
             params["shopPurchaseOrderNo"] = doPickOrder.deliveryOrderCode ?: cartonLabelInfo[0].code
             params["deliveryOrderCode"] = "GEN FROM CODE GENERATOR (NEED FIND TIMING)"
             params["shopAddress"] = cartonLabelInfo[0].shopAddress ?: ""

src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt

@@ -584,4 +584,8 @@ open class DoPickOrderService(
             )
         }
     }
+
+    open fun getTicketReleaseTable(): List<DoPickOrder>{
+        return doPickOrderRepository.findAllByDeletedFalseOrderByTicketReleaseTimeDesc()
+    }
 }// ✅ 类结束

src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/DoPickOrderController.kt

@@ -90,4 +90,9 @@ fun startBatchReleaseAsync(
 fun getBatchReleaseProgress(@PathVariable jobId: String): MessageResponse {
     return doReleaseCoordinatorService.getBatchReleaseProgress(jobId)
 }
+
+    @GetMapping("/ticket-release-table")
+    fun getTicketReleaseTable(): List<DoPickOrder> {
+        return doPickOrderService.getTicketReleaseTable()
+    }
 }