구매발주 취소처리 및 구매요청정보에 발주상태정보 추가

src/main/java/com/oqpo/api/entity/pomng/PchReqDtlPtclEntity.java

@@ -29,6 +29,8 @@ public class PchReqDtlPtclEntity implements Serializable {
     private String storeUnitUnqNo;
     private String unitGubun;
     private Integer pchOrdAmt;
+    private String podrDtlStCd;
+    private String podrDtlStNm;
 
 
 }

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

@@ -29,4 +29,9 @@ public interface PchOrdMapper {
     List<PchOdrDtlPtclEntity> selectOdrDtlList(@Param("pchPodrUnqNo") String pchPodrUnqNo);
 
     List<PchOdrDtlPtclEntity> selectOdrDtlStatusList(@Param("pchPodrUnqNo") String pchPodrUnqNo);
+
+    int updateCancelPodrDtl(@Param("userId") String userId, List<PchOdrDtlPtclEntity> gridUpdateData) throws Exception;
+    int updateChgPodrStCd(@Param("userId") String userId, @Param("pchOdrStCd") String pchOdrStCd, @Param("pchPodrUnqNo") String pchPodrUnqNo) throws Exception;
+
+
 }

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

@@ -26,4 +26,7 @@ public interface StoreBaseInfoMapper {
     StoreBaseInfoEntity selectStoreLoanInfo(@Param("brandId") String brandId, @Param("storeId") String storeId)throws Exception;
 
     int updateCloseStore(@Param("userId") String userId, @Param("brandId") String brandId, @Param("afflShopId") String afflShopId) throws Exception;
+
+    String selectStoreLoanMgntUnqNo( @Param("storeId") String storeId)throws Exception;
+
 }

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

@@ -10,12 +10,15 @@ import com.oqpo.api.entity.pomng.PchReqDtlPtclEntity;
 import com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity;
 import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.exception.GlobalException;
+import com.oqpo.api.mapper.loanmng.LoanStateMapper;
 import com.oqpo.api.mapper.oper.UserMngMapper;
 import com.oqpo.api.mapper.pomng.PchOrdMapper;
 import com.oqpo.api.mapper.pomng.PchReqMapper;
+import com.oqpo.api.mapper.stinfo.StoreBaseInfoMapper;
 import com.oqpo.api.mapper.stockmng.StockMngMapper;
 import com.oqpo.api.service.CommonService;
 import com.oqpo.api.web.dto.request.GridRequest;
+import com.oqpo.api.web.dto.request.pomng.pchOrd.CancelPchOrdDtlRequest;
 import com.oqpo.api.web.dto.request.pomng.pchOrd.PchReqOrdInitRequest;
 import com.oqpo.api.web.dto.request.pomng.pchOrd.SavePchOrdRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
@@ -49,6 +52,12 @@ public class PchOrdService extends CommonService {
     @Autowired
     private PchReqMapper pchReqMapper;
 
+    @Autowired
+    private StoreBaseInfoMapper storeBaseInfoMapper;
+
+    @Autowired
+    private LoanStateMapper loanStateMapper;
+
 
     /* 구매요청건 발주 가능 여부 체크 */
     public String  chkPchReqUseOrd(String userId, PchReqOrdInitRequest pchReqOrdInitRequest ) throws Exception {
@@ -414,6 +423,48 @@ public class PchOrdService extends CommonService {
     }
 
 
+    /*
+      발주 취소처리
+     */
+    @Transactional
+    public void cancelPchOrdDtl(String userId, CancelPchOrdDtlRequest cancelPchOrdDtlRequest) throws Exception {
+        try {
+            // 품목 삭제 상태처리
+            Integer podrAmt = 0 ;
+            List<PchOdrDtlPtclEntity> gridUpdateData = cancelPchOrdDtlRequest.toCodeEntities(cancelPchOrdDtlRequest.getGridUpdateData());
+            if (gridUpdateData.size() > 0) {
+                pchOrdMapper.updateCancelPodrDtl(userId,  gridUpdateData) ;
+
+                for (int i = 0 ; i < gridUpdateData.size() ; i++) {
+                    PchOdrDtlPtclEntity delItem = gridUpdateData.get(i);
+                    podrAmt = podrAmt + delItem.getPodrAmt();
+                }
+            }
+
+            //발주취소로 인한 발주 head 상태값 변경처리  pchPodrUnqNo
+            String pchOdrStCd = selectOdrDtlStatusList(cancelPchOrdDtlRequest.getPchPodrUnqNo());
+            pchOrdMapper.updateChgPodrStCd(userId, pchOdrStCd, cancelPchOrdDtlRequest.getPchPodrUnqNo());
+
+            // 매장 구매요청 발주일경우 사용금액 차감 처리함
+            if (!"".equals(cancelPchOrdDtlRequest.getStoreId())) {
+                String loanMgntUnqNo = storeBaseInfoMapper.selectStoreLoanMgntUnqNo(cancelPchOrdDtlRequest.getStoreId());
+
+                if (loanMgntUnqNo != null) {
+                    loanStateMapper.updateloanMinusPchReqUseAmt(loanMgntUnqNo, cancelPchOrdDtlRequest.getStoreId(), podrAmt);
+                }
+            }
+
+
+        } catch (GlobalException e) {
+            //e.getStackTrace();
+            e.printStackTrace();
+            throw new GlobalException(e.getSystemMessageCode());
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+    }
+
     public String  selectOdrDtlStatusList(String  pchReqUnqNo) throws Exception {
         //PCH_ODR_ST_CD
         String pchOdrStCd = "";
@@ -426,23 +477,23 @@ public class PchOrdService extends CommonService {
 
         for (int i = 0 ; i < dtlEntity.size() ; i++ ) {
             PchOdrDtlPtclEntity entity = dtlEntity.get(i);
-            if ( "POD0".equals(entity.getPodrDtlStCd())) {
+            if ( "POD0".equals(entity.getPodrDtlStCd())) {  // 요청
                 pod0 = pod0 + entity.getPodrStatusCnt() ;
-            } else if ( "POD1".equals(entity.getPodrDtlStCd()) ||  "POD3".equals(entity.getPodrDtlStCd())) {
+            } else if ( "POD1".equals(entity.getPodrDtlStCd()) ||  "POD3".equals(entity.getPodrDtlStCd())) {  // 접수 ,출하
                 pod1 = pod1 + entity.getPodrStatusCnt() ;
-            } else if ( "POD2".equals(entity.getPodrDtlStCd())) {
+            } else if ( "POD2".equals(entity.getPodrDtlStCd())) {  //발주취소
                 pod2 = pod2 + entity.getPodrStatusCnt() ;
-            } else if ( "POD4".equals(entity.getPodrDtlStCd())) {
+            } else if ( "POD4".equals(entity.getPodrDtlStCd())) {  //입고완료
                 pod4 = pod4 + entity.getPodrStatusCnt() ;
             }
         }
 
         if (pod0 > 0 ) {
-            pchOdrStCd = "PO20";
-        } else if ( pod0 == 0 || pod2 == 0 ) {
-            pchOdrStCd = "PO99";
+            pchOdrStCd = "PO20";  //요청
+        } else if ( pod0 == 0 && pod1 == 0 &&  pod4 == 0 ) {
+            pchOdrStCd = "PO99";  // 취소
         } else {
-            pchOdrStCd = "PO30";
+            pchOdrStCd = "PO30";  // 접수
         }
 
         return pchOdrStCd;

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

@@ -3,6 +3,7 @@ package com.oqpo.api.web.controller.pomng;
 import com.oqpo.api.enums.DataMessageCode;
 import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.service.pomng.PchOrdService;
+import com.oqpo.api.web.dto.request.pomng.pchOrd.CancelPchOrdDtlRequest;
 import com.oqpo.api.web.dto.request.pomng.pchOrd.PchOrdSearchGridRequest;
 import com.oqpo.api.web.dto.request.pomng.pchOrd.PchReqOrdInitRequest;
 import com.oqpo.api.web.dto.request.pomng.pchOrd.SavePchOrdRequest;
@@ -104,7 +105,7 @@ public class PchOrdController {
     })
     @ApiOperation(value = "구매발주 정보 저장")
     @PostMapping("/save-pchPo")
-    public ResponseEntity<SaveResponse> savePchReq(@ApiIgnore String userId, @RequestBody @Valid SavePchOrdRequest savePchOrdRequest) throws Exception {
+    public ResponseEntity<SaveResponse> savePchOdr(@ApiIgnore String userId, @RequestBody @Valid SavePchOrdRequest savePchOrdRequest) throws Exception {
         pchOrdService.savePchOrdInfo(userId,  savePchOrdRequest);
         return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
     }
@@ -144,4 +145,23 @@ public class PchOrdController {
     }
 
 
+    /**
+     * 설명 : 구매발주 취소처리
+     *
+     * @param userId
+     * @param savePchReqlRequest
+     * @return SaveResponse
+     * @throws Exception
+     */
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "구매발주 취소 처리")
+    @PostMapping("/cancel-pchPo")
+    public ResponseEntity<SaveResponse> cancelPchOdr(@ApiIgnore String userId, @RequestBody @Valid CancelPchOrdDtlRequest cancelPchOrdDtlRequest) throws Exception {
+        pchOrdService.cancelPchOrdDtl(userId,  cancelPchOrdDtlRequest);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+    }
+
 }

src/main/java/com/oqpo/api/web/dto/request/pomng/pchOrd/CancelPchOrdDtlRequest.java

@@ -0,0 +1,55 @@
+package com.oqpo.api.web.dto.request.pomng.pchOrd;
+
+import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+public class CancelPchOrdDtlRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @NotBlank
+    @ApiModelProperty(value = "발주번호")
+    private String pchPodrUnqNo;
+
+
+    @ApiModelProperty(value = "매장아이디")
+    private String storeId;
+
+    @ApiModelProperty(value = "삭제대상 발주 품목 리스트")
+    private List<CancelPoItemList> gridUpdateData;
+
+
+    public List<PchOdrDtlPtclEntity> toCodeEntities(List<CancelPoItemList> gridData) {
+        List<PchOdrDtlPtclEntity> entities = new ArrayList<>();
+        if (gridData == null || gridData.size() == 0)
+            return entities;
+
+        gridData.forEach(x -> {
+            PchOdrDtlPtclEntity entity = new PchOdrDtlPtclEntity();
+            entity.setPchPodrUnqNo(x.getPchPodrUnqNo());
+            entity.setPchPodrDtlNo(x.getPchPodrDtlNo());
+            entity.setPodrAmt(x.getPodrAmt());
+            entities.add(entity);
+        });
+        return entities;
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class CancelPoItemList {
+
+        @ApiModelProperty(value = "구매요청고유번호") private String pchPodrUnqNo;
+        @ApiModelProperty(value = "구매요청상세번호") private String pchPodrDtlNo;
+        @ApiModelProperty(value = "발주 금액") private Integer podrAmt;
+    }
+}

src/main/java/com/oqpo/api/web/dto/response/pomng/pchOrd/PchOdrInfoResponse.java

@@ -37,6 +37,7 @@ public class PchOdrInfoResponse {
     @ApiModelProperty(value = "발주담당자전화번호") private String podrMgrTelNo;
     @ApiModelProperty(value = "배송구분명") private String dlvDvsnNm;
     @ApiModelProperty(value = "납품요청일") private String dlvReqDt;
+    @ApiModelProperty(value = "매장아이디") private String storeId;
 
     @ApiModelProperty(value = "구매발주 품목 정보")
     private List<PchOdrInfoResponse.PchOrdPoDtlInfo> pchOdrDtlList;
@@ -60,6 +61,7 @@ public class PchOdrInfoResponse {
                 .podrMgrTelNo(entity.getPodrMgrTelNo() == null ? "" : entity.getPodrMgrTelNo())
                 .dlvDvsnNm(entity.getDlvDvsnNm() == null ? "" : entity.getDlvDvsnNm())
                 .dlvReqDt(entity.getDlvReqDt() == null ? "" : entity.getDlvReqDt())
+                .storeId(entity.getStoreId() == null ? "" : entity.getStoreId())
                 .pchOdrDtlList(dtlEntityList.stream()
                         .map(m -> PchOrdPoDtlInfo.builder()
                                 .pchPodrUnqNo(m.getPchPodrUnqNo())

src/main/java/com/oqpo/api/web/dto/response/pomng/pchReq/PchReqInfoResponse.java

@@ -116,6 +116,8 @@ public class PchReqInfoResponse {
                                 .brandUnitUnqNo(m.getBrandUnitUnqNo() == null ? "" : m.getBrandUnitUnqNo())
                                 .storeUnitUnqNo(m.getStoreUnitUnqNo() == null ? "" : m.getStoreUnitUnqNo())
                                 .unitGubun(m.getUnitGubun() == null ? "" : m.getUnitGubun())
+                                .podrDtlStCd(m.getPodrDtlStCd() == null ? "" : m.getPodrDtlStCd())
+                                .podrDtlStNm(m.getPodrDtlStNm() == null ? "" : m.getPodrDtlStNm())
                                 .build())
                         .collect(Collectors.toList()))
                 .build();
@@ -138,6 +140,8 @@ public class PchReqInfoResponse {
         @ApiModelProperty(value = "브랜드단가고유번호") private String brandUnitUnqNo;
         @ApiModelProperty(value = "매장단가고유번호") private String storeUnitUnqNo;
         @ApiModelProperty(value = "단가구분") private String unitGubun;
+        @ApiModelProperty(value = "발주상태코드") private String podrDtlStCd;
+        @ApiModelProperty(value = "발주상태명") private String podrDtlStNm;
 
 
     }

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

@@ -212,6 +212,7 @@
             , fn_whs_location_nm(base.brand_id, base.shmt_whs_id, base.shmt_location) as shmt_location_nm
             , base.podr_total_amt, base.podr_item_qty, base.podr_mgr_nm, base.podr_mgr_tel_no
             , fn_code_nm(upper('dlv_dvsn'),base.dlv_dvsn) as dlv_dvsn_nm,  date_format(base.dlv_req_dt, '%y.%m.%d') as dlv_req_dt
+            , base.store_id
         from pch_odr_base_info base
         where 1 = 1
         and base.pch_podr_unq_no = #{pchPodrUnqNo}
@@ -236,4 +237,25 @@
         where pch_podr_unq_no = #{pchPodrUnqNo}
         group by podr_dtl_st_cd
     </select>
+
+    <update id="updateCancelPodrDtl">
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            UPDATE /* PchOrd.updateCancelPodrDtl */
+            pch_odr_dtl_ptcl SET
+            podr_dtl_st_cd = 'POD2',
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+            WHERE pch_podr_unq_no = #{item.pchPodrUnqNo}
+            AND pch_podr_dtl_no = #{item.pchPodrDtlNo}
+        </foreach>
+    </update>
+
+    <update id="updateChgPodrStCd">
+            UPDATE /* PchOrd.updateChgPodrStCd */
+            pch_odr_base_info SET
+            pch_odr_st_cd = #{pchOdrStCd},
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+            WHERE pch_podr_unq_no = #{pchPodrUnqNo}
+    </update>
 </mapper>

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

@@ -85,10 +85,12 @@
     </select>
 
     <select id="selectPchReqDtlPtcl" resultType="com.oqpo.api.entity.pomng.PchReqDtlPtclEntity">
-            SELECT pch_req_unq_no, pch_req_dtl_no, item_id, item_nm, unit, fn_code_nm('DSTRBT_COST_UNIT',unit) AS unit_nm
-                  , pch_req_qty, pch_req_amt, unit_amt, brand_unit_unq_no, store_unit_unq_no, unit_gubun
-            FROM pch_req_dtl_ptcl
-            WHERE pch_req_unq_no = #{pchReqUnqNo}
+            SELECT ptcl.pch_req_unq_no, ptcl.pch_req_dtl_no, ptcl.item_id, ptcl.item_nm, ptcl.unit, fn_code_nm('DSTRBT_COST_UNIT',ptcl.unit) AS unit_nm
+                  , ptcl.pch_req_qty, ptcl.pch_req_amt, ptcl.unit_amt, ptcl.brand_unit_unq_no, ptcl.store_unit_unq_no, ptcl.unit_gubun
+                  , odr.podr_dtl_st_cd, fn_code_nm(upper('podr_dtl_st_cd'), odr.podr_dtl_st_cd) as podr_dtl_st_nm
+            FROM pch_req_dtl_ptcl ptcl
+            left outer join pch_odr_dtl_ptcl odr on odr.pch_req_unq_no = ptcl.pch_req_unq_no and odr.pch_req_dtl_no = ptcl.pch_req_dtl_no
+            WHERE ptcl.pch_req_unq_no = #{pchReqUnqNo}
     </select>
 
 

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

@@ -220,4 +220,10 @@
         </if>
     </update>
 
+    <select id="selectStoreLoanMgntUnqNo" resultType="String">
+        select loan_mgnt_unq_no
+         from store_base_info
+         where store_id = #{storeId}
+    </select>
+
 </mapper>