Merge pull request '1012 - 2차대리점 로그인 메인화면에 물건3개 노출. 시공사 버그' (#16) from feature/cha into dev

Reviewed-on: #16

src/main/java/com/interplug/qcast/biz/estimate/EstimateController.java

@@ -96,4 +96,11 @@ public class EstimateController {
       throws Exception {
     estimateService.excelDownload(request, response, estimateRequest);
   }
+
+  @Operation(description = "2차점 특가 있는 2nd Agency 목록을 조회한다.")
+  @GetMapping("/agency-cust-list")
+  @ResponseStatus(HttpStatus.OK)
+  public EstimateApiResponse selectAgencyCustList(PriceRequest priceRequest) throws Exception {
+    return estimateService.selectAgencyCustList(priceRequest);
+  }
 }

src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java

@@ -1409,6 +1409,12 @@ public class EstimateService {
           itemResponse.setSalePrice("");
           itemResponse.setSaleTotPrice("");
         }
+
+        // 886 Excel, PDF에 OPEN_FLG = 1은 단가필드에 OPEN 텍스트로 보여주도록
+        if ("1".equals(itemResponse.getOpenFlg())) {
+          itemResponse.setSalePrice("OPEN");
+          itemResponse.setSaleTotPrice("OPEN");
+        }
       }
 
       // 합산 문자열 통화로 변환 처리
@@ -1724,6 +1730,8 @@ public class EstimateService {
 
         quoteList.add(estimateSendResponse);
         estimateSendRequest.setQuoteList(quoteList);
+        // 2차점명
+        estimateSendResponse.setSecSapSalesStoreCd(estimateRequest.getSecSapSalesStoreCd());
       }
 
       EstimateApiResponse response = null;
@@ -2246,4 +2254,35 @@ public class EstimateService {
 
     return circuitCfg;
   }
+
+  public EstimateApiResponse selectAgencyCustList(PriceRequest priceRequest) throws Exception {
+    // Validation
+
+    if (StringUtils.isEmpty(priceRequest.getSapSalesStoreCd())) {
+      throw new QcastException(ErrorCode.INVALID_INPUT_VALUE,
+          message.getMessage("common.message.required.data", "Sap Sale Store Code"));
+    }
+
+
+    EstimateApiResponse response = null;
+    /* [1]. QSP API (url + param) Setting */
+    String url = QSP_API_URL + "/api/master/agencyCustList";
+    String apiUrl = UriComponentsBuilder.fromHttpUrl(url)
+        .queryParam("sapSalesStoreCd", priceRequest.getSapSalesStoreCd()).build().toUriString();
+
+    /* [2]. QSP API CALL -> Response */
+    String strResponse = interfaceQsp.callApi(HttpMethod.GET, apiUrl, null);
+
+    if (!"".equals(strResponse)) {
+      com.fasterxml.jackson.databind.ObjectMapper om =
+          new com.fasterxml.jackson.databind.ObjectMapper()
+              .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+      response = om.readValue(strResponse, EstimateApiResponse.class);
+    } else {
+      // [msg] No data
+      throw new QcastException(ErrorCode.NOT_FOUND, message.getMessage("common.message.no.data"));
+    }
+
+    return response;
+  }
 }

src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java

@@ -212,4 +212,8 @@ public class EstimateRequest {
 
   @Schema(description = "발전시뮬레이션 타입")
   private String pwrGnrSimType;
+
+  @Schema(description = "2차 SAP 판매점코드")
+  private String secSapSalesStoreCd;
+
 }

src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java

@@ -279,4 +279,7 @@ public class EstimateResponse {
 
   @Schema(description = "SAP STORE CD")
   private String sapSalesStoreCd;
+
+  @Schema(description = "2차 SAP 판매점코드")
+  private String secSapSalesStoreCd;
 }

src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateSendResponse.java

@@ -115,4 +115,7 @@ public class EstimateSendResponse {
 
   @Schema(description = "첨부파일 목록")
   List<FileResponse> fileList;
+
+  @Schema(description = "2차 SAP 판매점코드")
+  private String secSapSalesStoreCd;
 }

src/main/java/com/interplug/qcast/biz/estimate/dto/ItemRequest.java

@@ -106,4 +106,7 @@ public class ItemRequest {
 
   @Schema(description = "사용자아이디")
   private String userId;
+
+  @Schema(description = "아이템 타입 코드")
+  public String itemTpCd;
 }

src/main/java/com/interplug/qcast/biz/estimate/dto/ItemResponse.java

@@ -85,4 +85,7 @@ public class ItemResponse {
 
   @Schema(description = "회로구성도")
   private String circuitCfg;
+
+  @Schema(description = "아이템 타입 코드")
+  public String itemTpCd;
 }

src/main/java/com/interplug/qcast/biz/estimate/dto/PriceRequest.java

@@ -23,4 +23,7 @@ public class PriceRequest {
 
   @Schema(description = "아이템번호 목록")
   private List<PriceItemRequest> itemIdList;
+
+  @Schema(description = "2차 SAP 판매점코드")
+  private String secSapSalesStoreCd;
 }

src/main/java/com/interplug/qcast/biz/login/dto/UserResponse.java

@@ -25,4 +25,6 @@ public class UserResponse {
   private String storeLvl; // Store Level
   private String groupId; // groupId
   private String custCd; // custCd
+  //시공사 번호
+  private String builderNo;
 }

src/main/java/com/interplug/qcast/biz/mainPage/MainPageController.java

@@ -21,9 +21,9 @@ public class MainPageController {
   private final ObjectService objectService;
 
   @Operation(description = "메인 물건정보 목록을 조회한다.")
-  @GetMapping("/object/{saleStoreId}/list")
+  @GetMapping("/object/{saleStoreId}/{userId}/{builderNo}/list")
   @ResponseStatus(HttpStatus.OK)
-  public MainPageResponse selectObjectList(@PathVariable String saleStoreId) throws Exception {
+  public MainPageResponse selectObjectList(@PathVariable String saleStoreId, @PathVariable String userId, @PathVariable String builderNo) throws Exception {
     MainPageResponse mainPageResponse = new MainPageResponse();
 
     // 판매점명 조회
@@ -39,6 +39,11 @@ public class MainPageController {
     // 물건정보 목록 조회
     ObjectRequest objectRequest = new ObjectRequest();
     objectRequest.setSaleStoreId(saleStoreId);
+    objectRequest.setUserId(userId);
+    if(builderNo != null && !"null".equals(builderNo))  {
+      objectRequest.setBuilderNo(builderNo);
+    }
+
 
     List<ObjectResponse> objectList = objectService.selectObjectMainList(objectRequest);
     mainPageResponse.setObjectList(objectList);

src/main/java/com/interplug/qcast/biz/master/MasterController.java

@@ -23,6 +23,7 @@ import com.interplug.qcast.config.Exception.QcastException;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -43,13 +44,15 @@ public class MasterController {
 
   @Operation(description = "지붕재 목록을 조회한다.")
   @GetMapping("/getRoofMaterialList")
-  public ApiResponse<List<ApiRoofMaterialResponse>> getRoofMaterialList() {
+  public ApiResponse<List<ApiRoofMaterialResponse>> getRoofMaterialList(
-    return masterService.getRoofMaterialList();
+      HttpServletRequest request) {
+    return masterService.getRoofMaterialList(request.getHeader("Referer"));
   }
 
   @Operation(description = "모듈 타입별 아이템 목록을 조회한다.")
   @GetMapping("/getModuleTypeItemList")
   public ApiResponse<List<ApiModuleTpResponse>> getModuleTypeItemList(
+      HttpServletRequest request,
       @Parameter(description = "지붕재 코드 목록") @RequestParam("arrRoofMatlCd")
           List<String> roofMaterialCd)
       throws QcastException {
@@ -59,12 +62,13 @@ public class MasterController {
         || roofMaterialCd.stream().anyMatch(s -> s == null || s.trim().isEmpty())) {
       throw new QcastException(ErrorCode.INVALID_INPUT_VALUE);
     }
-    return masterService.getModuleTypeItemList(roofMaterialCd);
+    return masterService.getModuleTypeItemList(request.getHeader("Referer"), roofMaterialCd);
   }
 
   @Operation(description = "가대 목록 조회한다.")
   @GetMapping("/getTrestleList")
   public ApiResponse<List<ApiTrestleResponse>> getTrestleList(
+      HttpServletRequest request,
       @Parameter(description = "모듈타입코드") @RequestParam(required = false) String moduleTpCd,
       @Parameter(description = "지붕재코드") @RequestParam(required = false) String roofMatlCd,
       @Parameter(description = "서까래기초코드") @RequestParam(required = false) String raftBaseCd,
@@ -85,6 +89,7 @@ public class MasterController {
             .setRoofBaseCd(roofBaseCd)
             .build();
     return masterService.getTrestleList(
+        request.getHeader("Referer"),
         atb.getModuleTpCd(),
         atb.getRoofMatlCd(),
         atb.getRaftBaseCd(),
@@ -96,6 +101,7 @@ public class MasterController {
   @Operation(description = "시공법 목록 조회한다.")
   @GetMapping("/getConstructionList")
   public ApiResponse<List<ApiConstructionResponse>> getConstructionList(
+      HttpServletRequest request,
       @Parameter(description = "모듈타입코드") @RequestParam String moduleTpCd,
       @Parameter(description = "지붕재코드") @RequestParam String roofMatlCd,
       @Parameter(description = "가대메이커코드") @RequestParam String trestleMkrCd,
@@ -164,6 +170,7 @@ public class MasterController {
             .build();
 
     return masterService.getConstructionList(
+        request.getHeader("Referer"),
         acb.getModuleTpCd(),
         acb.getRoofMatlCd(),
         acb.getTrestleMkrCd(),
@@ -181,12 +188,13 @@ public class MasterController {
   @Operation(description = "가대 상세 조회한다.")
   @PostMapping("/getTrestleDetailList")
   public ArrayList<ApiResponse<ApiTrestleDetailResponse>> getTrestleDetailList(
-      @RequestBody List<ApiTrestleDetailRequest> reqList) {
+      HttpServletRequest request, @RequestBody List<ApiTrestleDetailRequest> reqList) {
     ArrayList<ApiResponse<ApiTrestleDetailResponse>> results = new ArrayList<>();
     for (ApiTrestleDetailRequest req : reqList) {
 
       ApiResponse<ApiTrestleDetailResponse> response =
           masterService.getTrestleDetailList(
+              request.getHeader("Referer"),
               req.getModuleTpCd(),
               req.getRoofMatlCd(),
               req.getTrestleMkrCd(),
@@ -218,57 +226,67 @@ public class MasterController {
   @Operation(description = "PCS 메이커, 시리즈 조회한다.")
   @GetMapping("/pcsMakerList")
   public ApiResponse<List<ApiPcsMakerResponse>> getPcsMakerList(
+      HttpServletRequest request,
       @Parameter(description = "PCS 메이커 코드") @RequestParam(required = false) String pcsMkrCd,
       @Parameter(description = "혼합모듈번호") @RequestParam(required = false) String mixMatlNo) {
-    return masterService.getPcsMakerList(pcsMkrCd, mixMatlNo);
+    return masterService.getPcsMakerList(request.getHeader("Referer"), pcsMkrCd, mixMatlNo);
   }
 
   @Operation(description = "PCS 시리즈 아이템 목록을 조회한다.")
   @PostMapping("/getPcsSeriesItemList")
   public ApiResponse<List<ApiPcsSeriesItemResponse>> getPcsSeriesItemList(
-      @RequestBody ApiPcsSeriesItemRequest pcsSeriesItemListRequest) {
+      HttpServletRequest request, @RequestBody ApiPcsSeriesItemRequest pcsSeriesItemListRequest) {
-    return masterService.getPcsSeriesItemList(pcsSeriesItemListRequest);
+    return masterService.getPcsSeriesItemList(
+        request.getHeader("Referer"), pcsSeriesItemListRequest);
   }
 
   @Operation(description = "시리즈 중 자동으로 추천 PCS 정보를 조회한다.")
   @PostMapping("/getPcsAutoRecommendList")
   public ApiResponse<ApiPcsAutoRecommendResponse> getPcsAutoRecommendList(
-      @RequestBody ApiPcsInfoRequest autoRecommendRequest) {
+      HttpServletRequest request, @RequestBody ApiPcsInfoRequest autoRecommendRequest) {
-    return masterService.getPcsAutoRecommendList(autoRecommendRequest);
+    return masterService.getPcsAutoRecommendList(
+        request.getHeader("Referer"), autoRecommendRequest);
   }
 
   @Operation(description = "배치된 모듈을 선택한 PCS로 회로 구성 가능 여부 체크한다.")
   @PostMapping("/getPcsVoltageChk")
-  public ApiResultResponse getPcsVoltageChk(@RequestBody ApiPcsInfoRequest pcsVoltageChkRequest) {
+  public ApiResultResponse getPcsVoltageChk(
-    return masterService.getPcsVoltageChk(pcsVoltageChkRequest).getResult();
+      HttpServletRequest request, @RequestBody ApiPcsInfoRequest pcsVoltageChkRequest) {
+    return masterService
+        .getPcsVoltageChk(request.getHeader("Referer"), pcsVoltageChkRequest)
+        .getResult();
   }
 
   @Operation(description = "PCS 승압설정 정보를 조회한다.")
   @PostMapping("/getPcsVoltageStepUpList")
   public ApiResponse<ApiPcsVoltageStepUpResponse> getPcsVoltageStepUpList(
-      @RequestBody ApiPcsInfoRequest pcsVoltageStepUpRequest) {
+      HttpServletRequest request, @RequestBody ApiPcsInfoRequest pcsVoltageStepUpRequest) {
-    return masterService.getPcsVoltageStepUpList(pcsVoltageStepUpRequest);
+    return masterService.getPcsVoltageStepUpList(
+        request.getHeader("Referer"), pcsVoltageStepUpRequest);
   }
 
   @Operation(description = "PCS 수동회로 확정 체크한다.")
   @PostMapping("/getPcsMenualConfChk")
   public ApiResultResponse getPcsMenualConfChk(
-      @RequestBody ApiPcsMenualConfRequest pcsMenualConfChkRequest) {
+      HttpServletRequest request, @RequestBody ApiPcsMenualConfRequest pcsMenualConfChkRequest) {
-    return masterService.getPcsMenualConfChk(pcsMenualConfChkRequest).getResult();
+    return masterService
+        .getPcsMenualConfChk(request.getHeader("Referer"), pcsMenualConfChkRequest)
+        .getResult();
   }
 
   @Operation(description = "PCS 접속함 및 옵션 목록을 조회한다.")
   @PostMapping("/getPcsConnOptionItemList")
   public ApiResponse<ApiPcsConnOptionResponse> getPcsConnOptionItemList(
-      @RequestBody ApiPcsConnOptionRequest pcsConnOptionRequest) {
+      HttpServletRequest request, @RequestBody ApiPcsConnOptionRequest pcsConnOptionRequest) {
-    return masterService.getPcsConnOptionItemList(pcsConnOptionRequest);
+    return masterService.getPcsConnOptionItemList(
+        request.getHeader("Referer"), pcsConnOptionRequest);
   }
 
   /** remote api group : quotation */
   @Operation(description = "견적서 아이템을 조회한다.")
   @PostMapping("/getQuotationItem")
   public ApiResponse<List<ApiQuotationItemResponse>> getQuotationItem(
-      @RequestBody ApiQuotationItemRequest quotationItemRequest) {
+      HttpServletRequest request, @RequestBody ApiQuotationItemRequest quotationItemRequest) {
-    return quotationService.getQuotationItem(quotationItemRequest);
+    return quotationService.getQuotationItem(request.getHeader("Referer"), quotationItemRequest);
   }
 }

src/main/java/com/interplug/qcast/biz/master/MasterService.java

@@ -21,6 +21,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
 // @FeignClient(name = "master", url = "${feign.master.url}")
@@ -29,16 +30,19 @@ public interface MasterService {
 
   // 지붕재 목록 조회
   @GetMapping("/roofMaterialList")
-  public ApiResponse<List<ApiRoofMaterialResponse>> getRoofMaterialList();
+  public ApiResponse<List<ApiRoofMaterialResponse>> getRoofMaterialList(
+      @RequestHeader("Referer") String referer);
 
   // 모듈 타입별 아이템 목록 조회
   @GetMapping("/moduleTypeItemList")
   public ApiResponse<List<ApiModuleTpResponse>> getModuleTypeItemList(
+      @RequestHeader("Referer") String referer,
       @RequestParam("arrRoofMatlCd") List<String> roofMaterialCd);
 
   // 가대 목록 조회
   @GetMapping("/trestle")
   public ApiResponse<List<ApiTrestleResponse>> getTrestleList(
+      @RequestHeader("Referer") String referer,
       @RequestParam(required = false) String moduleTpCd,
       @RequestParam(required = false) String roofMatlCd,
       @RequestParam(required = false) String raftBaseCd,
@@ -49,6 +53,7 @@ public interface MasterService {
   // 시공법 목록 조회
   @GetMapping("/construction")
   public ApiResponse<List<ApiConstructionResponse>> getConstructionList(
+      @RequestHeader("Referer") String referer,
       @RequestParam String moduleTpCd,
       @RequestParam String roofMatlCd,
       @RequestParam String trestleMkrCd,
@@ -65,6 +70,7 @@ public interface MasterService {
   // 가대 상세 조회
   @GetMapping(value = "/trestle/detail", consumes = "application/json")
   public ApiResponse<ApiTrestleDetailResponse> getTrestleDetailList(
+      @RequestHeader("Referer") String referer,
       @RequestParam String moduleTpCd,
       @RequestParam String roofMatlCd,
       @RequestParam String trestleMkrCd,
@@ -83,34 +89,37 @@ public interface MasterService {
   // PCS Maker, 시리즈 목록 조회
   @GetMapping("/pcsMakerList")
   public ApiResponse<List<ApiPcsMakerResponse>> getPcsMakerList(
+      @RequestHeader("Referer") String referer,
       @RequestParam(required = false) String pcsMkrCd,
       @RequestParam(required = false) String mixMatlNo);
 
   // PCS 시리즈 아이템 목록 조회
   @PostMapping("/pcsSeriesItemList")
   public ApiResponse<List<ApiPcsSeriesItemResponse>> getPcsSeriesItemList(
-      @RequestBody ApiPcsSeriesItemRequest req);
+      @RequestHeader("Referer") String referer, @RequestBody ApiPcsSeriesItemRequest req);
 
   // 시리즈 중 자동으로 추천 PCS 정보 조회
   @PostMapping("/pcsAutoRecommendList")
   public ApiResponse<ApiPcsAutoRecommendResponse> getPcsAutoRecommendList(
-      @RequestBody ApiPcsInfoRequest req);
+      @RequestHeader("Referer") String referer, @RequestBody ApiPcsInfoRequest req);
 
   // 배치된 모듈을 선택한 PCS로 회로 구성 가능 여부 체크
   @PostMapping("/pcsVoltageChk")
-  public ApiResponse<JsonNode> getPcsVoltageChk(@RequestBody ApiPcsInfoRequest req);
+  public ApiResponse<JsonNode> getPcsVoltageChk(
+      @RequestHeader("Referer") String referer, @RequestBody ApiPcsInfoRequest req);
 
   // PCS 승압설정 정보 조회
   @PostMapping("/pcsVoltageStepUpList")
   public ApiResponse<ApiPcsVoltageStepUpResponse> getPcsVoltageStepUpList(
-      @RequestBody ApiPcsInfoRequest req);
+      @RequestHeader("Referer") String referer, @RequestBody ApiPcsInfoRequest req);
 
   // PCS 수동회로 확정 체크
   @PostMapping("/pcsMenualConfChk")
-  public ApiResponse<JsonNode> getPcsMenualConfChk(@RequestBody ApiPcsMenualConfRequest req);
+  public ApiResponse<JsonNode> getPcsMenualConfChk(
+      @RequestHeader("Referer") String referer, @RequestBody ApiPcsMenualConfRequest req);
 
   // PCS 접속함 및 옵션 목록 조회
   @PostMapping("/pcsConnOptionItemList")
   public ApiResponse<ApiPcsConnOptionResponse> getPcsConnOptionItemList(
-      @RequestBody ApiPcsConnOptionRequest req);
+      @RequestHeader("Referer") String referer, @RequestBody ApiPcsConnOptionRequest req);
 }

src/main/java/com/interplug/qcast/biz/master/QuotationService.java

@@ -7,6 +7,7 @@ import java.util.List;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 @FeignClient(name = "quotation", url = "${qsp.url}/api/quotation")
 public interface QuotationService {
@@ -14,5 +15,5 @@ public interface QuotationService {
   // 견적서 아이템 조회
   @PostMapping("/item")
   public ApiResponse<List<ApiQuotationItemResponse>> getQuotationItem(
-      @RequestBody ApiQuotationItemRequest req);
+      @RequestHeader("Referer") String referer, @RequestBody ApiQuotationItemRequest req);
 }

src/main/java/com/interplug/qcast/biz/master/dto/moduletype/ApiModuleTpItemResponse.java

@@ -43,4 +43,7 @@ public class ApiModuleTpItemResponse {
 
   @Schema(description = "MIX배치 여부")
   private String mixAsgYn;
+
+  @Schema(description = "북면설치 여부")
+  private String northModuleYn;
 }

src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemRequest.java

@@ -1,8 +1,8 @@
 package com.interplug.qcast.biz.master.dto.quotation;
 
-import java.util.List;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
+import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -22,4 +22,7 @@ public class ApiQuotationItemRequest {
   @Schema(description = "PCS 목록")
   @NotNull
   public List<ApiQuotationItemPcsRequest> pcses;
+
+  @Schema(description = "양단 케이블 갯수")
+  public Integer dblCblTotCnt = 0;
 }

src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemResponse.java

@@ -14,4 +14,7 @@ public class ApiQuotationItemResponse {
 
   @Schema(description = "수량")
   public Integer amount;
+
+  @Schema(description = "아이템 타입 코드")
+  public String itemTpCd;
 }

src/main/java/com/interplug/qcast/biz/object/dto/ObjectRequest.java

@@ -170,4 +170,7 @@ public class ObjectRequest {
 
   @Schema(description = "종료 Row")
   private String endRow;
+
+  @Schema(description = "시공사 번호")
+  private String builderNo;
 }

src/main/java/com/interplug/qcast/util/InterfaceQsp.java

@@ -26,6 +26,9 @@ public class InterfaceQsp {
   @Value("${qsp.url}")
   private String qspUrl;
 
+  @Value("${front.url}")
+  private String frontUrl;
+
   /**
    * API Call
    *
@@ -63,6 +66,7 @@ public class InterfaceQsp {
       con.setReadTimeout(120000); // InputStream 읽어 오는 Timeout 시간 설정
       con.setRequestMethod(httpMethod.toString());
       con.setRequestProperty("Content-Type", "application/json");
+      con.setRequestProperty("Referer", frontUrl);
       con.setDoInput(true);
       con.setUseCaches(false);
       con.setDefaultUseCaches(false);
@@ -170,6 +174,7 @@ public class InterfaceQsp {
       con.setReadTimeout(30000); // InputStream 읽어 오는 Timeout 시간 설정
       con.setRequestMethod(httpMethod.toString());
       con.setRequestProperty("Content-Type", "application/json");
+      con.setRequestProperty("Referer", frontUrl);
       con.setDoInput(true);
       con.setUseCaches(false);
       con.setDefaultUseCaches(false);

src/main/resources/config/application-dev.yml

@@ -58,4 +58,7 @@ file:
   root.path: /home/development/public/files
   ini.root.path: /home/development/public/files/NewEstimate
   ini.base.filename: 料金シミュレーション.ini
-  ini.drawing.img.path: /home/development/public/files/NewEstimate/Drawing
+  ini.drawing.img.path: /home/development/public/files/NewEstimate/Drawing
+
+front:
+  url: http://1.248.227.176:3000

src/main/resources/config/application-local.yml

@@ -58,4 +58,7 @@ file:
   root.path: C:\\
   ini.root.path: C:\\NewEstimate
   ini.base.filename: 料金シミュレーション.ini
-  ini.drawing.img.path: C:\\NewEstimate\Drawing
+  ini.drawing.img.path: C:\\NewEstimate\Drawing
+
+front:
+  url: http://localhost:8080

src/main/resources/config/application-prd.yml

@@ -58,4 +58,7 @@ file:
   root.path: /home/production/public/files
   ini.root.path: /home/production/public/files/NewEstimate
   ini.base.filename: 料金シミュレーション.ini
-  ini.drawing.img.path: /home/production/public/files/NewEstimate/Drawing
+  ini.drawing.img.path: /home/production/public/files/NewEstimate/Drawing
+
+front:
+  url: https://hanasys.jp

src/main/resources/mappers/estimate/estimateMapper.xml

@@ -56,6 +56,7 @@
             , PI.SYNC_FLG
             , PI.CREATE_DATETIME
             , PI.CREATE_USER
+            , PI.SEC_SAP_SALES_STORE_CD
             , O.OBJECT_NAME
             , O.OBJECT_NAME_OMIT
             , O.REMARKS AS OBJECT_REMARKS
@@ -175,7 +176,7 @@
             , P.CONSTRUCT_SPECIFICATION
             , P.NORTH_ARRANGEMENT
             , PI.ESTIMATE_TYPE
-            , P.PKG_ASP
+            , PI.PKG_ASP
             , P.DEL_FLG
             , CONVERT(NVARCHAR(10), PI.CREATE_DATETIME, 121)  AS ESTIMATE_DETAIL_CREATE_DATE
             , P.LAST_EDIT_DATETIME
@@ -191,7 +192,7 @@
             ON O.OBJECT_NO = OI.OBJECT_NO
         INNER JOIN M_SALES_STORE SS WITH(NOLOCK)
             ON O.SALE_STORE_ID = SS.SALE_STORE_ID
-        WHERE P.SYNC_FLG = '0'
+        WHERE PI.SYNC_FLG = '0'
             AND OI.SOURCE_ORIGIN = 'QCAST_III'
             AND OI.ORG_DEL_FLG = '0'
     </select>
@@ -282,6 +283,7 @@
             , PEI.OPEN_FLG
             , PEI.ITEM_CHANGE_FLG
             , PEI.DISP_CABLE_FLG
+            , PEI.ITEM_TP_CD
             , I.PNOW_W
             , CASE WHEN I.POWER_COM_FLG = '1' THEN 'PC_'
                    WHEN I.ITEM_GROUP = 'PC_' AND I.POWER_COM_FLG = '0' THEN 'STORAGE_BATTERY'
@@ -679,6 +681,7 @@
         UPDATE T_PLAN_INFO
         SET
               ESTIMATE_TYPE = #{estimateType}
+            , SEC_SAP_SALES_STORE_CD = #{secSapSalesStoreCd}
             <choose>
                 <when test='drawingFlg != null and drawingFlg == "1"'>
                     , CONSTRUCT_SPECIFICATION_MULTI = #{constructSpecificationMulti}
@@ -731,6 +734,7 @@
             , PKG_ASP = NULL
             , PRICE_CD = #{priceCd}
             , TEMP_FLG = CASE WHEN TEMP_FLG = '0' THEN '0' ELSE #{tempFlg} END
+            , SEC_SAP_SALES_STORE_CD = #{secSapSalesStoreCd}
         WHERE OBJECT_NO = #{objectNo}
             AND PLAN_NO = #{planNo}
     </update>
@@ -835,6 +839,7 @@
             , OPEN_FLG
             , ITEM_CHANGE_FLG
             , DISP_CABLE_FLG
+            , ITEM_TP_CD
         ) VALUES (
               #{objectNo}
             , #{planNo}
@@ -853,6 +858,7 @@
             , #{openFlg}
             , #{itemChangeFlg}
             , #{dispCableFlg}
+            , #{itemTpCd}
         )
     </insert>
 
@@ -1167,6 +1173,7 @@
             , SYNC_FLG
             , CREATE_DATETIME
             , CREATE_USER
+            , SEC_SAP_SALES_STORE_CD
         )
         SELECT
               #{copyObjectNo} AS OBJECT_NO
@@ -1187,6 +1194,7 @@
             , '0' AS SYNC_FLG
             , GETDATE() AS CREATE_DATETIME
             , #{userId} AS CREATE_USER
+            , PI.SEC_SAP_SALES_STORE_CD
         FROM T_PLAN_INFO PI WITH (NOLOCK)
         WHERE PI.OBJECT_NO = #{objectNo}
             AND PI.PLAN_NO = #{planNo}

src/main/resources/mappers/object/objectMapper.xml

@@ -183,6 +183,9 @@
         FROM T_OBJECT O WITH (NOLOCK)
         INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
             ON O.OBJECT_NO = OI.OBJECT_NO
+        <if test='builderNo != null and builderNo != ""'>
+            AND OI.CREATE_USER = #{userId}
+        </if>
         INNER JOIN M_SALES_STORE S WITH (NOLOCK)
             ON O.SALE_STORE_ID = S.SALE_STORE_ID
         <if test='saleStoreId != null and saleStoreId != "T01"'>
@@ -274,6 +277,9 @@
             FROM T_OBJECT O WITH (NOLOCK)
             INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
                 ON O.OBJECT_NO = OI.OBJECT_NO
+            <if test='builderNo != null and builderNo != ""'>
+                AND OI.CREATE_USER = #{userId}
+            </if>
             INNER JOIN M_SALES_STORE S WITH (NOLOCK)
                 ON O.SALE_STORE_ID = S.SALE_STORE_ID
             <if test='(saleStoreId != null and saleStoreId != "T01") or (schSelSaleStoreId != null and schSelSaleStoreId != "")'>