diff --git a/src/main/java/com/ffii/fpsms/config/security/SecurityConfig.java b/src/main/java/com/ffii/fpsms/config/security/SecurityConfig.java index 9a8b0e8..5ce0bc9 100644 --- a/src/main/java/com/ffii/fpsms/config/security/SecurityConfig.java +++ b/src/main/java/com/ffii/fpsms/config/security/SecurityConfig.java @@ -74,6 +74,7 @@ public class SecurityConfig { return new BCryptPasswordEncoder(); } + /** FP-MTMS Version Checklist | Functions Ref. No. 51 | v1.0.0 | 2026-08-05 */ @Bean @Order(1) public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { @@ -117,6 +118,12 @@ public class SecurityConfig { .hasAuthority("ITEM_TRACING") .requestMatchers(HttpMethod.GET, "/inventoryLotLine/trace/location/**") .hasAuthority("ITEM_TRACING") + /* 工單 生產流程 完成工單 */ + .requestMatchers(HttpMethod.POST, "/product-process/Demo/ProcessLine/complete/**") + .hasAuthority("PRODUCT_PROCESS") + /* 工序「已完成」(Just Pass):僅 ADMIN */ + .requestMatchers(HttpMethod.POST, "/product-process/Demo/ProcessLine/pass/**") + .hasAuthority("ADMIN") .anyRequest().authenticated()) .httpBasic(httpBasic -> httpBasic.authenticationEntryPoint( (request, response, authException) -> sendUnauthorizedJson(response, "Unauthorized", "UNAUTHORIZED"))) diff --git a/src/main/java/com/ffii/fpsms/modules/report/service/DoUserPickAuditReportService.kt b/src/main/java/com/ffii/fpsms/modules/report/service/DoUserPickAuditReportService.kt index 91516f9..d469358 100644 --- a/src/main/java/com/ffii/fpsms/modules/report/service/DoUserPickAuditReportService.kt +++ b/src/main/java/com/ffii/fpsms/modules/report/service/DoUserPickAuditReportService.kt @@ -8,7 +8,7 @@ class DoUserPickAuditReportService( private val jdbcDao: JdbcDao, ) { /** - * FP-MTMS Version Checklist | Functions Ref. No. 39 | v1.0.1 | 2026-08-05 + * FP-MTMS Version Checklist | Functions Ref. No. 39 | v1.0.2 | 2026-08-05 * DO workbench user-audit rows (Just issue only). * issueTypes may combine: 跳過提料(使用「已完成」)+多提+少提+擅自換批/揀錯批. * 少提/多提 use POL-level SUM(stock_out_line.qty) vs pol.qty (multi-lot split OK if total matches). @@ -183,7 +183,7 @@ class DoUserPickAuditReportService( return jdbcDao.queryForList(sql, args) as List> } - /** FP-MTMS Version Checklist | Functions Ref. No. 39 | v1.0.1 | 2026-08-05 */ + /** FP-MTMS Version Checklist | Functions Ref. No. 39 | v1.0.2 | 2026-08-05 */ fun getDistinctHandlers(): List { val sql = """ SELECT DISTINCT TRIM(COALESCE(u.name, dop.handlerName, '')) AS handler diff --git a/src/main/java/com/ffii/fpsms/modules/report/web/DoUserPickAuditReportController.kt b/src/main/java/com/ffii/fpsms/modules/report/web/DoUserPickAuditReportController.kt index 5fa8ecb..01ca7f0 100644 --- a/src/main/java/com/ffii/fpsms/modules/report/web/DoUserPickAuditReportController.kt +++ b/src/main/java/com/ffii/fpsms/modules/report/web/DoUserPickAuditReportController.kt @@ -23,11 +23,11 @@ import java.io.ByteArrayOutputStream class DoUserPickAuditReportController( private val doUserPickAuditReportService: DoUserPickAuditReportService, ) { - /** FP-MTMS Version Checklist | Functions Ref. No. 39 | v1.0.1 | 2026-08-05 */ + /** FP-MTMS Version Checklist | Functions Ref. No. 39 | v1.0.2 | 2026-08-05 */ @GetMapping("/do-user-pick-audit-handlers") fun handlers(): List = doUserPickAuditReportService.getDistinctHandlers() - /** FP-MTMS Version Checklist | Functions Ref. No. 39 | v1.0.1 | 2026-08-05 */ + /** FP-MTMS Version Checklist | Functions Ref. No. 39 | v1.0.2 | 2026-08-05 */ @GetMapping("/print-do-user-pick-audit-excel") fun exportExcel( @RequestParam(required = false) dateStart: String?, @@ -52,8 +52,8 @@ class DoUserPickAuditReportController( contentType = MediaType.parseMediaType( "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", ) - setContentDispositionFormData("attachment", "DoUserPickAudit.xlsx") - set("filename", "DoUserPickAudit.xlsx") + setContentDispositionFormData("attachment", "成品出倉揀貨合規報告.xlsx") + set("filename", "成品出倉揀貨合規報告.xlsx") } return ResponseEntity(bytes, headers, HttpStatus.OK) } diff --git a/src/main/java/com/ffii/fpsms/modules/user/service/GroupService.java b/src/main/java/com/ffii/fpsms/modules/user/service/GroupService.java index 79a4f5c..d78acaf 100644 --- a/src/main/java/com/ffii/fpsms/modules/user/service/GroupService.java +++ b/src/main/java/com/ffii/fpsms/modules/user/service/GroupService.java @@ -187,6 +187,7 @@ public class GroupService extends AbstractBaseEntityService> listAuth(Map args) { @@ -200,7 +201,11 @@ public class GroupService extends AbstractBaseEntityService