From aa6aab3ded8c7119b06dbc05c2bce94527e49c86 Mon Sep 17 00:00:00 2001 From: "cyril.tsui" Date: Mon, 16 Jun 2025 13:09:23 +0800 Subject: [PATCH] update --- .../fpsms/m18/service/M18MasterDataService.kt | 3 ++- .../com/ffii/fpsms/m18/service/M18TokenService.kt | 10 +++++----- .../com/ffii/fpsms/m18/web/M18TestController.kt | 15 +++++++++++++++ .../ffii/fpsms/m18/web/models/M18TestRequest.kt | 8 ++++---- .../modules/master/service/ItemUomService.kt | 1 + .../modules/master/web/models/ItemUomRequest.kt | 1 + .../stock/entity/projection/InventoryInfo.kt | 6 +++--- 7 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/ffii/fpsms/m18/service/M18MasterDataService.kt b/src/main/java/com/ffii/fpsms/m18/service/M18MasterDataService.kt index 83b6d7f..77b5465 100644 --- a/src/main/java/com/ffii/fpsms/m18/service/M18MasterDataService.kt +++ b/src/main/java/com/ffii/fpsms/m18/service/M18MasterDataService.kt @@ -201,7 +201,8 @@ open class M18MasterDataService( m18Id = it.id, m18LastModifyDate = commonUtils.timestampToLocalDateTime(pro.lastModifyDate), ratioD = it.ratioD, - ratioN = it.ratioN + ratioN = it.ratioN, + deleted = it.expired ) // logger.info("saved item id: ${savedItem.id}") diff --git a/src/main/java/com/ffii/fpsms/m18/service/M18TokenService.kt b/src/main/java/com/ffii/fpsms/m18/service/M18TokenService.kt index 8983339..d406957 100644 --- a/src/main/java/com/ffii/fpsms/m18/service/M18TokenService.kt +++ b/src/main/java/com/ffii/fpsms/m18/service/M18TokenService.kt @@ -26,11 +26,11 @@ open class M18TokenService( // ) // val params = M18TokenRequest( - grant_type = m18Config.GRANT_TYPE, - client_id = m18Config.CLIENT_ID, - client_secret = m18Config.CLIENT_SECRET, - username = m18Config.USERNAME, - password = m18Config.PASSWORD + grant_type = m18Config?.GRANT_TYPE ?: "password", + client_id = m18Config?.CLIENT_ID ?: "M2Y1OGYxMmQtZDRiOS00OTA4LTgyNTktZDRkNzEzNWVkMzRm", + client_secret = m18Config?.CLIENT_SECRET ?: "M2Y2YjQzYzQtZTc2Mi00OTFhLTkwYmItYmJhMzFjZjEyYmY5", + username = m18Config?.USERNAME ?:"testingMTMS", + password = m18Config?.PASSWORD ?: "db25f2fc14cd2d2b1e7af307241f548fb03c312a" ) apiCallerService diff --git a/src/main/java/com/ffii/fpsms/m18/web/M18TestController.kt b/src/main/java/com/ffii/fpsms/m18/web/M18TestController.kt index 861b4a1..60f2b00 100644 --- a/src/main/java/com/ffii/fpsms/m18/web/M18TestController.kt +++ b/src/main/java/com/ffii/fpsms/m18/web/M18TestController.kt @@ -61,6 +61,21 @@ class M18TestController ( println(response?.uom?.id) return response } + // --------------------------------------------- Master Data --------------------------------------------- /// + @GetMapping("/all") + fun m18All() { + val mdRequest = M18TestMasterDateRequest() + // Master Data + m18MasterDataService.saveUnits(mdRequest) + m18MasterDataService.saveProducts(mdRequest) + m18MasterDataService.saveVendors(mdRequest) + m18MasterDataService.saveBusinessUnits(mdRequest) + m18MasterDataService.saveCurrencies(mdRequest) + m18MasterDataService.saveBoms(mdRequest) + + val pqRequest = M18TestPqRequest() + m18PurchaseQuotationService.savePurchaseQuotations(pqRequest) + } // --------------------------------------------- Master Data --------------------------------------------- /// @PostMapping("/master-data") diff --git a/src/main/java/com/ffii/fpsms/m18/web/models/M18TestRequest.kt b/src/main/java/com/ffii/fpsms/m18/web/models/M18TestRequest.kt index 916ca99..71bc2e2 100644 --- a/src/main/java/com/ffii/fpsms/m18/web/models/M18TestRequest.kt +++ b/src/main/java/com/ffii/fpsms/m18/web/models/M18TestRequest.kt @@ -6,11 +6,11 @@ data class M18TestPoRequest( ) data class M18TestPqRequest( - val modifiedDateFrom: String?, - val modifiedDateTo: String?, + val modifiedDateFrom: String? = null, + val modifiedDateTo: String? = null, ) data class M18TestMasterDateRequest( - val modifiedDateFrom: String?, - val modifiedDateTo: String?, + val modifiedDateFrom: String? = null, + val modifiedDateTo: String? = null, ) diff --git a/src/main/java/com/ffii/fpsms/modules/master/service/ItemUomService.kt b/src/main/java/com/ffii/fpsms/modules/master/service/ItemUomService.kt index 534e9be..22f10c1 100644 --- a/src/main/java/com/ffii/fpsms/modules/master/service/ItemUomService.kt +++ b/src/main/java/com/ffii/fpsms/modules/master/service/ItemUomService.kt @@ -60,6 +60,7 @@ open class ItemUomService( m18LastModifyDate = request.m18LastModifyDate ratioD = request.ratioD ratioN = request.ratioN + deleted = request.deleted } val savedItemUom = itemUomRespository.saveAndFlush(itemUom) diff --git a/src/main/java/com/ffii/fpsms/modules/master/web/models/ItemUomRequest.kt b/src/main/java/com/ffii/fpsms/modules/master/web/models/ItemUomRequest.kt index 0d094f8..414fe7b 100644 --- a/src/main/java/com/ffii/fpsms/modules/master/web/models/ItemUomRequest.kt +++ b/src/main/java/com/ffii/fpsms/modules/master/web/models/ItemUomRequest.kt @@ -26,4 +26,5 @@ data class ItemUomRequest( val m18LastModifyDate: LocalDateTime?, val ratioD: BigDecimal?, val ratioN: BigDecimal?, + val deleted: Boolean?, ) \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/InventoryInfo.kt b/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/InventoryInfo.kt index f0a0d19..caf6c82 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/InventoryInfo.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/InventoryInfo.kt @@ -11,11 +11,11 @@ interface InventoryInfo{ val name: String? @get:Value("#{target.item.type}") val type: String? - @get:Value("#{target.qty / (target.item.itemUoms.^[stockUnit == true]?.ratioN / target.item.itemUoms.^[stockUnit == true]?.ratioD)}") + @get:Value("#{target.qty / (target.item.itemUoms.^[stockUnit == true && deleted == false]?.ratioN / target.item.itemUoms.^[stockUnit == true && deleted == false]?.ratioD)}") val qty: BigDecimal? - @get:Value("#{target.item.itemUoms.^[stockUnit == true]?.uom.code}") + @get:Value("#{target.item.itemUoms.^[stockUnit == true && deleted == false]?.uom.code}") val uomCode: String? - @get:Value("#{target.item.itemUoms.^[stockUnit == true]?.uom.udfudesc}") + @get:Value("#{target.item.itemUoms.^[stockUnit == true && deleted == false]?.uom.udfudesc}") val uomUdfudesc: String? // @get:Value("#{target.qty * target.uom.gramPerSmallestUnit}") // val germPerSmallestUnit: BigDecimal?