Przeglądaj źródła

update

create_edit_user
MSI\derek 5 miesięcy temu
rodzic
commit
77562443be
4 zmienionych plików z 46 dodań i 5 usunięć
  1. +2
    -0
      src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt
  2. +4
    -4
      src/main/java/com/ffii/fpsms/modules/master/web/ItemsController.kt
  3. +0
    -1
      src/main/resources/db/changelog/changes/20250310_01_cyril/01_qc_item.sql
  4. +40
    -0
      src/main/resources/db/changelog/changes/20250320_01_derek/01_qc_check.sql

+ 2
- 0
src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt Wyświetl plik

@@ -9,6 +9,7 @@ import com.ffii.fpsms.modules.master.web.models.MessageResponse
import com.ffii.fpsms.modules.master.web.models.NewItemRequest
import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional
import java.io.IOException
import kotlin.jvm.optionals.getOrNull

@Service
@@ -26,6 +27,7 @@ open class ItemsService(
open fun getItem(id: Long): Items? {
return itemsRepository.findById(id).getOrNull()
}
@Throws(IOException::class)
@Transactional
open fun saveItem(request: NewItemRequest): MessageResponse {
val type = itemTypeRepository.findById(request.typeId).get()


+ 4
- 4
src/main/java/com/ffii/fpsms/modules/master/web/ItemsController.kt Wyświetl plik

@@ -11,18 +11,18 @@ import org.springframework.web.bind.annotation.*
@RestController
@RequestMapping("/items")
class ItemsController(
private val materialService: ItemsService
private val itemsService: ItemsService
) {
@GetMapping
fun allItems(): List<Items> {
return materialService.allItems()
return itemsService.allItems()
}
@GetMapping("/details/{id}")
fun getItems(@PathVariable id: Long): Items {
return materialService.getItem(id) ?: throw NotFoundException()
return itemsService.getItem(id) ?: throw NotFoundException()
}
@PostMapping("/new")
fun saveItem(@Valid @RequestBody newItem: NewItemRequest): MessageResponse {
return materialService.saveItem(newItem)
return itemsService.saveItem(newItem)
}
}

+ 0
- 1
src/main/resources/db/changelog/changes/20250310_01_cyril/01_qc_item.sql Wyświetl plik

@@ -13,6 +13,5 @@ CREATE TABLE `qc_item`
`code` VARCHAR(30) NOT NULL,
`name` VARCHAR(30) NOT NULL,
`description` VARCHAR(100) NULL,
`systemInput` TINYINT(1) NOT NULL,
PRIMARY KEY (`id`)
);

+ 40
- 0
src/main/resources/db/changelog/changes/20250320_01_derek/01_qc_check.sql Wyświetl plik

@@ -0,0 +1,40 @@
--liquibase formatted sql

--changeset derek:qc check
CREATE TABLE `qc_check` (
`id` INT NOT NULL AUTO_INCREMENT,
`created` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
`createdBy` VARCHAR(30) NULL DEFAULT NULL,
`version` INT NOT NULL DEFAULT '0',
`modified` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
`modifiedBy` VARCHAR(30) NULL DEFAULT NULL,
`deleted` TINYINT(1) NOT NULL DEFAULT '0',
`qcItemId` INT(1) NOT NULL,
`isRange` TINYINT(1) NOT NULL DEFAULT '0',
`description` VARCHAR(100) NULL,
`systemInput` TINYINT(1) NOT NULL DEFAULT '0',
`lowerLimit` DECIMAL(16,2) NULL,
`upperLimit` DECIMAL(16,2) NULL,
`itemId` INT NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT fk_check_qc_items FOREIGN KEY (`qcItemId`) REFERENCES `qc_item` (`id`),
CONSTRAINT fk_check_items FOREIGN KEY (`itemId`) REFERENCES `items` (`id`)
);

CREATE TABLE `qc_result` (
`id` INT NOT NULL AUTO_INCREMENT,
`created` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
`createdBy` VARCHAR(30) NULL DEFAULT NULL,
`version` INT NOT NULL DEFAULT '0',
`modified` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
`modifiedBy` VARCHAR(30) NULL DEFAULT NULL,
`deleted` TINYINT(1) NOT NULL DEFAULT '0',
itemId INT NOT NULL,
qcCheckId INT NOT NULL,
`recordDate` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
`result_value` DECIMAL(16,2) NULL,
`result_bool` TINYINT(1) NULL,
`inspectorId` INT NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT fk_qc_check FOREIGN KEY (`qcCheckId`) REFERENCES `qc_check` (`id`)
);

Ładowanie…
Anuluj
Zapisz