Merge pull request 'dev' (#281) from dev into dev-deploy

Reviewed-on: #281
This commit is contained in:
ysCha 2025-12-30 14:30:48 +09:00
commit fcd47662cb
3 changed files with 10 additions and 3 deletions

View File

@ -231,8 +231,10 @@ public class MasterController {
HttpServletRequest request,
@Parameter(description = "PCS 메이커 코드") @RequestParam(required = false) String pcsMkrCd,
@Parameter(description = "혼합모듈번호") @RequestParam(required = false) String mixMatlNo,
@Parameter(description = "모듈코드") @RequestParam(required = false) String moduleMatlCds) {
return masterService.getPcsMakerList(request.getHeader("Referer"), pcsMkrCd, mixMatlNo, moduleMatlCds);
@Parameter(description = "모듈코드") @RequestParam(required = false) String moduleMatlCds,
@Parameter(description = "1.2차점") @RequestParam(required = false) String storeId
) {
return masterService.getPcsMakerList(request.getHeader("Referer"), pcsMkrCd, mixMatlNo, moduleMatlCds, storeId);
}
@Operation(description = "PCS 시리즈 아이템 목록을 조회한다.")

View File

@ -93,7 +93,9 @@ public interface MasterService {
@RequestHeader("Referer") String referer,
@RequestParam(required = false) String pcsMkrCd,
@RequestParam(required = false) String mixMatlNo,
@RequestParam(required = false) String moduleMatlCds);
@RequestParam(required = false) String moduleMatlCds,
@RequestParam(required = false) String storeId
);
// PCS 시리즈 아이템 목록 조회
@PostMapping("/pcsSeriesItemList")

View File

@ -32,4 +32,7 @@ public class ApiPcsMakerResponse {
@Schema(description = "PCS시리즈 병설 여부")
private String pcsSerParallelYn;
@Schema(description = "1,2차점")
private String storeId;
}