출하 납품서 출력 데이타

src/main/java/com/oqpo/api/entity/inoutmng/DeliDtlMgntEntity.java

@@ -35,4 +35,5 @@ public class DeliDtlMgntEntity implements Serializable {
     private String sysChgDttm;
     private String sysChgId;
 
+
 }

src/main/java/com/oqpo/api/entity/inoutmng/DeliInfoMgntEntity.java

@@ -36,10 +36,27 @@ public class DeliInfoMgntEntity implements Serializable {
     private String whsDvsnNm;
     private String brandId;
     private String brandNm;
+    private String storeId;
+    private String storeNm;
     private String sysRegDttm;
     private String sysRegId;
     private String sysChgDttm;
     private String sysChgId;
     private String dlvDesc;
+    private String mgrTelNo;
+    private String deliDvsn;
+    private String whsAddr;
+    private String whsMgrTelNo;
+
+    private String dlvBsnsRegno;
+    private String dlvNm;
+    private String dlvOwnerNm;
+    private String dlvAddr;
+
+    private String poBsnsRegno;
+    private String poNm;
+    private String poOwnerNm;
+    private String poAddr;
+
 
 }

src/main/java/com/oqpo/api/entity/inoutmng/ShmtOdrBaseEntity.java

@@ -44,6 +44,7 @@ public class ShmtOdrBaseEntity implements Serializable {
     private String sysRegId;
     private String sysChgDttm;
     private String sysChgId;
+    private String dlvSttmtUnqNo;
 
     private ShmtOdrDtlEntity shmtOdrDtlInfo;
     private WhsProcInfoEntity whsProcInfo;

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

@@ -28,26 +28,8 @@ public interface ShmtOdrMapper {
 
     List<ShmtOdrBaseEntity> selectShmtSearchGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sShmtWhsId") String sShmtWhsId, @Param("sShmtReqStCd") String sShmtReqStCd,  @Param("swhsId") String swhsId, @Param("sItemNm") String sItemNm, GridRequest gridRequest )throws Exception;
     int selectShmtSearchGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sShmtWhsId") String sShmtWhsId, @Param("sShmtReqStCd") String sShmtReqStCd,  @Param("swhsId") String swhsId, @Param("sItemNm") String sItemNm )throws Exception;
-    /*
-    List<PchOdrBaseInfoEntity> selectRecPchInitInfo(@Param("brandId") String brandId, List<PchOdrDtlPtclEntity> gridUpdateData)throws Exception;
-    List<PchOdrDtlPtclEntity> selectRecPchDtlInitInfo(@Param("brandId") String brandId, List<PchOdrDtlPtclEntity> gridUpdateData)throws Exception;
-    PchOdrBaseInfoEntity selectPoInitInfo(@Param("brandId") String brandId)throws Exception;
-    PchOdrDtlPtclEntity selectPoPchDtlSaveInfo(@Param("pchReqUnqNo") String pchReqUnqNo, @Param("pchReqDtlNo") String pchReqDtlNo)throws Exception;
-    PchOdrDtlPtclEntity selectPoItemDtlSaveInfo(@Param("brandId") String brandId, @Param("itemId") String itemId, @Param("brandUnitUnqNo") String brandUnitUnqNo)throws Exception;
 
-    int insertPchOdrBaseInfo(@Param("userId") String userId, PchOdrBaseInfoEntity entity)throws Exception;
-    int insertPchOdrDtlPtcl(@Param("userId") String userId, List<PchOdrDtlPtclEntity> gridInsertData)throws Exception;
+    DeliInfoMgntEntity selectInvInfo(@Param("brandId") String brandId, @Param("dlvSttmtUnqNo") String dlvSttmtUnqNo )throws Exception;
+    List<DeliDtlMgntEntity> selectInvDtlList(@Param("brandId") String brandId, @Param("dlvSttmtUnqNo") String dlvSttmtUnqNo)throws Exception;
 
-    List<PchOdrBaseInfoEntity>  selectPchOdrGridList(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sPchOdrStCd") String sPchOdrStCd, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm, GridRequest gridRequest);
-    int selectPchOdrGridCnt(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sPchOdrStCd") String sPchOdrStCd, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm);
-
-    PchOdrBaseInfoEntity selectPchOdrInfo(@Param("pchPodrUnqNo") String pchPodrUnqNo);
-    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/service/CommonService.java

@@ -18,7 +18,7 @@ public class CommonService {
         return commonMapper.selectKeyNo(numNo);
     }
 
-    @Transactional(propagation = Propagation.NOT_SUPPORTED)
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public String fnGetDealNo(Integer numNo, String afflAbbr) {
         System.out.println("fnGetDealNo==numNo===============================" + Integer.toString(numNo));
             String searNo = commonMapper.selectDealNo(numNo, afflAbbr);

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

@@ -5,8 +5,12 @@ import com.oqpo.api.entity.inoutmng.DeliDtlMgntEntity;
 import com.oqpo.api.entity.inoutmng.DeliInfoMgntEntity;
 import com.oqpo.api.entity.inoutmng.ShmtOdrBaseEntity;
 import com.oqpo.api.entity.inoutmng.ShmtOdrDtlEntity;
+import com.oqpo.api.entity.oper.FileEntity;
 import com.oqpo.api.entity.pomng.PchOdrBaseInfoEntity;
 import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
+import com.oqpo.api.entity.stinfo.BrandEntity;
+import com.oqpo.api.entity.stinfo.SpplyEntity;
+import com.oqpo.api.entity.stinfo.StoreBaseInfoEntity;
 import com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity;
 import com.oqpo.api.entity.stockmng.StckMgntDtlHistEntity;
 import com.oqpo.api.enums.ChgDvsn;
@@ -14,17 +18,24 @@ import com.oqpo.api.enums.InOutCd;
 import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.exception.GlobalException;
 import com.oqpo.api.mapper.CommonMapper;
+import com.oqpo.api.mapper.FileMapper;
 import com.oqpo.api.mapper.inoutmng.ShmtOdrMapper;
 import com.oqpo.api.mapper.pomng.PchOrdMapper;
+import com.oqpo.api.mapper.stinfo.BrandMapper;
+import com.oqpo.api.mapper.stinfo.StoreBaseInfoMapper;
+import com.oqpo.api.mapper.stinfo.SupplyMapper;
 import com.oqpo.api.mapper.stockmng.StockMngMapper;
 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.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.pomng.pchReq.PchReqInfoResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.catalina.StoreManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -49,28 +60,16 @@ public class ShmtOdrService extends CommonService {
     private PchOrdService pchOrdService;
 
     @Autowired
-    private CommonMapper commonMapper;
+    private BrandMapper brandMapper;
 
     @Autowired
-    private CommonService  commonService;
-
-    /*
-    @Autowired
-    private UserMngMapper userMngMapper;
-
-    @Autowired
-    private StockMngMapper stockMngMapper;
-
-    @Autowired
-    private PchReqMapper pchReqMapper;
+    private SupplyMapper supplyMapper;
 
     @Autowired
     private StoreBaseInfoMapper storeBaseInfoMapper;
 
     @Autowired
-    private LoanStateMapper loanStateMapper;
-
-*/
+    private FileMapper fileMapper;
     /*
       출하 대상 그리드 리스트 조회
      */
@@ -301,7 +300,7 @@ public class ShmtOdrService extends CommonService {
                     deliBaseEntity.setDlvSttmtUnqNo(dlvSttmtUnqNo);
                     deliBaseEntity.setSpplyId(null);
                     deliBaseEntity.setSpplyNm(null);
-                    //deliBaseEntity.setDlvRegDt();
+                    deliBaseEntity.setStoreId(entity.getStoreId());
                     deliBaseEntity.setDlvAmt(shmtTotalAmt);
                     deliBaseEntity.setDlvMgrNm(instShmtOdrRequest.getDlvMgrNm());
                     deliBaseEntity.setDlvMgrTelNo(instShmtOdrRequest.getDlvMgrTelNo().replaceAll("-",""));
@@ -390,14 +389,14 @@ public class ShmtOdrService extends CommonService {
                 for ( int m = 0 ; m < stockList.size() ; m++) {
                     StckMgntBaseInfoEntity baseEntity = stockList.get(m);
                     StckMgntDtlHistEntity sourceHist = new StckMgntDtlHistEntity();
-                    String stckMgntDtlNo = fnGetDealNo(32,"");
+                    //String stckMgntDtlNo = fnGetDealNo(32,"");
                     //String stckMgntDtlNo =  commonMapper.selectDealNo(32, "");
 
 
                     //String stckMgntDtlNo1 =  commonMapper.selectDealNo(33, "");
 
-                    sourceHist.setStckMgntDtlNo(stckMgntDtlNo); // 재고관리상세번호
-                    System.out.println("seqno =========>" +sourceHist.getStckMgntDtlNo() + "===" + stckMgntDtlNo );
+                    sourceHist.setStckMgntDtlNo(fnGetDealNo(32,"")); // 재고관리상세번호
+                    //System.out.println("seqno =========>" +sourceHist.getStckMgntDtlNo() + "===" + stckMgntDtlNo );
                     sourceHist.setBrandId(baseEntity.getBrandId());
                     sourceHist.setWhsId(baseEntity.getWhsId());
                     sourceHist.setLocation(baseEntity.getLocation());
@@ -475,8 +474,66 @@ public class ShmtOdrService extends CommonService {
                         .whsAmt(m.getWhsProcInfo() == null ? 0 : m.getWhsProcInfo().getWhsAmt() == null ? 0 : m.getWhsProcInfo().getWhsAmt())
                         .whsDt(m.getWhsProcInfo() == null ? "" : m.getWhsProcInfo().getWhsDt() == null ? "" : m.getWhsProcInfo().getWhsDt() )
                         .whsCnfmNm(m.getWhsProcInfo() == null ? "" : m.getWhsProcInfo().getWhsCnfmNm() == null ? "" : m.getWhsProcInfo().getWhsCnfmNm() )
+                        .dlvSttmtUnqNo(m.getDlvSttmtUnqNo() == null ? "" : m.getDlvSttmtUnqNo())
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
+
+    /* 납품서 정보 */
+    public InvInfoResponse selectInvInfo(String brandId, String  dlvSttmtUnqNo) throws Exception {
+
+        DeliInfoMgntEntity entity = shmtOdrMapper.selectInvInfo(brandId, dlvSttmtUnqNo);
+        List<DeliDtlMgntEntity> dtlEntity = shmtOdrMapper.selectInvDtlList(brandId, dlvSttmtUnqNo);
+
+
+        // 공급사
+        // 배송처 정보
+        BrandEntity brandEntity = brandMapper.selectBrandInfo(brandId);
+
+        if ("DL01".equals(entity.getDeliDvsn())) {
+            //브랜드정보 배송
+            entity.setDlvBsnsRegno(brandEntity.getBsnsRegNo());
+            entity.setDlvNm(brandEntity.getBrandNm());
+            entity.setDlvOwnerNm(brandEntity.getOwnerNm());
+            entity.setDlvAddr(brandEntity.getAddr1() + " " + brandEntity.getAddr2());
+
+        } else {
+            //공급사 배송
+            SpplyEntity dlv_spplyEntity = supplyMapper.selectSpplyInfo(brandId, entity.getSpplyId());
+            entity.setDlvBsnsRegno(dlv_spplyEntity.getBsnsRegNo());
+            entity.setDlvNm(dlv_spplyEntity.getSpplyNm());
+            entity.setDlvOwnerNm(dlv_spplyEntity.getOwnerNm());
+            entity.setDlvAddr(dlv_spplyEntity.getAddr1() + " " + dlv_spplyEntity.getAddr2());
+        }
+
+
+
+
+        //발주처 정보
+        if ("W01".equals(entity.getWhsDvsn())) {
+            //납품창고 본사
+            entity.setPoBsnsRegno(brandEntity.getBsnsRegNo());
+            entity.setPoNm(brandEntity.getBrandNm());
+            entity.setPoOwnerNm(brandEntity.getOwnerNm());
+            entity.setPoAddr(brandEntity.getAddr1() + " " + brandEntity.getAddr2());
+        } else {
+            //납품창고 매장
+            StoreBaseInfoEntity whs_storeBaseInfoEntity = storeBaseInfoMapper.selectStoreInfo(brandId, entity.getStoreId());
+            entity.setPoBsnsRegno(whs_storeBaseInfoEntity.getBsnsRegNo());
+            entity.setPoNm(whs_storeBaseInfoEntity.getStoreNm());
+            entity.setPoOwnerNm(whs_storeBaseInfoEntity.getOwnerNm());
+            entity.setPoAddr(whs_storeBaseInfoEntity.getAddr1() + " " + whs_storeBaseInfoEntity.getAddr2());
+        }
+
+        // 브랜드 로고 brand_logo_file_no
+        List<FileEntity> logFileList = null;
+        if (!"".equals(brandEntity.getBrandLogoFileNo())) {
+            logFileList = fileMapper.selectFileList(brandEntity.getBrandLogoFileNo()) ;
+        } else {
+            logFileList = new ArrayList<FileEntity>();
+        }
+
+        return InvInfoResponse.toDTO(entity,dtlEntity,logFileList);
+    }
 }

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

@@ -8,6 +8,8 @@ import com.oqpo.api.web.dto.request.inoutmng.ShmtOutSearchGridRequest;
 import com.oqpo.api.web.dto.request.pomng.pchOrd.SavePchOrdRequest;
 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.stinfo.brand.BrandInfoResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -82,4 +84,22 @@ public class ShmtOdrController {
         return ResponseEntity.ok(shmtOdrService.selectShmtSearchGridList(shmtOutSearchGridRequest.getSBrandId(), shmtOutSearchGridRequest.getFromDt(), shmtOutSearchGridRequest.getToDt(), shmtOutSearchGridRequest.getSShmtWhsId(), shmtOutSearchGridRequest.getSShmtReqStCd(),  shmtOutSearchGridRequest.getSWhsId(), shmtOutSearchGridRequest.getSItemNm(),  shmtOutSearchGridRequest.toDTO(shmtOutSearchGridRequest)));
     }
 
+
+    /**
+     * 설명 : 납품서정보 정보
+     *
+     * @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 = "dlvSttmtUnqNo", value = "납품서정보", required = true, dataType = "String", paramType = "query")
+    })
+    @ApiOperation(value = "납품서출력 정보")
+    @GetMapping("/info-inv")
+    public ResponseEntity<InvInfoResponse> infoInv(@RequestParam(value = "brandId") String brandId, @RequestParam(value = "dlvSttmtUnqNo") String dlvSttmtUnqNo) throws Exception {
+        return ResponseEntity.ok(shmtOdrService.selectInvInfo(brandId, dlvSttmtUnqNo));
+    }
 }

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

@@ -0,0 +1,118 @@
+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.loanmng.LoanMgntBaseInfoEntity;
+import com.oqpo.api.entity.oper.FileEntity;
+import com.oqpo.api.entity.oper.UserMngEntity;
+import com.oqpo.api.entity.pomng.PchReqBaseInfoEntity;
+import com.oqpo.api.entity.pomng.PchReqDtlPtclEntity;
+import com.oqpo.api.web.dto.response.stinfo.brand.BrandInfoResponse;
+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 InvInfoResponse {
+
+    @ApiModelProperty(value = "발행일") private String dlvRegDt;
+    @ApiModelProperty(value = "납품서번호") private String dlvSttmtUnqNo;
+    @ApiModelProperty(value = "납품일") private String dvlSchDt;
+    @ApiModelProperty(value = "납품담당자") private String dlvMgrNm;  // dlv_mgr_tel_no
+    @ApiModelProperty(value = "납품장소") private String whsAddr;
+    @ApiModelProperty(value = "납품전화번호") private String whsMgrTelNo;
+    @ApiModelProperty(value = "공급-등록번호") private String dlvBsnsRegno;
+    @ApiModelProperty(value = "공급-상호") private String dlvNm;
+    @ApiModelProperty(value = "공급-성명") private String dlvOwnerNm;
+    @ApiModelProperty(value = "공급-주소") private String dlvAddr;
+    @ApiModelProperty(value = "발주-등록번호") private String poBsnsRegno;
+    @ApiModelProperty(value = "발주-상호") private String poNm;
+    @ApiModelProperty(value = "발주-성명") private String poOwnerNm;
+    @ApiModelProperty(value = "발주-주소") private String poAddr;
+
+
+    @ApiModelProperty(value = "납품 품목 정보")
+    private List<InvDtlInfo> invDtlInfoList;
+
+    @ApiModelProperty(value = "로그파일 정보")
+    private List<FileLogInfo> fileLogNoList;
+
+    public static InvInfoResponse toDTO(DeliInfoMgntEntity entity, List<DeliDtlMgntEntity>  dtlList, List<FileEntity>  logFileList) {
+        if (entity == null) return null;
+        return InvInfoResponse.builder()
+                .dlvRegDt(entity.getDlvRegDt() == null ? "" : entity.getDlvRegDt())
+                .dlvSttmtUnqNo(entity.getDlvSttmtUnqNo() == null ? "" : entity.getDlvSttmtUnqNo())
+                .dvlSchDt(entity.getDlvSchDt() == null ? "" :  entity.getDlvSchDt())
+                .dlvMgrNm(entity.getDlvMgrNm() == null ? "" : entity.getDlvMgrNm() + "( " + entity.getDlvMgrTelNo() + " )")
+                .whsAddr(entity.getWhsAddr() == null ? "" : entity.getWhsAddr())
+                .whsMgrTelNo(entity.getWhsMgrTelNo() == null ? "" : entity.getWhsMgrTelNo())
+                .dlvBsnsRegno(entity.getDlvBsnsRegno() == null ? "" : entity.getDlvBsnsRegno())
+                .dlvNm(entity.getDlvNm() == null ? "" : entity.getDlvNm())
+                .dlvOwnerNm(entity.getDlvOwnerNm() == null ? "" : entity.getDlvOwnerNm())
+                .dlvAddr(entity.getDlvAddr() == null ? "" : entity.getDlvAddr())
+                .poBsnsRegno(entity.getPoBsnsRegno() == null ? "" : entity.getPoBsnsRegno())
+                .poNm(entity.getPoNm() == null ? "" : entity.getPoNm())
+                .poOwnerNm(entity.getPoOwnerNm() == null ? "" : entity.getPoOwnerNm())
+                .poAddr(entity.getPoAddr() == null ? "" : entity.getPoAddr())
+                .fileLogNoList(logFileList.stream()
+                        .map(m -> InvInfoResponse.FileLogInfo.builder()
+                                .fileNo(m.getFileNo())
+                                .fileSeq(m.getFileSeq())
+                                .filePath(m.getFilePath())
+                                .fileNm(m.getFileNm())
+                                .fileOrgNm(m.getFileOrgNm())
+                                .build())
+                        .collect(Collectors.toList()))
+                .invDtlInfoList(dtlList.stream()
+                        .map(m -> InvInfoResponse.InvDtlInfo.builder()
+                                .pchPodrUnqNo(m.getPchPodrUnqNo() == null ? "" : m.getPchPodrUnqNo())
+                                .itemId(m.getItemId() == null ? "" :m.getItemId())
+                                .itemNm(m.getItemNm() == null ? "" :m.getItemNm())
+                                .podrQty(m.getPodrQty() == null ? 0 :m.getPodrQty())
+                                .dlvQty(m.getDlvQty() == null ? 0 :m.getDlvQty())
+                                .expryDate(m.getExpryDate() == null ? "" : m.getExpryDate())
+                                .build())
+                        .collect(Collectors.toList()))
+                .build();
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class InvDtlInfo {
+        @ApiModelProperty(value = "구매발주번호") private String pchPodrUnqNo;
+        @ApiModelProperty(value = "품목아이디") private String itemId;
+        @ApiModelProperty(value = "품목명") private String itemNm;
+        @ApiModelProperty(value = "발주수량") private Integer podrQty;
+        @ApiModelProperty(value = "납품수량") private Integer dlvQty;
+        @ApiModelProperty(value = "유통기간") private String expryDate;
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class FileLogInfo {
+        @ApiModelProperty(value = "파일번호")
+        private String fileNo;
+
+        @ApiModelProperty(value = "파일순번")
+        private Integer fileSeq;
+
+        @ApiModelProperty(value = "파일경로")
+        private String filePath;
+
+        @ApiModelProperty(value = "파일명")
+        private String fileNm;
+
+        @ApiModelProperty(value = "원파일명")
+        private String fileOrgNm;
+    }
+}

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

@@ -33,6 +33,8 @@ public class ShmtOutSearchListResponse {
     @ApiModelProperty(value = "입고금액") private Integer whsAmt;
     @ApiModelProperty(value = "입고일자") private String whsDt;
     @ApiModelProperty(value = "입고담당자") private String whsCnfmNm;
+    @ApiModelProperty(value = "납품서번호") private String dlvSttmtUnqNo;
+
 
 
 

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

@@ -136,13 +136,13 @@
         (dlv_sttmt_unq_no, spply_id, spply_nm, dlv_reg_dt, dlv_amt
         , dlv_mgr_nm, dlv_mgr_tel_no, dlv_mgr_emal, dlv_mgr_mbl_no, vndr_tel_no
         , dlv_st_cd, podr_reg_dt, dlv_req_dt, dlv_sch_dt, dlv_cmplt_dt
-        , whs_id, location, whs_dvsn, brand_id
+        , whs_id, location, whs_dvsn, brand_id,store_id
         , sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
         VALUES
         (#{entity.dlvSttmtUnqNo}, #{entity.spplyId}, #{entity.spplyNm}, date_format(now(),'%Y%m%d'), #{entity.dlvAmt}
         , #{entity.dlvMgrNm}, #{entity.dlvMgrTelNo}, #{entity.dlvMgrEmal}, #{entity.dlvMgrMblNo}, #{entity.vndrTelNo}
         , #{entity.dlvStCd}, #{entity.podrRegDt}, #{entity.dlvReqDt}, #{entity.dlvSchDt}, #{entity.dlvCmpltDt}
-        , #{entity.whsId}, #{entity.location}, #{entity.whsDvsn}, #{entity.brandId}
+        , #{entity.whsId}, #{entity.location}, #{entity.whsDvsn}, #{entity.brandId}, #{entity.storeId}
         , NOW(), #{userId}, NOW(), #{userId})
     </insert>
 
@@ -171,7 +171,8 @@
                ,ptcl.item_nm as 'shmtOdrDtlInfo.item_nm'  , base.whs_id, fn_whs_nm(base.brand_id, base.whs_id) as whs_nm
                ,base.location, fn_whs_location_nm(base.brand_id, base.whs_id, base.location) as location_nm  , ptcl.shmt_qty as 'shmtOdrDtlInfo.shmt_qty'
                ,ptcl.shmt_amt as 'shmtOdrDtlInfo.shmt_amt' , nvl(proc.whs_qty,0) as 'whsProcInfo.whs_qty' , nvl(proc.whs_amt,0) as 'whsProcInfo.whs_amt'
-                 ,date_format(proc.whs_dt,'%Y.%m.%d') as 'whsProcInfo.whs_dt', proc.whs_cnfm_nm as 'whsProcInfo.whs_cnfm_nm'
+               ,date_format(proc.whs_dt,'%Y.%m.%d') as 'whsProcInfo.whs_dt', proc.whs_cnfm_nm as 'whsProcInfo.whs_cnfm_nm'
+               ,deli.dlv_sttmt_unq_no
         from  shmt_odr_base_info base
          join shmt_odr_dtl_ptcl ptcl on base.shmt_req_unq_no = ptcl.shmt_req_unq_no
          join deli_dtl_ptcl deli on deli.pch_podr_unq_no = ptcl.pch_podr_unq_no and deli.pch_podr_dtl_no = ptcl.pch_podr_dtl_no
@@ -239,4 +240,29 @@
         </if>
     </select>
 
+    <select id="selectInvInfo" resultType="com.oqpo.api.entity.inoutmng.DeliInfoMgntEntity">
+        select  date_format(deli.dlv_reg_dt,'%Y.%m.%d') as dlv_reg_dt, deli.dlv_sttmt_unq_no, date_format(deli.dlv_sch_dt,'%Y.%m.%d') as dvl_sch_dt
+            , deli.dlv_mgr_nm,  fn_get_telno( deli.dlv_mgr_tel_no) as dlv_mgr_tel_no
+            , fn_whs_nm(deli.brand_id, deli.whs_id) as whs_nm,  fn_whs_location_nm(deli.brand_id, deli.whs_id, deli.location) as location_nm
+            , whs.mgr_tel_no
+            , case when  deli.spply_id is null or deli.spply_id = ''  then 'DL01' else 'DL02'  end as deli_dvsn  -- 배송주체
+            , deli.whs_dvsn -- 납품정보
+            , concat(whs.addr1 ,' ',whs.addr2) as whs_addr
+            , fn_get_telno(whs.mgr_tel_no) as whs_mgr_tel_no
+        from   deli_info_mgnt deli
+        join   whs_mgnt_base_info whs on whs.brand_id = deli.brand_id and whs.whs_id = deli.whs_id
+        where  deli.brand_id = #{brandId}
+        and    deli.dlv_sttmt_unq_no = #{dlvSttmtUnqNo}
+    </select>
+
+    <select id="selectInvDtlList" resultType="com.oqpo.api.entity.inoutmng.DeliDtlMgntEntity">
+        select ptcl.pch_podr_unq_no, ptcl.item_id, ptcl.item_nm, ptcl.podr_qty, ptcl.dlv_qty, date_format(ptcl.expry_date,'%Y.%m.%d') as expry_date
+        from deli_info_mgnt info
+            , deli_dtl_ptcl ptcl
+        where 1 = 1
+        and info.dlv_sttmt_unq_no = ptcl.dlv_sttmt_unq_no
+        and info.brand_id = #{brandId}
+        and info.dlv_sttmt_unq_no = #{dlvSttmtUnqNo}
+    </select>
+
 </mapper>

src/main/resources/mybatis/sqlmaps/stockmng/StockMng.xml

@@ -315,7 +315,7 @@
              rtn_mgnt_unq_no, chg_dvsn, relation_no, sys_reg_dttm,
              sys_reg_id, sys_chg_dttm, sys_chg_id)
         VALUES
-        <foreach collection="gridInsertData" item="item" separator=";">
+        <foreach collection="gridInsertData" item="item" separator=",">
             (#{item.stckMgntDtlNo}, #{item.brandId}, #{item.whsId}, #{item.location}, #{item.itemId},
              #{item.itemNm}, #{item.inoutCd}, #{item.inoutQty}, #{item.whsMgntUnqNo}, #{item.rtnMgntUnqNo}, #{item.chgDvsn}, #{item.relationNo},
              NOW(), #{userId}, NOW(), #{userId})