공급사 - 납품서생성 저장 및 매장단가관리 정보 수정

src/main/java/com/oqpo/api/mapper/inoutmng/ShmtOdrMapper.java

@@ -35,5 +35,6 @@ public interface ShmtOdrMapper {
     List<PchOdrBaseInfoEntity> selectSpplyTargetOdrGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm, GridRequest gridRequest )throws Exception;
     int selectSpplyTargetOdrGridCnt(@Param("sBrandId") String sBrandId,@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm )throws Exception;
 
-
+    PchOdrBaseInfoEntity selectSpplyShmtOdrInfo(@Param("brandId") String brandId, @Param("spplyId") String spplyId, @Param("pchPodrUnqNo") String pchPodrUnqNo )throws Exception;
+    List<PchOdrDtlPtclEntity> selectSpplyShmtOdrList( @Param("pchPodrUnqNo") String pchPodrUnqNo )throws Exception;
 }

src/main/java/com/oqpo/api/service/inoutmng/ShmtOdrService.java

@@ -28,11 +28,9 @@ import com.oqpo.api.service.CommonService;
 import com.oqpo.api.service.pomng.PchOrdService;
 import com.oqpo.api.web.dto.request.GridRequest;
 import com.oqpo.api.web.dto.request.inoutmng.InstShmtOdrRequest;
+import com.oqpo.api.web.dto.request.inoutmng.SaveSpplyDlvRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
-import com.oqpo.api.web.dto.response.inoutmng.InvInfoResponse;
-import com.oqpo.api.web.dto.response.inoutmng.ShmtOdrSearchListResponse;
-import com.oqpo.api.web.dto.response.inoutmng.ShmtOutSearchListResponse;
-import com.oqpo.api.web.dto.response.inoutmng.SpplyTargerOdrSearchListResponse;
+import com.oqpo.api.web.dto.response.inoutmng.*;
 import com.oqpo.api.web.dto.response.pomng.pchOrd.SpplyPoOdrSearchListResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -568,6 +566,135 @@ public class ShmtOdrService extends CommonService {
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
+
+
+    /* 공급사 납품서 생성 최기 정보 */
+    public SpplyInvInitResponse selectSpplyShmtOdrInfo(String brandId, String spplyId, String pchPodrUnqNo) throws Exception {
+        PchOdrBaseInfoEntity entity = shmtOdrMapper.selectSpplyShmtOdrInfo(brandId, spplyId, pchPodrUnqNo);
+        List<PchOdrDtlPtclEntity> dtlEntity = shmtOdrMapper.selectSpplyShmtOdrList(pchPodrUnqNo);
+
+        return SpplyInvInitResponse.toDTO(entity, dtlEntity);
+    }
+
+    /* 공급사 납품서 생성 저장 */
+    @Transactional
+    public void saveSpplyInv(String userId, SaveSpplyDlvRequest saveSpplyDlvRequest) throws Exception {
+        try {
+
+            List<PchOdrDtlPtclEntity> gridInsertData = saveSpplyDlvRequest.toCodeEntities(saveSpplyDlvRequest.getGridInsertData());
+            List<PchOdrBaseInfoEntity> jobList = shmtOdrMapper.selectShmtJobDataList(saveSpplyDlvRequest.getBrandId(), gridInsertData);
+            int shmtTotalAmt = 0;
+            String expryDate = "";
+            int shmtQty = 0;
+            String dlvSttmtUnqNo = "";
+
+            DeliInfoMgntEntity deliBaseEntity = new DeliInfoMgntEntity();
+            List<DeliDtlMgntEntity> deliDtlList = new ArrayList<DeliDtlMgntEntity>();
+
+            for (int i = 0; i < jobList.size(); i++) {
+                PchOdrBaseInfoEntity entity = jobList.get(i);
+
+                for (int j = 0; j < gridInsertData.size(); j++) {
+                    PchOdrDtlPtclEntity reqEntity = gridInsertData.get(j);
+                    if (entity.getPchPodrUnqNo().equals(reqEntity.getPchPodrUnqNo()) && entity.getPchOdrDtlInfo().getPchPodrDtlNo().equals(reqEntity.getPchPodrDtlNo())) {
+                        if (reqEntity.getShmtQty() > entity.getPchOdrDtlInfo().getPodrQty()) {
+                            // 발주수량보다 출고수량이 많을수 없습니다.
+                            throw new GlobalException(SystemMessageCode.ERR_POSHNONQTY);
+                        }
+
+                        if ("Y".equals(entity.getPchOdrDtlInfo().getExpryYn())) {
+                            if (reqEntity.getExpryDate() == null || "".equals(reqEntity.getExpryDate())) {
+                                // 유통기한을 입력해주세요!
+                                throw new GlobalException(SystemMessageCode.ERR_NONEXPRY);
+                            }
+                        }
+                        expryDate = reqEntity.getExpryDate().replaceAll("\\.", "");
+                        shmtQty = reqEntity.getShmtQty();
+
+                        break;
+                    }
+                }
+
+                shmtTotalAmt = shmtTotalAmt + (entity.getPchOdrDtlInfo().getUnitAmt() * shmtQty);
+                if (i == 0 ) {
+                    dlvSttmtUnqNo = fnGetDealNo(15, ""); // 납품서번호
+                    deliBaseEntity.setDlvSttmtUnqNo(dlvSttmtUnqNo);
+                    deliBaseEntity.setDlvSttmtUnqNo(dlvSttmtUnqNo);
+                    deliBaseEntity.setSpplyId(entity.getSpplyId());
+                    deliBaseEntity.setSpplyNm(entity.getSpplyNm());
+                    deliBaseEntity.setStoreId(entity.getStoreId());
+                    //deliBaseEntity.setDlvAmt(shmtTotalAmt);
+                    deliBaseEntity.setDlvMgrNm(saveSpplyDlvRequest.getDlvMgrNm());
+                    deliBaseEntity.setDlvMgrTelNo(saveSpplyDlvRequest.getDlvMgrTelNo().replaceAll("-", ""));
+                    deliBaseEntity.setDlvMgrEmal(null);
+                    deliBaseEntity.setDlvMgrMblNo(null);
+                    deliBaseEntity.setVndrTelNo(entity.getDeliTelNo().replaceAll("-", ""));
+                    deliBaseEntity.setDlvStCd("DLV0");
+                    deliBaseEntity.setPodrRegDt(entity.getPodrDt());
+                    deliBaseEntity.setDlvReqDt(entity.getDlvReqDt().replaceAll("\\.", ""));
+                    deliBaseEntity.setDlvSchDt(saveSpplyDlvRequest.getDlvSchDt().replaceAll("\\.", ""));
+                    deliBaseEntity.setDlvCmpltDt(null);
+                    deliBaseEntity.setWhsId(entity.getWhsId());
+                    deliBaseEntity.setLocation(entity.getLocation());
+                    if ("".equals(entity.getStoreId()) || entity.getStoreId() == null) {
+                        deliBaseEntity.setWhsDvsn("W01");
+                    } else {
+                        deliBaseEntity.setWhsDvsn("W02");
+                    }
+                    deliBaseEntity.setBrandId(saveSpplyDlvRequest.getBrandId());
+                }
+
+                int dtlNo = (i+1) * 10;
+
+                DeliDtlMgntEntity inaddDeliDtlEntity = new DeliDtlMgntEntity();
+                inaddDeliDtlEntity.setDlvSttmtUnqNo(dlvSttmtUnqNo);
+                inaddDeliDtlEntity.setDlvSttmtDtlNo(Integer.toString(dtlNo));
+                inaddDeliDtlEntity.setPchPodrUnqNo(entity.getPchPodrUnqNo());
+                inaddDeliDtlEntity.setPchPodrDtlNo(entity.getPchOdrDtlInfo().getPchPodrDtlNo());
+                inaddDeliDtlEntity.setPchReqUnqNo(entity.getPchOdrDtlInfo().getPchReqUnqNo());
+                inaddDeliDtlEntity.setPchReqDtlNo(entity.getPchOdrDtlInfo().getPchReqDtlNo());
+                inaddDeliDtlEntity.setItemId(entity.getPchOdrDtlInfo().getItemId());
+                inaddDeliDtlEntity.setItemNm(entity.getPchOdrDtlInfo().getItemNm());
+                inaddDeliDtlEntity.setUnit(entity.getPchOdrDtlInfo().getUnit());
+                inaddDeliDtlEntity.setUnitAmt(entity.getPchOdrDtlInfo().getUnitAmt());
+                inaddDeliDtlEntity.setPodrQty(entity.getPchOdrDtlInfo().getPodrQty());
+                inaddDeliDtlEntity.setDlvQty(shmtQty);
+                inaddDeliDtlEntity.setPodrAmt(entity.getPchOdrDtlInfo().getPodrAmt());
+                inaddDeliDtlEntity.setDlvAmt(shmtQty * entity.getPchOdrDtlInfo().getUnitAmt());
+                inaddDeliDtlEntity.setExpryDate(expryDate);
+
+                deliDtlList.add(inaddDeliDtlEntity);
+
+            }
+
+            deliBaseEntity.setDlvAmt(shmtTotalAmt);
+            shmtOdrMapper.insertDeliInfoMngt(userId, deliBaseEntity);
+            shmtOdrMapper.insertDeliDtlPtcl(userId, deliDtlList);
+
+            for (int poi = 0; poi < gridInsertData.size(); poi++) {
+                gridInsertData.get(poi).setPodrDtlStCd("POD3");
+            }
+            pchOrdMapper.updateChangeStPodrDtl(userId, gridInsertData);
+
+            // 발주 헤더 상태 처리  updateChgMultiPodrStCd
+            String pchPodrUnqNo = "";
+            for (int k = 0; k < gridInsertData.size(); k++) {
+                if (!pchPodrUnqNo.equals(gridInsertData.get(k).getPchPodrUnqNo())) {
+                    pchPodrUnqNo = gridInsertData.get(k).getPchPodrUnqNo();
+                    String pchOdrStCd = pchOrdService.selectOdrDtlStatusList(pchPodrUnqNo);
+                    pchOrdMapper.updateChgPodrStCd(userId, pchOdrStCd, pchPodrUnqNo);
+                }
+            }
+
+        } catch (GlobalException e) {
+            //e.getStackTrace();
+            e.printStackTrace();
+            throw new GlobalException(e.getSystemMessageCode());
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+    }
 }
 
 

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

@@ -266,8 +266,7 @@ public class ItemUnitService extends CommonService {
             StoreItemUnitEntity entity = new StoreItemUnitEntity();
             entity.setBrandId(saveStoreItemUnitInfolRequest.getBrandId());
             entity.setStoreId(saveStoreItemUnitInfolRequest.getStoreId());
-            entity.setContSttDt(saveStoreItemUnitInfolRequest.getContSttDt().replaceAll("\\.",""));
-            entity.setContEndDt(saveStoreItemUnitInfolRequest.getContEndDt().replaceAll("\\.",""));
+
 
             // 동일 단가계약일자 존재시
             String rcontEndDt = "";
@@ -284,6 +283,13 @@ public class ItemUnitService extends CommonService {
             List<StoreItemUnitEntity> gridUpdateData = saveStoreItemUnitInfolRequest.toCodeEntities(saveStoreItemUnitInfolRequest.getGridUpdateData());
             if (gridUpdateData.size() > 0) {
 
+                for (int k=0 ; k < gridUpdateData.size() ; k++ ) {
+                    String contSttDt =  gridUpdateData.get(k).getContSttDt().replaceAll("\\.","");
+                    String contEndDt =  gridUpdateData.get(k).getContEndDt().replaceAll("\\.","");
+                    gridUpdateData.get(k).setContSttDt( contSttDt );
+                    gridUpdateData.get(k).setContEndDt( contEndDt );
+                }
+
                 if (!"".equals(rcontEndDt)) {
                     for (int i = 0; i < gridUpdateData.size(); i++) {
                         gridUpdateData.get(i).setStoreUnitUnqNo("");

src/main/java/com/oqpo/api/web/controller/inoutmng/ShmtOdrController.java

@@ -2,14 +2,12 @@ package com.oqpo.api.web.controller.inoutmng;
 
 import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.service.inoutmng.ShmtOdrService;
-import com.oqpo.api.web.dto.request.inoutmng.InstShmtOdrRequest;
-import com.oqpo.api.web.dto.request.inoutmng.ShmtOdrTargetGridRequest;
-import com.oqpo.api.web.dto.request.inoutmng.ShmtOutSearchGridRequest;
-import com.oqpo.api.web.dto.request.inoutmng.SpplyOdrTargetGridRequest;
+import com.oqpo.api.web.dto.request.inoutmng.*;
 import com.oqpo.api.web.dto.request.pomng.pchOrd.SpplyOdrPoGridRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
 import com.oqpo.api.web.dto.response.SaveResponse;
 import com.oqpo.api.web.dto.response.inoutmng.InvInfoResponse;
+import com.oqpo.api.web.dto.response.inoutmng.SpplyInvInitResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -120,4 +118,43 @@ public class ShmtOdrController {
         return ResponseEntity.ok(shmtOdrService.selectSpplyTargetOdrGridList(spplyOdrTargetGridRequest.getSBrandId(), spplyOdrTargetGridRequest.getFromDt(), spplyOdrTargetGridRequest.getToDt(), spplyOdrTargetGridRequest.getSSpplyId(), spplyOdrTargetGridRequest.getSWhsId(), spplyOdrTargetGridRequest.getSItemNm(),  spplyOdrTargetGridRequest.toDTO(spplyOdrTargetGridRequest)));
     }
 
+
+    /**
+     * 설명 : 공급사 발주데이타 납품서 생성 초기데이타
+     *
+     * @param brandId, dlvSttmtUnqNo
+     * @return
+     * @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 = "spplyId", value = "공급사아이디", required = true, dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "pchPodrUnqNo", value = "구매발주번호", required = true, dataType = "String", paramType = "query")
+    })
+    @ApiOperation(value = "공급사 발주데이타 납품서 생성 초기데이타")
+    @GetMapping("/init-spply-inv")
+    public ResponseEntity<SpplyInvInitResponse> initSpplyInv(@RequestParam(value = "brandId") String brandId, @RequestParam(value = "spplyId") String spplyId, @RequestParam(value = "pchPodrUnqNo") String pchPodrUnqNo) throws Exception {
+        return ResponseEntity.ok(shmtOdrService.selectSpplyShmtOdrInfo(brandId,spplyId, pchPodrUnqNo));
+    }
+
+    /**
+     * 설명 : 공급사 납품서 생성 저장
+     *
+     * @param userId
+     * @param instShmtOdrRequest
+     * @return SaveResponse
+     * @throws Exception
+     */
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "공급사 납품서 생성 저장 저장")
+    @PostMapping("/save-spply-inv")
+    public ResponseEntity<SaveResponse> saveSpplyInv(@ApiIgnore String userId, @RequestBody @Valid SaveSpplyDlvRequest saveSpplyDlvRequest) throws Exception {
+        shmtOdrService.saveSpplyInv(userId,  saveSpplyDlvRequest);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+    }
+
 }

src/main/java/com/oqpo/api/web/dto/request/inoutmng/SaveSpplyDlvRequest.java

@@ -0,0 +1,74 @@
+package com.oqpo.api.web.dto.request.inoutmng;
+
+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 SaveSpplyDlvRequest {
+    @NotBlank
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디") private String brandId;
+
+    @NotBlank
+    @ApiModelProperty(value = "공급사아이디") private String spplyId;
+
+    @NotBlank
+    @ApiModelProperty(value = "납품예정일") private String dlvSchDt;
+
+    @NotBlank
+    @ApiModelProperty(value = "납품담당자명") private String dlvMgrNm;
+
+    @NotBlank
+    @ApiModelProperty(value = "납품담당자연락처") private String dlvMgrTelNo;
+
+
+    @ApiModelProperty(value = "출하지시대상 리스트")
+    private List<InstShmtItemDataList> gridInsertData;
+
+
+    public List<PchOdrDtlPtclEntity> toCodeEntities(List<InstShmtItemDataList> 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.setShmtQty(x.getShmtQty());
+            entity.setExpryDate(x.getExpryDate());
+            entities.add(entity);
+        });
+        return entities;
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class InstShmtItemDataList {
+
+        @NotBlank
+        @ApiModelProperty(value = "구매발주고유번호") private String pchPodrUnqNo;
+
+        @NotBlank
+        @ApiModelProperty(value = "구매발주항번") private String pchPodrDtlNo;
+
+        @NotBlank
+        @ApiModelProperty(value = "출하수량") private Integer shmtQty ;
+
+        @ApiModelProperty(value = "유통기한") private String  expryDate;
+
+        @ApiModelProperty(value = "비고") private String deliDesc ;
+
+
+    }
+}

src/main/java/com/oqpo/api/web/dto/request/stinfo/itemUnit/SaveStoreItemUnitInfolRequest.java

@@ -53,6 +53,8 @@ public class SaveStoreItemUnitInfolRequest {
             entity.setItemId(x.getItemId());
             entity.setStddQty(x.getStddQty());
             entity.setBrandUnitUnqNo(x.getBrandUnitUnqNo());
+            entity.setContSttDt(x.getContSttDt());
+            entity.setContEndDt(x.getContEndDt());
             entities.add(entity);
         });
         return entities;
@@ -66,6 +68,12 @@ public class SaveStoreItemUnitInfolRequest {
         @ApiModelProperty(value = "매장단가고유번호")
         private String storeUnitUnqNo;
 
+        @ApiModelProperty(value = "계약시작일")
+        private String contSttDt;
+
+        @ApiModelProperty(value = "계약종료일")
+        private String contEndDt;
+
         @ApiModelProperty(value = "단위")
         private String unit;
 

src/main/java/com/oqpo/api/web/dto/response/inoutmng/SpplyInvInitResponse.java

@@ -0,0 +1,80 @@
+package com.oqpo.api.web.dto.response.inoutmng;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.inoutmng.DeliDtlMgntEntity;
+import com.oqpo.api.entity.inoutmng.DeliInfoMgntEntity;
+import com.oqpo.api.entity.oper.FileEntity;
+import com.oqpo.api.entity.pomng.PchOdrBaseInfoEntity;
+import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class SpplyInvInitResponse {
+
+    @ApiModelProperty(value = "브랜드아이디") private String brandId;
+    @ApiModelProperty(value = "브랜드명") private String brandNm;
+    @ApiModelProperty(value = "납품서생성일") private String dlvReqDt;
+    @ApiModelProperty(value = "납품총금액") private Integer podrTotalAmt;  // dlv_mgr_tel_no
+    @ApiModelProperty(value = "납품창고아이디") private String whsId;
+    @ApiModelProperty(value = "납품찿고명") private String whsNm;
+    @ApiModelProperty(value = "location") private String location;
+    @ApiModelProperty(value = "납품장소전화번호") private String deliTelNo;
+
+
+    @ApiModelProperty(value = "납품 품목 정보")
+    private List<InvPoDtlInfo> invPoInfoList;
+
+    public static SpplyInvInitResponse toDTO(PchOdrBaseInfoEntity entity, List<PchOdrDtlPtclEntity>  dtlList) {
+        if (entity == null) return null;
+        return SpplyInvInitResponse.builder()
+                .brandId(entity.getBrandId() == null ? "" : entity.getBrandId())
+                .brandNm(entity.getBrandNm() == null ? "" : entity.getBrandNm())
+                .dlvReqDt(entity.getDlvReqDt() == null ? "" : entity.getDlvReqDt())
+                .podrTotalAmt(entity.getPodrTotalAmt() == null ? 0  : entity.getPodrTotalAmt())
+                .whsId(entity.getWhsId() == null ? "" : entity.getWhsId())
+                .whsNm(entity.getWhsNm() == null ? "" : entity.getWhsNm() + "-" + entity.getLocationNm())
+                .location(entity.getLocation() == null ? "" : entity.getLocation())
+                .deliTelNo(entity.getDeliTelNo() == null ? "" : entity.getDeliTelNo())
+                .invPoInfoList(dtlList.stream()
+                        .map(m -> SpplyInvInitResponse.InvPoDtlInfo.builder()
+                                .pchPodrUnqNo(m.getPchPodrUnqNo() == null ? "" : m.getPchPodrUnqNo())
+                                .pchPodrDtlNo(m.getPchReqDtlNo() == null ? "" : m.getPchPodrDtlNo())
+                                .itemId(m.getItemId() == null ? "" :m.getItemId())
+                                .itemNm(m.getItemNm() == null ? "" :m.getItemNm())
+                                .unit(m.getUnit() == null ? "" : m.getUnit())
+                                .podrQty(m.getPodrQty() == null ? 0 :m.getPodrQty())
+                                .shmtQty(m.getShmtQty() == null ? 0 : m.getShmtQty())
+                                .expryYn(m.getExpryYn() == null ? "N" : m.getExpryYn())
+                                .expryPeriod(m.getExpryPeriod() == null ? 0 : m.getExpryPeriod())
+                                .expryDate(m.getExpryDate() == null ? "" : m.getExpryDate())
+                                .build())
+                        .collect(Collectors.toList()))
+                .build();
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class InvPoDtlInfo {
+        @ApiModelProperty(value = "구매발주번호") private String pchPodrUnqNo;
+        @ApiModelProperty(value = "구매발주항번") private String pchPodrDtlNo;
+        @ApiModelProperty(value = "품목아이디") private String itemId;
+        @ApiModelProperty(value = "품목명") private String itemNm;
+        @ApiModelProperty(value = "단위") private String unit;
+        @ApiModelProperty(value = "발주수량") private Integer podrQty;
+        @ApiModelProperty(value = "납품수량") private Integer shmtQty;
+        @ApiModelProperty(value = "유통기한여부") private String expryYn;
+        @ApiModelProperty(value = "유통기간") private Integer expryPeriod;
+        @ApiModelProperty(value = "유통일자") private String expryDate;
+    }
+
+}

src/main/resources/mybatis/sqlmaps/inoutmng/ShmtOdr.xml

@@ -117,6 +117,7 @@
                 , base.store_id , base.podr_mgr_nm , base.podr_mgr_tel_no
                 , fn_get_telno((select tel_no from store_base_info where store_id = base.store_id )) as deli_tel_no
                 , date_format(base.podr_dt,'%Y%m%d') as podr_dt
+                , base.spply_id, fn_spply_nm(base.spply_id) as spply_nm
         from   pch_odr_base_info base
         join pch_odr_dtl_ptcl ptcl on base.pch_podr_unq_no = ptcl.pch_podr_unq_no and ptcl.podr_dtl_st_cd = 'POD0'
         join item_base_info itm on ptcl.item_id = itm.item_id
@@ -330,5 +331,28 @@
 
     </select>
 
+    <select id="selectSpplyShmtOdrInfo" resultType="com.oqpo.api.entity.pomng.PchOdrBaseInfoEntity">
+    select  base.brand_id, fn_brand_nm(base.brand_id) as brand_nm, base.pch_podr_unq_no, date_format(now(), '%Y.%m.%d') as dlv_req_dt
+        , (select sum(podr_amt) from  pch_odr_dtl_ptcl where pch_podr_unq_no = '22102500006015' and podr_dtl_st_cd = 'POD0' ) as podr_total_amt
+        , base.whs_id, fn_whs_nm(base.brand_id, base.whs_id) as whs_nm
+        , base.location, fn_whs_location_nm(brand_id, base.whs_id, base.location) as location_nm
+        , fn_get_telno((select tel_no from store_base_info where store_id = base.store_id )) as deli_tel_no
+    from    pch_odr_base_info base
+    where  1=1
+    and    base.brand_id = #{brandId}
+    and    base.spply_id = #{spplyId}
+    and    base.dlv_dvsn = 'DL02'
+    and    base.pch_podr_unq_no = #{pchPodrUnqNo}
+    </select>
+
+    <select id="selectSpplyShmtOdrList" resultType="com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity">
+    select ptcl.pch_podr_unq_no, ptcl.pch_podr_dtl_no, ptcl.item_id, ptcl.item_nm, ptcl.unit, ptcl.podr_qty, ptcl.podr_qty as shmt_qty
+            ,itm.expry_yn as expry_yn, itm.expry_period as expry_period
+            , date_format(adddate(now(), interval itm.expry_period day),'%Y.%m.%d') as expry_date
+    from   pch_odr_dtl_ptcl ptcl
+    join   item_base_info itm on ptcl.item_id = itm.item_id
+    where  ptcl.pch_podr_unq_no = #{pchPodrUnqNo}
+    and    ptcl.podr_dtl_st_cd = 'POD0'
+    </select>
 
 </mapper>