단가 팝업 및 구매요청현황 에서 삭제기능 추가

src/main/java/com/oqpo/api/mapper/pomng/PchReqMapper.java

@@ -91,4 +91,7 @@ public interface PchReqMapper {
 
     int selectCancelPchReqAmt(@Param("pchPodrUnqNo") String pchPodrUnqNo, List<PchOdrDtlPtclEntity> gridUpdateData)throws Exception;
 
+
+    int updateOrdPchReqDelete(@Param("brandId") String brandId, @Param("pchReqUnqNo") String pchReqUnqNo, @Param("userId") String userId )throws Exception;
+
 }

src/main/java/com/oqpo/api/mapper/stinfo/ItemUnitMapper.java

@@ -75,5 +75,7 @@ public interface ItemUnitMapper {
     List<ItemUnitEntity> selectPopItemStoreUnitBaseGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId,  @Param("sItemNm") String sItemNm, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, GridRequest gridRequest)throws Exception;
     int selectPopItemStoreUnitBaseGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId, @Param("sItemNm") String sItemNm, @Param("sPodrPssblDvsn") String sPodrPssblDvsn)throws Exception;
 
+    List<ItemUnitEntity> selectPopContItemBrandUnitGridList(@Param("sBrandId") String sBrandId, @Param("sItemNm") String sItemNm, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, @Param("contYn") String contYn, GridRequest gridRequest)throws Exception;
+    int selectPopContItemBrandUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sItemNm") String sItemNm, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, @Param("contYn") String contYn)throws Exception;
 
 }

src/main/java/com/oqpo/api/service/pomng/PchReqService.java

@@ -8,7 +8,6 @@ import com.oqpo.api.entity.pomng.PchReqDtlPtclEntity;
 import com.oqpo.api.entity.pomng.PchWishListEntity;
 import com.oqpo.api.entity.pomng.PchWishListItemEntity;
 import com.oqpo.api.entity.pomng.WishListItemEntity;
-import com.oqpo.api.entity.rtnmng.RtnReqDtlPtclEntity;
 import com.oqpo.api.entity.stinfo.BrandEntity;
 import com.oqpo.api.entity.stockmng.WhsMgntBaseInfoEntity;
 import com.oqpo.api.enums.SystemMessageCode;
@@ -682,6 +681,29 @@ public class PchReqService extends CommonService {
     }
 
 
-    
+    /* 구매요청 임시저장 삭제 */
+    @Transactional
+    public void delPchReqInfo(String userId, String brandId, String pchReqUnqNo) throws Exception {
+        try {
+
+            // 임시저장 여부 확인
+            String jobProcYn = pchReqMapper.selectPchReqStatProcYn(brandId, pchReqUnqNo);
+
+            // N일경우 이미 임시저장 상태가 아님을 알림
+            if ("N".toString().equals(jobProcYn)) {
+                throw new GlobalException(SystemMessageCode.ERR_PCH_JOB_FAIL);
+            }
+
+            pchReqMapper.updateOrdPchReqDelete(brandId, pchReqUnqNo, userId);
+
+
+        } catch (GlobalException e) {
+            e.getStackTrace();
+            throw new GlobalException(e.getSystemMessageCode());
+        } catch (Exception e) {
+            e.getStackTrace();
+            throw new RuntimeException();
+        }
+    }
 
 }

src/main/java/com/oqpo/api/service/stinfo/ItemService.java

@@ -931,4 +931,51 @@ public class ItemService extends CommonService {
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
+
+
+    /*
+      팝업 품목 리스트 조회
+     */
+    public GridResponse selectPopItemContGridList(String sBrandId, String sStoreId, String sPodrPssblDvsn, String sItemNm, String contYn,
+                                                  GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        int gridRecords = 0;
+        int gridTotal = 0;
+        List<ItemUnitEntity> entities = new ArrayList<ItemUnitEntity>();
+
+        //if (StringUtil.isEmpty(sStoreId)) {
+        //    gridRecords = itemUnitMapper.selectPopItemBrandBaseUnitGridCnt(sBrandId, sItemNm, sPodrPssblDvsn);
+       //     gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        //    entities = itemUnitMapper.selectPopItemBrandBaseUnitGridList(sBrandId, sItemNm, sPodrPssblDvsn, gridRequest);
+       // } else {
+            gridRecords = itemUnitMapper.selectPopContItemBrandUnitGridCnt(sBrandId,  sItemNm, sPodrPssblDvsn, contYn.toString());
+            gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+            entities = itemUnitMapper.selectPopContItemBrandUnitGridList(sBrandId,  sItemNm, sPodrPssblDvsn,contYn.toString(),  gridRequest);
+       // }
+
+        List<Object> gridRows = entities.stream()
+                .map(m -> ItemPopSearchResponse.builder()
+                        .viewCd("R")
+                        .itemId(m.getItemId())
+                        .itemNm(m.getItemNm())
+                        .podrPssblDvsn(m.getPodrPssblDvsn())
+                        .podrPssblDvsnNm(m.getPodrPssblDvsnNm())
+                        .unit(m.getUnit())
+                        .unitNm(m.getUnitNm())
+                        .unitAmt(m.getUnitAmt())
+                        .stddQty(m.getStddQty())
+                        .unitGubun(m.getUnitGubun())
+                        .spplyId(m.getSpplyId())
+                        .spplyNm(m.getSpplyNm())
+                        .brandUnitUnqNo(m.getBrandUnitUnqNo())
+                        .storeUnitUnqNo(m.getStoreUnitUnqNo() == null ? "" : m.getStoreUnitUnqNo())
+                        .whsPassQty(m.getWhsPassQty() == null ? 0 : m.getWhsPassQty())
+                        .storeDeliType(m.getStoreDeliType() == null ? "" : m.getStoreDeliType())
+                        .storeDeliTypeNm(m.getStoreDeliTypeNm() == null ? "" : m.getStoreDeliTypeNm())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
 }

src/main/java/com/oqpo/api/web/controller/pomng/PchReqController.java

@@ -282,8 +282,27 @@ public class PchReqController {
         return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
     }
 
-    
 
+    /**
+     * 설명 : 구매요청 임시저장 삭제
+     *
+     * @param userId
+     * @param savePchReqlRequest
+     * @return SaveResponse
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
+            @ApiImplicitParam(name = "brandId", value = "브랜드코드", required = true, dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "pchReqUnqNo", value = "발주요청번호", required = true, dataType = "String", paramType = "query")
+    })
+    @ApiOperation(value = "구매요청 임시저장 삭제")
+    @GetMapping("/del-pchReq")
+    public ResponseEntity<SaveResponse> delPchReq(@ApiIgnore String userId,  @RequestParam(value = "brandId") String brandId,  @RequestParam(value = "pchReqUnqNo") String pchReqUnqNo) throws Exception {
+        pchReqService.delPchReqInfo(userId,  brandId, pchReqUnqNo);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.DELETE_OK));
+
+    }
 
 
 

src/main/java/com/oqpo/api/web/controller/stinfo/ItemController.java

@@ -413,4 +413,22 @@ public class ItemController {
         return ResponseEntity.ok(itemService.selectPopItemBaseGridList(itemPopGridRequest.getSBrandId(), itemPopGridRequest.getSStoreId(),
                 itemPopGridRequest.getSPodrPssblDvsn(), itemPopGridRequest.getSItemNm(), itemPopGridRequest.toDTO(itemPopGridRequest)));
     }
+
+
+    /**
+     * 설명 : 품목 팝업 그리드 리스트
+     *
+     * @param itemContPopGridRequest
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 품목 단가 팝업 기본 리스트")
+    @PostMapping("/pop-cont-item-list")
+    public ResponseEntity<GridResponse> selectPopItemBaseGridList(@RequestBody @Valid ItemContPopGridRequest itemContPopGridRequest) throws Exception {
+        return ResponseEntity.ok(itemService.selectPopItemContGridList(itemContPopGridRequest.getSBrandId(), itemContPopGridRequest.getSStoreId(),
+                itemContPopGridRequest.getSPodrPssblDvsn(), itemContPopGridRequest.getSItemNm(),  itemContPopGridRequest.getContYn().toString(), itemContPopGridRequest.toDTO(itemContPopGridRequest)));
+    }
 }

src/main/java/com/oqpo/api/web/dto/request/stinfo/item/ItemContPopGridRequest.java

@@ -0,0 +1,33 @@
+package com.oqpo.api.web.dto.request.stinfo.item;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+
+
+@Getter
+@Setter
+public class ItemContPopGridRequest extends GridRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @ApiModelProperty(value = "매장아이디")
+    private String sStoreId;
+
+    @ApiModelProperty(value = "발주가능여부")
+    private String sPodrPssblDvsn;
+
+    @ApiModelProperty(value = "품목명")
+    private String sItemNm;
+
+    @ApiModelProperty(value = "단가계약건 포함여부")
+    private String contYn;
+
+    protected ItemContPopGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
+        super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
+    }
+}

src/main/resources/mybatis/sqlmaps/pomng/PchReq.xml

@@ -15,6 +15,7 @@
                 ,pch_req_mgr_id
         from   pch_req_base_info
         where  brand_id = #{sBrandId}
+        and    pch_req_st_cd <![CDATA[ <> ]]> 'PR98'
         <if test="sStoreId == null or sStoreId == ''">
             and   ((store_id is null or store_id = '') or (store_id is not null and store_id <![CDATA[ <> ]]> '' and pch_req_st_cd <![CDATA[ <> ]]> 'PR00'))
         </if>
@@ -57,6 +58,7 @@
             select count(*) as cnt
             from   pch_req_base_info
             where  brand_id = #{sBrandId}
+            and    pch_req_st_cd <![CDATA[ <> ]]> 'PR98'
             <if test="sStoreId == null or sStoreId == ''">
                 and   ((store_id is null or store_id = '') or (store_id is not null and store_id <![CDATA[ <> ]]> '' and pch_req_st_cd <![CDATA[ <> ]]> 'PR00'))
             </if>
@@ -572,4 +574,15 @@
         </foreach>
     </select>
 
+
+    <update id="updateOrdPchReqDelete">
+        UPDATE /* PchReq.updateOrdPchReqDelete */
+            pch_req_base_info SET
+                pch_req_st_cd = 'PR98',
+                sys_chg_dttm = NOW(),
+                sys_chg_id = #{userId}
+            WHERE brand_id = #{brandId}
+            and   pch_req_unq_no = #{pchReqUnqNo}
+    </update>
+
 </mapper>

src/main/resources/mybatis/sqlmaps/stinfo/ItemUnit.xml

@@ -845,4 +845,65 @@
             and   iInfo.podr_pssbl_dvsn = #{sPodrPssblDvsn}
         </if>
     </select>
+
+
+    <select id="selectPopContItemBrandUnitGridList" resultType="com.oqpo.api.entity.stinfo.ItemUnitEntity">
+        select  /* selectPopContItemBrandUnitGridList */
+            iInfo.item_id,iInfo.item_nm,iInfo.podr_pssbl_dvsn, fn_code_nm('PODR_PSSBL_DVSN',iInfo.podr_pssbl_dvsn) AS podr_pssbl_dvsn_nm
+            ,iInfo.unit, fn_code_nm('DSTRBT_COST_UNIT', iInfo.unit) as unit_nm
+        from item_base_info iInfo
+        where iInfo.brand_id = #{sBrandId}
+        AND   iInfo.item_st_cd = 'IS00'
+        <if test="sItemNm != null and sItemNm != ''">
+            and  (iInfo.item_nm like concat('%',#{sItemNm},'%') or iInfo.item_id like concat('%',#{sItemNm},'%'))
+        </if>
+        <if test="sPodrPssblDvsn != null and sPodrPssblDvsn != ''">
+            and   iInfo.podr_pssbl_dvsn = #{sPodrPssblDvsn}
+        </if>
+        <if test="contYn == 'N'.toString()">
+            and iInfo.item_id not in ( select item_id
+                                    from   brand_item_unit_info iunit
+                                    where  iunit.brand_id = #{sBrandId}
+                                    and    date_format(now() , '%Y%m%d') between cont_stt_dt and cont_end_dt )
+        </if>
+
+        <choose>
+            <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
+                <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by iInfo.item_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by iInfo.item_nm desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by iInfo.item_nm asc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectPopContItemBrandUnitGridCnt" resultType="int">
+        select  /* selectPopContItemBrandUnitGridCnt */
+        count(*)
+        from item_base_info iInfo
+        where iInfo.brand_id = #{sBrandId}
+        AND   iInfo.item_st_cd = 'IS00'
+        <if test="sItemNm != null and sItemNm != ''">
+            and  (iInfo.item_nm like concat('%',#{sItemNm},'%') or iInfo.item_id like concat('%',#{sItemNm},'%'))
+        </if>
+        <if test="sPodrPssblDvsn != null and sPodrPssblDvsn != ''">
+            and   iInfo.podr_pssbl_dvsn = #{sPodrPssblDvsn}
+        </if>
+        <if test="contYn == 'N'.toString()">
+            and iInfo.item_id not in ( select item_id
+                                from   brand_item_unit_info iunit
+                                where  iunit.brand_id = #{sBrandId}
+                                and    date_format(now() , '%Y%m%d') between cont_stt_dt and cont_end_dt )
+        </if>
+    </select>
 </mapper>