B.E.N.S.O.N 2 тижднів тому
джерело
коміт
7c162a457a
6 змінених файлів з 22 додано та 5 видалено
  1. +2
    -2
      src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
  2. +1
    -1
      src/main/java/com/ffii/fpsms/modules/jobOrder/web/model/CreateJobOrderRequest.kt
  3. +2
    -0
      src/main/java/com/ffii/fpsms/modules/master/entity/PrinterRepository.kt
  4. +4
    -0
      src/main/java/com/ffii/fpsms/modules/master/service/PrinterService.kt
  5. +7
    -2
      src/main/java/com/ffii/fpsms/modules/master/service/WarehouseQrCodeService.kt
  6. +6
    -0
      src/main/java/com/ffii/fpsms/modules/master/web/PrinterController.kt

+ 2
- 2
src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt Переглянути файл

@@ -488,7 +488,7 @@ open class JoPickOrderService(
suggestedPickLotId = spl.id,
stockOutLineQty = sol?.qty ?: 0.0,
stockOutLineStatus = sol?.status,
routerIndex = warehouse?.order?.toIntOrNull(),
routerIndex = warehouse?.order?.toString(),
routerArea = warehouse?.code,
routerRoute = warehouse?.code,
uomShortDesc = uom?.udfShortDesc,
@@ -2003,7 +2003,7 @@ open fun getJobOrderLotsHierarchicalByPickOrderId(pickOrderId: Long): JobOrderLo
suggestedPickLotId = spl.id,
stockOutLineQty = sol?.qty ?: 0.0,
stockOutLineStatus = sol?.status,
routerIndex = warehouse?.order?.toIntOrNull(),
routerIndex = warehouse?.order?.toString(),
routerArea = warehouse?.code,
routerRoute = warehouse?.code,
uomShortDesc = uom?.udfShortDesc,


+ 1
- 1
src/main/java/com/ffii/fpsms/modules/jobOrder/web/model/CreateJobOrderRequest.kt Переглянути файл

@@ -112,7 +112,7 @@ data class LotDetailResponse(
val suggestedPickLotId: Long?,
val stockOutLineQty: Double?,
val stockOutLineStatus: String?,
val routerIndex: Int?,
val routerIndex: String?,
val routerArea: String?,
val routerRoute: String?,
val uomShortDesc: String?,


+ 2
- 0
src/main/java/com/ffii/fpsms/modules/master/entity/PrinterRepository.kt Переглянути файл

@@ -10,4 +10,6 @@ interface PrinterRepository : AbstractRepository<Printer, Long> {
fun findPrinterComboByDeletedFalse(): List<PrinterCombo>;

fun findByIdAndDeletedFalse(id: Serializable): Printer?;
fun findAllByDeletedIsFalse(): List<Printer>;
}

+ 4
- 0
src/main/java/com/ffii/fpsms/modules/master/service/PrinterService.kt Переглянути файл

@@ -9,6 +9,10 @@ import org.springframework.stereotype.Service
open class PrinterService(
val printerRepository: PrinterRepository
) {
open fun getPrinters(): List<Printer> {
return printerRepository.findAllByDeletedIsFalse();
}
open fun findCombo(): List<PrinterCombo> {
return printerRepository.findPrinterComboByDeletedFalse();
}


+ 7
- 2
src/main/java/com/ffii/fpsms/modules/master/service/WarehouseQrCodeService.kt Переглянути файл

@@ -44,8 +44,13 @@ class WarehouseQrCodeService(
continue
}
val qrContentMap = mapOf("warehouseCode" to code)
val qrCodeContent = Json.encodeToString(qrContentMap)
val warehouseId = warehouse.id
if (warehouseId == null) {
continue
}
val qrContentMap = mapOf("warehouseId" to warehouseId)
val qrCodeContent = Json.encodeToString(qrContentMap).replace(Regex("""(?<!:)(:)(?!\s)"""), ": ")
val qrCodeImage = QrCodeUtil.generateQRCodeImage(qrCodeContent)


+ 6
- 0
src/main/java/com/ffii/fpsms/modules/master/web/PrinterController.kt Переглянути файл

@@ -1,5 +1,6 @@
package com.ffii.fpsms.modules.master.web

import com.ffii.fpsms.modules.master.entity.Printer
import com.ffii.fpsms.modules.master.entity.projections.PrinterCombo
import com.ffii.fpsms.modules.master.service.PrinterService
import org.springframework.web.bind.annotation.GetMapping
@@ -11,6 +12,11 @@ import org.springframework.web.bind.annotation.RestController
class PrinterController(
private val printerService: PrinterService
) {
@GetMapping
fun getPrinters(): List<Printer> {
return printerService.getPrinters();
}
@GetMapping("/combo")
fun findCombo(): List<PrinterCombo> {
return printerService.findCombo();


Завантаження…
Відмінити
Зберегти