출하지시 부분 작업

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

@@ -0,0 +1,38 @@
+package com.oqpo.api.entity.inoutmng;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class DeliDtlMgntEntity implements Serializable {
+    private static final long serialVersionUID = -3590936033715917450L;
+
+    private String dlvSttmtUnqNo;
+    private String dlvSttmtDtlNo;
+    private String pchPodrUnqNo;
+    private String pchPodrDtlNo;
+    private String pchReqUnqNo;
+    private String pchReqDtlNo;
+    private String itemId;
+    private String itemNm;
+    private String unit;
+    private Integer unitAmt;
+    private String priceUnit;
+    private Integer podrQty;
+    private Integer dlvQty;
+    private Integer podrAmt;
+    private Integer dlvAmt;
+    private String expryDate;
+    private String delayYn;
+    private String delayRsn;
+    private String sysRegDttm;
+    private String sysRegId;
+    private String sysChgDttm;
+    private String sysChgId;
+
+}

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

@@ -0,0 +1,45 @@
+package com.oqpo.api.entity.inoutmng;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class DeliInfoMgntEntity implements Serializable {
+    private static final long serialVersionUID = -3590936033715917450L;
+
+    private String dlvSttmtUnqNo;
+    private String spplyId;
+    private String spplyNm;
+    private String dlvRegDt;
+    private Integer dlvAmt;
+    private String dlvMgrNm;
+    private String dlvMgrTelNo;
+    private String dlvMgrEmal;
+    private String dlvMgrMblNo;
+    private String vndrTelNo;
+    private String dlvStCd;
+    private String dlvStNm;
+    private String podrRegDt;
+    private String dlvReqDt;
+    private String dlvSchDt;
+    private String dlvCmpltDt;
+    private String whsId;
+    private String whsNm;
+    private String location;
+    private String locationNm;
+    private String whsDvsn;
+    private String whsDvsnNm;
+    private String brandId;
+    private String brandNm;
+    private String sysRegDttm;
+    private String sysRegId;
+    private String sysChgDttm;
+    private String sysChgId;
+    private String dlvDesc;
+
+}

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

@@ -0,0 +1,47 @@
+package com.oqpo.api.entity.inoutmng;
+
+import com.oqpo.api.entity.oper.AfflSaleInfoEntity;
+import com.oqpo.api.entity.oper.FileEntity;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+public class ShmtOdrBaseEntity implements Serializable {
+    private static final long serialVersionUID = -3590936033715917450L;
+
+    private String shmtReqUnqNo;
+    private String shmtReqStCd;
+    private String shmtReqStNm;
+    private String shmtRegDt;
+    private String shmtWhsId;
+    private String shmtWhsNm;
+    private String shmtLocation;
+    private String shmtLocationNm;
+    private String whsDvsn;
+    private String whsDvsnNm;
+    private String brandId;
+    private String brandNm;
+    private String storeId;
+    private String storeNm;
+    private String podrDvsn;
+    private String podrDvsnNm;
+    private Integer itemQty;
+    private Integer shmtTotalAmt;
+    private String podrMgrNm;
+    private String dlvReqDt;
+    private String whsId;
+    private String whsNm;
+    private String location;
+    private String locationNm;
+    private String sysRegDttm;
+    private String sysRegId;
+    private String sysChgDttm;
+    private String sysChgId;
+
+}

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

@@ -0,0 +1,36 @@
+package com.oqpo.api.entity.inoutmng;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class ShmtOdrDtlEntity implements Serializable {
+    private static final long serialVersionUID = -3590936033715917450L;
+
+    private String shmtReqUnqNo;
+    private String shmtReqDtlNo;
+    private String itemId;
+    private String itemNm;
+    private Integer unitAmt;
+    private String unit;
+    private String unitNm;
+    private Integer podrQty;
+    private Integer podrAmt;
+    private Integer shmtQty;
+    private Integer shmtAmt;
+    private String expryDate;
+    private String pchPodrUnqNo;
+    private String pchPodrDtlNo;
+    private String pchReqUnqNo;
+    private String pchReqDtlNo;
+    private String sysRegDttm;
+    private String sysRegId;
+    private String sysChgDttm;
+    private String sysChgId;
+
+}

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

@@ -52,7 +52,7 @@ public class PchOdrBaseInfoEntity implements Serializable {
     private String sysChgDttm;
     private String sysChgId;
     private String storeId;
-
+    private String deliTelNo;
     private PchOdrDtlPtclEntity pchOdrDtlInfo ;
 
 }

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

@@ -47,6 +47,12 @@ public class PchOdrDtlPtclEntity implements Serializable {
     private String podrDtlStNm;
     private Integer podrStatusCnt;
 
+    private Integer shmtQty;
+    private Integer stckQty;
+    private String expryYn;
+    private Integer expryPeriod;
+    private String expryDate;
+
 
 
 }

src/main/java/com/oqpo/api/entity/stockmng/StckMgntBaseInfoEntity.java

@@ -57,4 +57,7 @@ public class StckMgntBaseInfoEntity implements Serializable {
     @ApiModelProperty(value = "매장명")
     private String storeNm;
 
+    @ApiModelProperty(value = "관련번호")
+    private String relationNo;
+
 }

src/main/java/com/oqpo/api/enums/SystemMessageCode.java

@@ -38,7 +38,9 @@ public enum SystemMessageCode {
     ERR_NOEQSTORE (40012, "구매요청건의 납품매장과 발주요청은 납품매장이 서로 다릅니다.", HttpStatus.BAD_REQUEST),
     ERR_NOEQSPPLY (40013, "구매요청건의 납품공급업체와 발주요청한 공급업체가 서로 다릅니다.", HttpStatus.BAD_REQUEST),
     ERR_DLV001 (40014, "배송구분은 공급사 배송이되야 합니다.", HttpStatus.BAD_REQUEST),
-    ERR_OUTWHS (40015, "출고창고 정보가 없습니다.", HttpStatus.BAD_REQUEST)
+    ERR_OUTWHS (40015, "출고창고 정보가 없습니다.", HttpStatus.BAD_REQUEST),
+    ERR_POSHNONQTY (40016, "발주 수량보다 출고 수량이 많습니다.", HttpStatus.BAD_REQUEST),
+    ERR_NONEXPRY (40017, "유통기한을 입력해주세요!", HttpStatus.BAD_REQUEST)
     ;
 
 

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

@@ -0,0 +1,51 @@
+package com.oqpo.api.mapper.inoutmng;
+
+
+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.pomng.PchOdrBaseInfoEntity;
+import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
+import com.oqpo.api.web.dto.request.GridRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ShmtOdrMapper {
+    List<PchOdrBaseInfoEntity> selectShmtTargetOdrGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sShmtWhsId") String sShmtWhsId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm, GridRequest gridRequest )throws Exception;
+    int selectShmtTargetOdrGridCnt(@Param("sBrandId") String sBrandId,@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sShmtWhsId") String sShmtWhsId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm )throws Exception;
+
+    int insertShmtOdrBase(@Param("userId") String userId, ShmtOdrBaseEntity entity)throws Exception;
+    int insertShmtOdrDtl(@Param("userId") String userId, List<ShmtOdrDtlEntity> gridInsertData)throws Exception;
+
+    List<PchOdrBaseInfoEntity> selectShmtJobDataList(@Param("brandId") String brandId, List<PchOdrDtlPtclEntity> gridInsertData )throws Exception;
+
+    int insertDeliInfoMngt(@Param("userId") String userId, DeliInfoMgntEntity entity)throws Exception;
+    int insertDeliDtlPtcl(@Param("userId") String userId, List<DeliDtlMgntEntity> gridInsertData)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;
+
+    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/mapper/pomng/PchOrdMapper.java

@@ -22,8 +22,8 @@ public interface PchOrdMapper {
     int insertPchOdrBaseInfo(@Param("userId") String userId, PchOdrBaseInfoEntity entity)throws Exception;
     int insertPchOdrDtlPtcl(@Param("userId") String userId, List<PchOdrDtlPtclEntity> gridInsertData)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);
+    List<PchOdrBaseInfoEntity>  selectPchOdrGridList(@Param("brandId") String brandId, @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("brandId") String brandId, @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);
@@ -33,5 +33,10 @@ public interface PchOrdMapper {
     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;
 
+    int updateChangeStPodrDtl(@Param("userId") String userId, List<PchOdrDtlPtclEntity> gridUpdateData) throws Exception;
+    int updateChgMultiPodrStCd(@Param("userId") String userId, List<PchOdrBaseInfoEntity> gridUpdateData) throws Exception;
+
+
+
 
 }

src/main/java/com/oqpo/api/mapper/stockmng/StockMngMapper.java

@@ -54,5 +54,8 @@ public interface StockMngMapper {
 
     int updateStckPoUseQty(@Param("userId") String userId, @Param("brandId") String brandId, @Param("whsId") String whsId, @Param("location") String location, List<StckMgntBaseInfoEntity> gridUpdateData) throws Exception;
     int updateMinusStckPoUseQty(@Param("userId") String userId, @Param("brandId") String brandId, @Param("whsId") String whsId, @Param("location") String location, List<StckMgntBaseInfoEntity> gridUpdateData) throws Exception;
+    int updateMinStockQty(@Param("userId") String userId, List<StckMgntBaseInfoEntity> gridUpdateData) throws Exception;
+
+    int insertMultiStckMgntDtlHist(@Param("userId") String userId, List<StckMgntDtlHistEntity> gridInsertData) throws Exception;
 
 }

src/main/java/com/oqpo/api/service/CommonService.java

@@ -4,6 +4,8 @@ import com.oqpo.api.mapper.CommonMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @Slf4j
@@ -11,12 +13,21 @@ public class CommonService {
     @Autowired
     private CommonMapper commonMapper;
 
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public String fnGetKeyNo(Integer numNo) {
         return commonMapper.selectKeyNo(numNo);
     }
 
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public String fnGetDealNo(Integer numNo, String afflAbbr) {
-        return commonMapper.selectDealNo(numNo, afflAbbr);
+        //System.out.println("fnGetDealNo==numNo===============================" + Integer.toString(numNo));
+            String searNo = commonMapper.selectDealNo(numNo, afflAbbr);
+            //String searNo1 = commonMapper.selectDealNo(numNo, afflAbbr);
+            //String searNo2 = commonMapper.selectDealNo(numNo, afflAbbr);
+        //System.out.println("fnGetDealNo======searNo===========================" + searNo);
+        //System.out.println("fnGetDealNo======searNo===========================" + searNo1);
+        //System.out.println("fnGetDealNo======searNo===========================" + searNo2);
+        return searNo;
     }
 
     public int fnCalculateGridTotal(int gridSize, int gridRecords) {

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

@@ -0,0 +1,439 @@
+package com.oqpo.api.service.inoutmng;
+
+
+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.pomng.PchOdrBaseInfoEntity;
+import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
+import com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity;
+import com.oqpo.api.entity.stockmng.StckMgntDtlHistEntity;
+import com.oqpo.api.enums.ChgDvsn;
+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.inoutmng.ShmtOdrMapper;
+import com.oqpo.api.mapper.pomng.PchOrdMapper;
+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.ShmtOdrSearchListResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class ShmtOdrService extends CommonService {
+    @Autowired
+    private ShmtOdrMapper shmtOdrMapper;
+
+    @Autowired
+    private StockMngMapper stockMngMapper;
+
+    @Autowired
+    private PchOrdMapper pchOrdMapper;
+
+    @Autowired
+    private PchOrdService pchOrdService;
+
+    @Autowired
+    private CommonMapper commonMapper;
+
+    /*
+    @Autowired
+    private UserMngMapper userMngMapper;
+
+    @Autowired
+    private StockMngMapper stockMngMapper;
+
+    @Autowired
+    private PchReqMapper pchReqMapper;
+
+    @Autowired
+    private StoreBaseInfoMapper storeBaseInfoMapper;
+
+    @Autowired
+    private LoanStateMapper loanStateMapper;
+
+*/
+    /*
+      출하 대상 그리드 리스트 조회
+     */
+    public GridResponse selectShmtTargetOdrGridList(String sBrandId, String fromDt, String toDt, String sShmtWhsId, String sWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        fromDt = fromDt == null ? null : fromDt.replace(".", "");
+        toDt = toDt == null ? null : toDt.replace(".", "");
+
+        int gridRecords = shmtOdrMapper.selectShmtTargetOdrGridCnt( sBrandId, fromDt, toDt, sShmtWhsId, sWhsId, sItemNm );
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<PchOdrBaseInfoEntity> entities = shmtOdrMapper.selectShmtTargetOdrGridList(sBrandId, fromDt, toDt, sShmtWhsId, sWhsId, sItemNm, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> ShmtOdrSearchListResponse.builder()
+                        .viewCd("R")
+                        .brandId(m.getBrandId() == null ? "" : m.getBrandId())
+                        .brandNm(m.getBrandNm() == null ? "" : m.getBrandNm())
+                        .pchPodrUnqNo(m.getPchPodrUnqNo() == null ? "" : m.getPchPodrUnqNo())
+                        .pchPodrDtlNo(m.getPchOdrDtlInfo() == null ? "" : m.getPchOdrDtlInfo().getPchPodrDtlNo() == null ? "" :  m.getPchOdrDtlInfo().getPchPodrDtlNo() )
+                        .itemId(m.getPchOdrDtlInfo() == null ? "" : m.getPchOdrDtlInfo().getItemId() == null  ? "" : m.getPchOdrDtlInfo().getItemId())
+                        .itemNm(m.getPchOdrDtlInfo() == null ? "" : m.getPchOdrDtlInfo().getItemNm() == null ? "" : m.getPchOdrDtlInfo().getItemNm())
+                        .whsId(m.getWhsId() == null ? "" : m.getWhsId())
+                        .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm() + " - " + m.getLocationNm())
+                        .location(m.getLocation() == null ? "" : m.getLocation())
+                        .unitAmt(m.getPchOdrDtlInfo() == null ? 0 : m.getPchOdrDtlInfo().getUnitAmt() == null ? 0 : m.getPchOdrDtlInfo().getUnitAmt())
+                        .podrQty(m.getPchOdrDtlInfo() == null ? 0 : m.getPchOdrDtlInfo().getPodrQty() == null ? 0 : m.getPchOdrDtlInfo().getPodrQty())
+                        .shmtQty(m.getPchOdrDtlInfo() == null ? 0 : m.getPchOdrDtlInfo().getShmtQty() == null ? 0 : m.getPchOdrDtlInfo().getShmtQty())
+                        .stckQty(m.getPchOdrDtlInfo() == null ? 0 : m.getPchOdrDtlInfo().getStckQty() == null ? 0 : m.getPchOdrDtlInfo().getStckQty())
+                        .expryYn(m.getPchOdrDtlInfo() == null ? "" : m.getPchOdrDtlInfo().getExpryYn() == null ? "" :  m.getPchOdrDtlInfo().getExpryYn() )
+                        .expryPeriod(m.getPchOdrDtlInfo() == null ? 0 : m.getPchOdrDtlInfo().getExpryPeriod() == null ? 0 : m.getPchOdrDtlInfo().getExpryPeriod())
+                        .expryDate(m.getPchOdrDtlInfo() == null ? "" : m.getPchOdrDtlInfo().getExpryDate() == null ? "" : m.getPchOdrDtlInfo().getExpryDate())
+                        .podrAmt(m.getPchOdrDtlInfo() == null ? 0 : m.getPchOdrDtlInfo().getPodrAmt() == null ? 0 : m.getPchOdrDtlInfo().getPodrAmt())
+                        .dlvReqDt(m.getDlvReqDt() == null ? "" : m.getDlvReqDt())
+                        .shmtWhsId(m.getShmtWhsId() == null ? "" : m.getShmtWhsId())
+                        .shmtLocation(m.getShmtLocation() == null ? "" : m.getShmtLocation())
+                        .shmtWhsNm(m.getShmtWhsNm() == null ? "" : m.getShmtWhsNm() + " - " + m.getShmtLocationNm())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
+    /*
+      출하지시 저장
+     */
+    @Transactional
+    public void instShmtOdr(String userId, InstShmtOdrRequest instShmtOdrRequest) throws Exception {
+        try {
+                // 출하창고 + 납품장소 동일여부 체크
+                // 출하창고의 재고 와 출하수량 비교처리
+                // 발주수량은 출하수량보다 크거나 같아야함
+                // 유통기한 품목에 대해서는 유통기한일자 기입 필수
+
+                // 출하 헤더 생성
+                // 출하 상세 생성
+                // 납품서 헤더 생성
+                // 납품서 상세 생성성
+            List<PchOdrDtlPtclEntity> gridInsertData = instShmtOdrRequest.toCodeEntities(instShmtOdrRequest.getGridInsertData());
+            List<PchOdrBaseInfoEntity> jobList = shmtOdrMapper.selectShmtJobDataList(instShmtOdrRequest.getBrandId(), gridInsertData) ;
+            List<StckMgntBaseInfoEntity> stockList = new ArrayList<StckMgntBaseInfoEntity>();
+            String whsId = "";
+            String location = "";
+            String shmtWhsId = "";
+            String shmtLocation = "";
+            int itemQty = 0 ;
+            int shmtTotalAmt = 0 ;
+            String expryDate = "";
+            int shmtQty = 0 ;
+            String shmtReqUnqNo = "";
+            String dlvSttmtUnqNo = "";
+
+
+            ShmtOdrBaseEntity shmtBaseEntity = new ShmtOdrBaseEntity();
+            List<ShmtOdrDtlEntity> shmtDtlList = new ArrayList<ShmtOdrDtlEntity>() ;
+
+            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;
+                    }
+                }
+
+                if (shmtWhsId.equals(entity.getShmtWhsId()) && shmtLocation.equals(entity.getShmtLocation()) && whsId.equals(entity.getWhsId()) &&  location.equals(entity.getLocation())) {
+                    // 추가 작업
+                    itemQty = itemQty + 1 ;
+                    shmtTotalAmt = shmtTotalAmt + (entity.getPchOdrDtlInfo().getUnitAmt() * shmtQty);
+                    shmtBaseEntity.setItemQty(itemQty);
+                    shmtBaseEntity.setShmtTotalAmt(shmtTotalAmt);
+                    deliBaseEntity.setDlvAmt(shmtTotalAmt);
+
+                    ShmtOdrDtlEntity inaddDtlEntity = new ShmtOdrDtlEntity();
+                    inaddDtlEntity.setShmtReqUnqNo(shmtReqUnqNo);
+                    int dtlNo = itemQty * 10 ;
+                    inaddDtlEntity.setShmtReqDtlNo( Integer.toString(dtlNo));
+                    inaddDtlEntity.setItemId(entity.getPchOdrDtlInfo().getItemId());
+                    inaddDtlEntity.setItemNm(entity.getPchOdrDtlInfo().getItemNm());
+                    inaddDtlEntity.setUnitAmt(entity.getPchOdrDtlInfo().getUnitAmt());
+                    inaddDtlEntity.setUnit(entity.getPchOdrDtlInfo().getUnit());
+                    inaddDtlEntity.setPodrQty(entity.getPchOdrDtlInfo().getPodrQty());
+                    inaddDtlEntity.setPodrAmt(entity.getPchOdrDtlInfo().getPodrAmt());
+                    inaddDtlEntity.setShmtQty(shmtQty);
+                    inaddDtlEntity.setShmtAmt(shmtQty * entity.getPchOdrDtlInfo().getUnitAmt());
+                    inaddDtlEntity.setExpryDate(expryDate);
+                    inaddDtlEntity.setPchPodrUnqNo(entity.getPchPodrUnqNo());
+                    inaddDtlEntity.setPchPodrDtlNo(entity.getPchOdrDtlInfo().getPchPodrDtlNo());
+                    inaddDtlEntity.setPchReqUnqNo(entity.getPchOdrDtlInfo().getPchReqUnqNo());
+                    inaddDtlEntity.setPchReqDtlNo(entity.getPchOdrDtlInfo().getPchReqDtlNo());
+
+                    shmtDtlList.add(inaddDtlEntity);
+
+                    //재고 수량정보 기입
+                    StckMgntBaseInfoEntity stckEntity = new StckMgntBaseInfoEntity();
+                    /*
+                    String dupYn = "N";
+                    for (int ski = 0 ; ski < stockList.size() ; ski++) {
+                        StckMgntBaseInfoEntity tmpEntity = stockList.get(ski);
+                        if (entity.getBrandId().equals(tmpEntity.getBrandId()) && entity.getShmtWhsId().equals(tmpEntity.getWhsId())
+                                 && entity.getShmtLocation().equals(tmpEntity.getLocation()) && entity.getPchOdrDtlInfo().getItemId().equals(tmpEntity.getItemId())) {
+                            int tmpStckQty = tmpEntity.getStckQty() ;
+                            stockList.get(ski).setStckQty(tmpStckQty + shmtQty);
+                            dupYn = "Y";
+                            System.out.println("for============================" + Integer.toString(ski) + stockList.get(ski).getStckQty());
+                            break;
+                        }
+                    }
+                    if ("N".equals(dupYn)) {
+                    */
+                        stckEntity.setBrandId(entity.getBrandId());
+                        stckEntity.setWhsId(entity.getShmtWhsId());
+                        stckEntity.setLocation(entity.getShmtLocation());
+                        stckEntity.setItemId(entity.getPchOdrDtlInfo().getItemId());
+                        stckEntity.setStckQty(shmtQty);
+                        stckEntity.setRelationNo(shmtReqUnqNo);
+                        stockList.add(stckEntity);
+                  //  }
+
+                    //납품서 상세 생성
+                    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);
+
+
+                } else {
+                    // 신규로 출하건 생성함  //select fn_get_dealno(16, '') as col_cmd_unq_no
+                    if (shmtDtlList.size() > 0) {
+                        shmtOdrMapper.insertShmtOdrBase(userId,shmtBaseEntity );
+                        shmtOdrMapper.insertShmtOdrDtl(userId, shmtDtlList) ;
+
+                        shmtOdrMapper.insertDeliInfoMngt(userId,deliBaseEntity );
+                        shmtOdrMapper.insertDeliDtlPtcl(userId, deliDtlList) ;
+                        itemQty = 0 ;
+                        shmtTotalAmt = 0 ;
+                    }
+                    itemQty = 1 ;
+                    shmtTotalAmt = entity.getPchOdrDtlInfo().getUnitAmt() * shmtQty;
+
+                    whsId = entity.getWhsId();
+                    location = entity.getLocation();
+                    shmtWhsId = entity.getShmtWhsId();
+                    shmtLocation = entity.getShmtLocation();
+
+                    shmtReqUnqNo = fnGetDealNo(16,"");  // 출하지시번호
+                    dlvSttmtUnqNo = fnGetDealNo(15,""); // 납품서번호
+
+                    // 출하지시
+                    shmtBaseEntity = new ShmtOdrBaseEntity();
+                    shmtDtlList = new ArrayList<ShmtOdrDtlEntity>() ;
+                    ShmtOdrDtlEntity inDtlEntity = new ShmtOdrDtlEntity();
+
+                    //납품서정보
+                    deliBaseEntity = new DeliInfoMgntEntity();
+                    deliDtlList = new ArrayList<DeliDtlMgntEntity>() ;
+                    DeliDtlMgntEntity deliDtlEntity = new DeliDtlMgntEntity();
+
+                    shmtBaseEntity.setShmtReqUnqNo(shmtReqUnqNo);
+                    shmtBaseEntity.setShmtReqStCd("SHM1");
+                    shmtBaseEntity.setShmtWhsId(entity.getShmtWhsId());
+                    shmtBaseEntity.setShmtLocation(entity.getShmtLocation());
+                    shmtBaseEntity.setWhsDvsn("W01");
+                    shmtBaseEntity.setBrandId(entity.getBrandId());
+                    shmtBaseEntity.setStoreId(entity.getStoreId());
+                    shmtBaseEntity.setPodrDvsn("OD01");
+                    shmtBaseEntity.setItemQty(itemQty);
+                    shmtBaseEntity.setShmtTotalAmt(shmtTotalAmt);
+                    shmtBaseEntity.setPodrMgrNm(entity.getPodrMgrNm());
+                    shmtBaseEntity.setDlvReqDt(entity.getDlvReqDt().replaceAll("\\.",""));
+                    shmtBaseEntity.setWhsId(entity.getWhsId());
+                    shmtBaseEntity.setLocation(entity.getLocation());
+
+                    //납품서 데이타 생성
+                    deliBaseEntity.setDlvSttmtUnqNo(dlvSttmtUnqNo);
+                    deliBaseEntity.setSpplyId(null);
+                    deliBaseEntity.setSpplyNm(null);
+                    //deliBaseEntity.setDlvRegDt();
+                    deliBaseEntity.setDlvAmt(shmtTotalAmt);
+                    deliBaseEntity.setDlvMgrNm(instShmtOdrRequest.getDlvMgrNm());
+                    deliBaseEntity.setDlvMgrTelNo(instShmtOdrRequest.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(instShmtOdrRequest.getDlvSchDt().replaceAll("\\.",""));
+                    deliBaseEntity.setDlvCmpltDt(null);
+                    deliBaseEntity.setWhsId(entity.getWhsId());
+                    deliBaseEntity.setLocation(entity.getLocation());
+                    deliBaseEntity.setWhsDvsn("W01");
+                    deliBaseEntity.setBrandId(instShmtOdrRequest.getBrandId());
+
+                    //출하지시 상세 생성
+                    ShmtOdrDtlEntity inaddDtlEntity = new ShmtOdrDtlEntity();
+                    inaddDtlEntity.setShmtReqUnqNo(shmtReqUnqNo);
+                    inaddDtlEntity.setShmtReqDtlNo("10");
+                    inaddDtlEntity.setItemId(entity.getPchOdrDtlInfo().getItemId());
+                    inaddDtlEntity.setItemNm(entity.getPchOdrDtlInfo().getItemNm());
+                    inaddDtlEntity.setUnitAmt(entity.getPchOdrDtlInfo().getUnitAmt());
+                    inaddDtlEntity.setUnit(entity.getPchOdrDtlInfo().getUnit());
+                    inaddDtlEntity.setPodrQty(entity.getPchOdrDtlInfo().getPodrQty());
+                    inaddDtlEntity.setPodrAmt(entity.getPchOdrDtlInfo().getPodrAmt());
+                    inaddDtlEntity.setShmtQty(shmtQty);
+                    inaddDtlEntity.setShmtAmt(shmtQty * entity.getPchOdrDtlInfo().getUnitAmt());
+                    inaddDtlEntity.setExpryDate(expryDate);
+                    inaddDtlEntity.setPchPodrUnqNo(entity.getPchPodrUnqNo());
+                    inaddDtlEntity.setPchPodrDtlNo(entity.getPchOdrDtlInfo().getPchPodrDtlNo());
+                    inaddDtlEntity.setPchReqUnqNo(entity.getPchOdrDtlInfo().getPchReqUnqNo());
+                    inaddDtlEntity.setPchReqDtlNo(entity.getPchOdrDtlInfo().getPchReqDtlNo());
+
+                    shmtDtlList.add(inaddDtlEntity);
+
+                    StckMgntBaseInfoEntity stckEntity = new StckMgntBaseInfoEntity();
+                    stckEntity.setBrandId(entity.getBrandId());
+                    stckEntity.setWhsId(entity.getShmtWhsId());
+                    stckEntity.setLocation(entity.getShmtLocation());
+                    stckEntity.setItemId(entity.getPchOdrDtlInfo().getItemId());
+                    stckEntity.setStckQty(shmtQty);
+                    stckEntity.setRelationNo(shmtReqUnqNo);
+                    stockList.add(stckEntity);
+
+                    //납품서 상세 생성
+                    DeliDtlMgntEntity inaddDeliDtlEntity = new DeliDtlMgntEntity();
+                    inaddDeliDtlEntity.setDlvSttmtUnqNo(dlvSttmtUnqNo);
+                    inaddDeliDtlEntity.setDlvSttmtDtlNo("10");
+                    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);
+
+                }
+
+                // 마지막 부분일 경우 
+                if (i == jobList.size()-1) {
+                    if (shmtDtlList.size() > 0) {
+                        shmtOdrMapper.insertShmtOdrBase(userId,shmtBaseEntity );
+                        shmtOdrMapper.insertShmtOdrDtl(userId, shmtDtlList) ;
+                        shmtOdrMapper.insertDeliInfoMngt(userId,deliBaseEntity );
+                        shmtOdrMapper.insertDeliDtlPtcl(userId, deliDtlList) ;
+                    }
+                }
+
+                System.out.println("============================" + stockList.size());
+
+                System.out.println("============================" + "end");
+
+                // 재고수량 변동 및 안전비율계산(없애기로함) 처리후 저장함함
+                stockMngMapper.updateMinStockQty(userId,stockList );
+                //재고 이력 테이블에 데이타 생성  insertMultiStckMgntDtlHist
+                List<StckMgntDtlHistEntity> stockHistList = new ArrayList<StckMgntDtlHistEntity>();
+                for ( int m = 0 ; m < stockList.size() ; m++) {
+                    StckMgntBaseInfoEntity baseEntity = stockList.get(m);
+                    StckMgntDtlHistEntity sourceHist = new StckMgntDtlHistEntity();
+                    //String stckMgntDtlNo = fnGetDealNo(32,"");
+                    String stckMgntDtlNo =  commonMapper.selectDealNo(32, "");
+                    //String stckMgntDtlNo1 =  commonMapper.selectDealNo(33, "");
+
+                    sourceHist.setStckMgntDtlNo(stckMgntDtlNo); // 재고관리상세번호
+                   // System.out.println("seqno =========>" +sourceHist.getStckMgntDtlNo() + "===" + stckMgntDtlNo + "==" + stckMgntDtlNo1);
+                    sourceHist.setBrandId(baseEntity.getBrandId());
+                    sourceHist.setWhsId(baseEntity.getWhsId());
+                    sourceHist.setLocation(baseEntity.getLocation());
+                    sourceHist.setItemId(baseEntity.getItemId());
+                    sourceHist.setItemNm(baseEntity.getItemNm());
+                    sourceHist.setInoutCd(InOutCd.OUT.getCd()); // 출고
+                    sourceHist.setInoutQty(baseEntity.getStckQty());
+                    sourceHist.setChgDvsn(ChgDvsn.PURCHASE_OUT.getCd()); // 구매출고
+                    sourceHist.setRelationNo(baseEntity.getRelationNo());
+                    stockHistList.add(sourceHist);
+                }
+                stockMngMapper.insertMultiStckMgntDtlHist(userId, stockHistList);
+
+                // 발주상태 변경처리
+                // 1. 발주상세정보 상태 없데이트 한후  pchOrdMapper
+
+
+                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/pomng/PchOrdService.java

@@ -380,16 +380,16 @@ public class PchOrdService extends CommonService {
     /*
       구매요청 그리드 리스트 조회
      */
-    public GridResponse selectPchOdrGridList(String fromDt, String toDt, String sPchOdrStCd, String sSpplyId, String sWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
+    public GridResponse selectPchOdrGridList(String sBrandId, String fromDt, String toDt, String sPchOdrStCd, String sSpplyId, String sWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
         fromDt = fromDt == null ? null : fromDt.replace(".", "");
         toDt = toDt == null ? null : toDt.replace(".", "");
 
-        int gridRecords = pchOrdMapper.selectPchOdrGridCnt( fromDt, toDt, sPchOdrStCd,sSpplyId,sWhsId,  sItemNm );
+        int gridRecords = pchOrdMapper.selectPchOdrGridCnt(sBrandId, fromDt, toDt, sPchOdrStCd,sSpplyId,sWhsId,  sItemNm );
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<PchOdrBaseInfoEntity> entities = pchOrdMapper.selectPchOdrGridList( fromDt, toDt, sPchOdrStCd,sSpplyId,sWhsId,  sItemNm, gridRequest);
+        List<PchOdrBaseInfoEntity> entities = pchOrdMapper.selectPchOdrGridList(sBrandId, fromDt, toDt, sPchOdrStCd,sSpplyId,sWhsId,  sItemNm, gridRequest);
         List<Object> gridRows = entities.stream()
                 .map(m -> PchOdrSearchListResponse.builder()
                         .viewCd("R")

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

@@ -0,0 +1,67 @@
+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.pomng.pchOrd.SavePchOrdRequest;
+import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.SaveResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/pomng/inoutmng")
+@Api(tags = {"출하지시 관리 (ShmtOdrController) -- 진행중"})
+public class ShmtOdrController {
+    @Autowired
+    private ShmtOdrService shmtOdrService;
+
+
+    /**
+     * 설명 : 출하지시 대상리스트트 그리 리스트
+     *
+     * @param ShmtOdrTargetGridRequest
+     * @return
+     * @throws Exception
+     */
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 출하지시 대상리스트트 그리 리스트")
+    @PostMapping("/target-grid-list")
+    public ResponseEntity<GridResponse> selectShmtTargetOdrGridList(@RequestBody @Valid ShmtOdrTargetGridRequest shmtOdrTargetGridRequest) throws Exception {
+        return ResponseEntity.ok(shmtOdrService.selectShmtTargetOdrGridList(shmtOdrTargetGridRequest.getSBrandId(), shmtOdrTargetGridRequest.getFromDt(), shmtOdrTargetGridRequest.getToDt(), shmtOdrTargetGridRequest.getSShmtWhsId(), shmtOdrTargetGridRequest.getSWhsId(), shmtOdrTargetGridRequest.getSItemNm(),  shmtOdrTargetGridRequest.toDTO(shmtOdrTargetGridRequest)));
+    }
+
+    /**
+     * 설명 : 출하지시 정보 저장
+     *
+     * @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-inst-shmt")
+    public ResponseEntity<SaveResponse> instShmtOdr(@ApiIgnore String userId, @RequestBody @Valid InstShmtOdrRequest instShmtOdrRequest) throws Exception {
+        shmtOdrService.instShmtOdr(userId,  instShmtOdrRequest);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+    }
+
+}

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

@@ -124,13 +124,13 @@ public class PchOrdController {
     @ApiOperation(value = " 구매발주 그리드 리스트")
     @PostMapping("/detail-grid-list")
     public ResponseEntity<GridResponse> detailPoSearchGridList(@RequestBody @Valid PchOrdSearchGridRequest pchOrdSearchGridRequest) throws Exception {
-        return ResponseEntity.ok(pchOrdService.selectPchOdrGridList(pchOrdSearchGridRequest.getFromDt(), pchOrdSearchGridRequest.getToDt(), pchOrdSearchGridRequest.getSPchOdrStCd(), pchOrdSearchGridRequest.getSSpplyId(), pchOrdSearchGridRequest.getSWhsId(), pchOrdSearchGridRequest.getSItemNm(),  pchOrdSearchGridRequest.toDTO(pchOrdSearchGridRequest)));
+        return ResponseEntity.ok(pchOrdService.selectPchOdrGridList(pchOrdSearchGridRequest.getSBrandId(), pchOrdSearchGridRequest.getFromDt(), pchOrdSearchGridRequest.getToDt(), pchOrdSearchGridRequest.getSPchOdrStCd(), pchOrdSearchGridRequest.getSSpplyId(), pchOrdSearchGridRequest.getSWhsId(), pchOrdSearchGridRequest.getSItemNm(),  pchOrdSearchGridRequest.toDTO(pchOrdSearchGridRequest)));
     }
 
     /**
      * 설명 : 구매발주 정보
      *
-     * @param pchReqUnqNo
+     * @param
      * @return
      * @throws Exception
      */

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

@@ -0,0 +1,72 @@
+package com.oqpo.api.web.dto.request.inoutmng;
+
+import com.oqpo.api.entity.inoutmng.ShmtOdrDtlEntity;
+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 InstShmtOdrRequest {
+    @NotBlank
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디") private String brandId;
+
+    @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/inoutmng/ShmtOdrTargetGridRequest.java

@@ -0,0 +1,41 @@
+package com.oqpo.api.web.dto.request.inoutmng;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+
+@Getter
+@Setter
+public class ShmtOdrTargetGridRequest extends GridRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "시작일자")
+    private String fromDt;
+
+    @NotBlank
+    @ApiModelProperty(value = "종료일자")
+    private String toDt;
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @ApiModelProperty(value = "출고창고아이디")
+    private String sShmtWhsId;
+
+    @ApiModelProperty(value = "납품창고아이디")
+    private String sWhsId;
+
+    @ApiModelProperty(value = "품목명")
+    private String sItemNm;
+
+
+
+    protected ShmtOdrTargetGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
+        super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
+    }
+}

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

@@ -20,6 +20,10 @@ public class PchOrdSearchGridRequest extends GridRequest {
     @ApiModelProperty(value = "종료일자")
     private String toDt;
 
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
     @ApiModelProperty(value = "구매발주상태")
     private String sPchOdrStCd;
 

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

@@ -0,0 +1,39 @@
+package com.oqpo.api.web.dto.response.inoutmng;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class ShmtOdrSearchListResponse {
+
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "브랜드아이디") private String brandId;
+    @ApiModelProperty(value = "브랜드명") private String brandNm;
+    @ApiModelProperty(value = "구매발주번호") private String pchPodrUnqNo;
+    @ApiModelProperty(value = "구매발주항번") private String pchPodrDtlNo;
+    @ApiModelProperty(value = "품목아이디") private String itemId;
+    @ApiModelProperty(value = "품목명") private String itemNm;
+    @ApiModelProperty(value = "납품창고아이디") private String whsId;
+    @ApiModelProperty(value = "납품창고명") private String whsNm;
+    @ApiModelProperty(value = "납품LOCATION") private String location;
+    @ApiModelProperty(value = "단가") private Integer unitAmt;
+    @ApiModelProperty(value = "발주수량") private Integer podrQty;
+    @ApiModelProperty(value = "출고수량") private Integer shmtQty;
+    @ApiModelProperty(value = "현 재고") private Integer stckQty;
+    @ApiModelProperty(value = "유통기한여부") private String expryYn;
+    @ApiModelProperty(value = "유통기한기간") private Integer expryPeriod;
+    @ApiModelProperty(value = "유통일자") private String expryDate;
+    @ApiModelProperty(value = "발주금액") private Integer podrAmt;
+    @ApiModelProperty(value = "납품요청일") private String dlvReqDt;
+    @ApiModelProperty(value = "출고창고아이디") private String shmtWhsId;
+    @ApiModelProperty(value = "출고LOCATION") private String shmtLocation;
+    @ApiModelProperty(value = "출고창고명") private String shmtWhsNm;
+
+}

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

@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oqpo.api.mapper.inoutmng.ShmtOdrMapper">
+
+    <select id="selectShmtTargetOdrGridList" 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
+               , ptcl.pch_podr_dtl_no as 'pchOdrDtlInfo.pch_podr_dtl_no'
+                ,ptcl.item_id as 'pchOdrDtlInfo.item_id' , ptcl.item_nm as 'pchOdrDtlInfo.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.unit_amt as 'pchOdrDtlInfo.unit_amt', ptcl.podr_qty as 'pchOdrDtlInfo.podr_qty'
+                , ptcl.podr_qty as 'pchOdrDtlInfo.shmt_qty', nvl(stck.stck_qty,0) as 'pchOdrDtlInfo.stck_qty'
+                ,itm.expry_yn as 'pchOdrDtlInfo.expry_yn', itm.expry_period as 'pchOdrDtlInfo.expry_period'
+                , date_format(adddate(now(), interval itm.expry_period day),'%Y.%m.%d') as 'pchOdrDtlInfo.expry_date'
+                ,ptcl.podr_amt as 'pchOdrDtlInfo.podr_amt', date_format(base.dlv_req_dt,'%Y.%m.%d') as dlv_req_dt, base.shmt_whs_id, base.shmt_location
+                ,fn_whs_nm(base.brand_id, base.shmt_whs_id) as shmt_whs_nm
+                ,fn_whs_location_nm(base.brand_id, base.shmt_whs_id, base.shmt_location) as shmt_location_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'
+        <if test="sItemNm != null and sItemNm != ''">
+                and (ptcl.item_id like concat('%',#{sItemNm},'%') or ptcl.item_nm like concat('%',#{sItemNm},'%'))
+        </if>
+        join item_base_info itm on ptcl.item_id = itm.item_id
+        left outer join stck_mgnt_base_info stck on base.brand_id = stck.brand_id and base.shmt_whs_id = stck.whs_id and base.shmt_location = stck.location
+        and ptcl.item_id = stck.item_id
+        where  1=1
+        and    base.brand_id = #{sBrandId}
+        and    base.dlv_req_dt between #{fromDt} and #{toDt}
+        and    base.dlv_dvsn = 'DL01'  -- 본사배송구분
+        and    base.whs_dvsn = 'W02'  -- 납품매장창고구분
+        <if test="sShmtWhsId != null and sShmtWhsId != ''">
+        and    base.shmt_whs_id = #{sShmtWhsId}
+        </if>
+        <if test="sWhsId != null and sWhsId != ''">
+        and    base.whs_id = #{sWhsId}
+        </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 pch_req_unq_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by pch_req_unq_no desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by pch_req_unq_no desc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectShmtTargetOdrGridCnt" resultType="int">
+        select count(*) as cnt
+        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'
+        <if test="sItemNm != null and sItemNm != ''">
+            and (ptcl.item_id like concat('%',#{sItemNm},'%') or ptcl.item_nm like concat('%',#{sItemNm},'%'))
+        </if>
+        join item_base_info itm on ptcl.item_id = itm.item_id
+        left outer join stck_mgnt_base_info stck on base.brand_id = stck.brand_id and base.shmt_whs_id = stck.whs_id and base.shmt_location = stck.location
+        and ptcl.item_id = stck.item_id
+        where  1=1
+        and    base.brand_id = #{sBrandId}
+        and    base.dlv_req_dt between #{fromDt} and #{toDt}
+        and    base.dlv_dvsn = 'DL01'  -- 본사배송구분
+        and    base.whs_dvsn = 'W02'  -- 납품매장창고구분
+        <if test="sShmtWhsId != null and sShmtWhsId != ''">
+            and    base.shmt_whs_id = #{sShmtWhsId}
+        </if>
+        <if test="sWhsId != null and sWhsId != ''">
+            and    base.whs_id = #{sWhsId}
+        </if>
+
+    </select>
+
+    <insert id="insertShmtOdrBase">
+        insert into shmt_odr_base_info
+            (shmt_req_unq_no, shmt_req_st_cd, shmt_reg_dt, shmt_whs_id, shmt_location
+            , whs_dvsn, brand_id, store_id, podr_dvsn, item_qty
+            , shmt_total_amt,  podr_mgr_nm, dlv_req_dt, whs_id, location
+            , sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
+        values
+            (#{entity.shmtReqUnqNo}, #{entity.shmtReqStCd}, date_format(now(),'%Y%m%d'), #{entity.shmtWhsId}, #{entity.shmtLocation}
+            , #{entity.whsDvsn}, #{entity.brandId}, #{entity.storeId}, #{entity.podrDvsn}, #{entity.itemQty}
+            , #{entity.shmtTotalAmt}, #{entity.podrMgrNm}, #{entity.dlvReqDt}, #{entity.whsId}
+            , #{entity.location}, NOW(), #{userId}, NOW(), #{userId})
+    </insert>
+
+    <insert id="insertShmtOdrDtl">
+        insert into shmt_odr_dtl_ptcl
+            (shmt_req_unq_no, shmt_req_dtl_no, item_id, item_nm, unit_amt
+            , unit, podr_qty, podr_amt, shmt_qty, shmt_amt, expry_date
+            , pch_podr_unq_no, pch_podr_dtl_no, pch_req_unq_no, pch_req_dtl_no
+            , sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
+        values
+        <foreach collection="gridInsertData" item="item" separator=",">
+            (#{item.shmtReqUnqNo}, #{item.shmtReqDtlNo}, #{item.itemId}, #{item.itemNm}, #{item.unitAmt}
+            , #{item.unit}, #{item.podrQty}, #{item.podrAmt}, #{item.shmtQty}, #{item.shmtAmt}, #{item.expryDate}
+            , #{item.pchPodrUnqNo}, #{item.pchPodrDtlNo}, #{item.pchReqUnqNo}, #{item.pchReqDtlNo}
+            , NOW(), #{userId}, NOW(), #{userId})
+        </foreach>
+    </insert>
+
+    <select id="selectShmtJobDataList" resultType="com.oqpo.api.entity.pomng.PchOdrBaseInfoEntity">
+        select base.brand_id,base.pch_podr_unq_no, ptcl.pch_podr_dtl_no as 'pchOdrDtlInfo.pch_podr_dtl_no'
+                ,ptcl.item_id as 'pchOdrDtlInfo.item_id' , ptcl.item_nm as 'pchOdrDtlInfo.item_nm', base.whs_id
+                ,base.location, ptcl.unit_amt as 'pchOdrDtlInfo.unit_amt', ptcl.podr_qty as 'pchOdrDtlInfo.podr_qty'
+                ,nvl(stck.stck_qty,0) as 'pchOdrDtlInfo.stck_qty'
+                ,itm.expry_yn as 'pchOdrDtlInfo.expry_yn', nvl(itm.expry_period,0) as 'pchOdrDtlInfo.expry_period'
+                ,ptcl.podr_amt as 'pchOdrDtlInfo.podr_amt', date_format(base.dlv_req_dt,'%Y.%m.%d') as dlv_req_dt
+                , base.shmt_whs_id, base.shmt_location, ptcl.pch_req_unq_no as 'pchOdrDtlInfo.pch_req_unq_no' , ptcl.pch_req_dtl_no as 'pchOdrDtlInfo.pch_req_dtl_no'
+                , 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
+        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
+        left outer join stck_mgnt_base_info stck on base.brand_id = stck.brand_id and base.shmt_whs_id = stck.whs_id and base.shmt_location = stck.location
+        and ptcl.item_id = stck.item_id
+        where  1=1
+        and    base.brand_id = #{brandId}
+        and    concat(base.pch_podr_unq_no,ptcl.pch_podr_dtl_no) in
+        <foreach collection="gridInsertData" item="item" separator="," open="(" close=")">
+            concat(#{item.pchPodrUnqNo},#{item.pchPodrDtlNo})
+        </foreach>
+        order by  base.brand_id, base.shmt_whs_id, base.shmt_location, base.whs_id,base.location
+    </select>
+
+    <insert id="insertDeliInfoMngt">
+        INSERT INTO deli_info_mgnt
+        (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
+        , 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}
+        , NOW(), #{userId}, NOW(), #{userId})
+    </insert>
+
+    <insert id="insertDeliDtlPtcl" >
+        INSERT INTO deli_dtl_ptcl
+        (dlv_sttmt_unq_no, dlv_sttmt_dtl_no, pch_podr_unq_no, pch_podr_dtl_no, pch_req_unq_no
+        , pch_req_dtl_no, item_id, item_nm, unit, unit_amt
+        , price_unit, podr_qty, dlv_qty, podr_amt, dlv_amt
+        , expry_date, delay_yn, delay_rsn
+        , sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
+        VALUES
+        <foreach collection="gridInsertData" item="item" separator=",">
+        (#{item.dlvSttmtUnqNo}, #{item.dlvSttmtDtlNo}, #{item.pchPodrUnqNo}, #{item.pchPodrDtlNo}, #{item.pchReqUnqNo}
+        , #{item.pchReqDtlNo}, #{item.itemId}, #{item.itemNm}, #{item.unit}, #{item.unitAmt}
+        , #{item.priceUnit}, #{item.podrQty}, #{item.dlvQty}, #{item.podrAmt}, #{item.dlvAmt}
+        , #{item.expryDate}, #{item.delayYn}, #{item.delayRsn}
+        , NOW(), #{userId}, NOW(), #{userId})
+        </foreach>
+    </insert>
+
+
+</mapper>

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

@@ -117,6 +117,7 @@
             , fn_whs_location_nm(base.brand_id, base.shmt_whs_id, base.shmt_location) as shmt_location_nm
         from pch_odr_base_info base
         where 1 = 1
+        and base.brand_id = #{sBrandId}
         and base.podr_dt between #{fromDt} and  #{toDt}
         <if test="sPchOdrStCd != null and sPchOdrStCd != ''">
         and base.pch_odr_st_cd = #{sPchOdrStCd}
@@ -133,6 +134,7 @@
                                         from pch_odr_base_info base
                                         , pch_odr_dtl_ptcl ptcl
                                         where 1 = 1
+                                        and base.brand_id = #{sBrandId}
                                         and base.pch_podr_unq_no = ptcl.pch_podr_unq_no
                                         and base.podr_dt between #{fromDt} and  #{toDt}
                                         <if test="sPchOdrStCd != null and sPchOdrStCd != ''">
@@ -170,6 +172,7 @@
         select count(*) as cnt
         from pch_odr_base_info base
         where 1 = 1
+        and base.brand_id = #{sBrandId}
         and base.podr_dt between #{fromDt} and  #{toDt}
         <if test="sPchOdrStCd != null and sPchOdrStCd != ''">
             and base.pch_odr_st_cd = #{sPchOdrStCd}
@@ -250,6 +253,7 @@
         </foreach>
     </update>
 
+
     <update id="updateChgPodrStCd">
             UPDATE /* PchOrd.updateChgPodrStCd */
             pch_odr_base_info SET
@@ -258,4 +262,27 @@
             sys_chg_id = #{userId}
             WHERE pch_podr_unq_no = #{pchPodrUnqNo}
     </update>
+
+    <update id="updateChangeStPodrDtl">
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            UPDATE /* PchOrd.updateChangeStPodrDtl */
+            pch_odr_dtl_ptcl SET
+            podr_dtl_st_cd = #{item.podrDtlStCd},
+            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="updateChgMultiPodrStCd">
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            UPDATE /* PchOrd.updateChgPodrStCd */
+            pch_odr_base_info SET
+            pch_odr_st_cd = #{item.pchOdrStCd},
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+            WHERE pch_podr_unq_no = #{item.pchPodrUnqNo}
+        </foreach>
+    </update>
 </mapper>

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

@@ -192,11 +192,11 @@
         /* StockMngMapper.insertStckMgntDtlHist */
         INSERT INTO stck_mgnt_dtl_hist
             (stck_mgnt_dtl_no, brand_id, whs_id, location, item_id, item_nm, inout_cd, inout_qty, whs_mgnt_unq_no,
-             rtn_mgnt_unq_no, chg_dvsn, sys_reg_dttm,
+             rtn_mgnt_unq_no, chg_dvsn, relation_no, sys_reg_dttm,
              sys_reg_id, sys_chg_dttm, sys_chg_id)
         VALUES
             (#{entity.stckMgntDtlNo}, #{entity.brandId}, #{entity.whsId}, #{entity.location}, #{entity.itemId},
-             #{entity.itemNm}, #{entity.inoutCd}, #{entity.inoutQty}, #{entity.whsMgntUnqNo}, #{entity.rtnMgntUnqNo}, #{entity.chgDvsn},
+             #{entity.itemNm}, #{entity.inoutCd}, #{entity.inoutQty}, #{entity.whsMgntUnqNo}, #{entity.rtnMgntUnqNo}, #{entity.chgDvsn}, #{entity.relationNo},
              NOW(), #{userId}, NOW(), #{userId})
     </insert>
 
@@ -293,4 +293,33 @@
         </foreach>
     </update>
 
+    <update id="updateMinStockQty" >
+        /* StockMngMapper.updateMinStockQty */
+        <foreach collection="gridUpdateData" item="item" separator=";">
+        UPDATE stck_mgnt_base_info SET
+            stck_qty = stck_qty - #{item.stckQty},       /* 재고수량 */
+            wait_qty = wait_qty - #{item.stckQty},       /* 대기수량 */
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+        WHERE brand_id = #{item.brandId}
+        AND whs_id = #{item.whsId}
+        AND location = #{item.location}
+        AND item_id = #{item.itemId}
+        </foreach>
+    </update>
+
+    <insert id="insertMultiStckMgntDtlHist" >
+        /* StockMngMapper.insertMultiStckMgntDtlHist */
+        INSERT INTO stck_mgnt_dtl_hist
+            (stck_mgnt_dtl_no, brand_id, whs_id, location, item_id, item_nm, inout_cd, inout_qty, whs_mgnt_unq_no,
+             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=";">
+            (#{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})
+        </foreach>
+    </insert>
+
 </mapper>