공급사 단가 api 일부 작업 커밋

src/main/java/com/oqpo/api/entity/stinfo/ItemUnitEntity.java

@@ -16,6 +16,7 @@ public class ItemUnitEntity implements Serializable {
 
     private String brandUnitUnqNo ;
     private String brandId ;
+    private String brandNm ;
     private String itemId ;
     private String itemNm ;
     private String spplyId ;
@@ -23,16 +24,18 @@ public class ItemUnitEntity implements Serializable {
     private String contSttDt ;
     private String contEndDt ;
     private String curr ;
+    private String currNm ;
     private String unit ;
     private String unitNm ;
     private Integer unitAmt ;
     private Integer leadTime ;
     private String dlvCndt ;
+    private String dlvCndtNm ;
     private String shortContFileNo ;
     private String spplyItemId ;
     private String unitStCd ;
     private String unitStNm ;
-    private Integer stddQyt ;
+    private Integer stddQty ;
     private Integer storeSaleStddQty ;
     private Integer storeSaleUnitAmt ;
     private String sysRegDttm ;

src/main/java/com/oqpo/api/entity/stinfo/StoreItemUnitEntity.java

@@ -25,11 +25,10 @@ public class StoreItemUnitEntity implements Serializable {
     private String currNm ;
     private Integer unitAmt ;
     private String storeId ;
+    private String storeNm ;
     private String brandId ;
+    private String brandNm ;
     private String shortContFileNo ;
-    private String spplyId ;
-    private String spplyNm ;
-    private String spplyItemId ;
     private String unitStCd ;
     private String unitStNm ;
     private Integer stddQyt ;

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

@@ -14,8 +14,10 @@ public interface ItemUnitMapper {
     int selectItemUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sUnitStCd") String sUnitStCd, @Param("sSpplyId") String sSpplyId, @Param("sClass1") String sClass1, @Param("sClass2") String sClass2, @Param("sClass3") String sClass3, @Param("sClass") String sClass4, @Param("sItemNm") String sItemNm)throws Exception;
 
     ItemUnitEntity selectItemUnitInfo(@Param("brandId") String brandId, @Param("brandUnitUnqNo") String brandUnitUnqNo)throws Exception;
+    ItemUnitEntity selectItemUnitDupContInfoNo(@Param("brandId") String brandId, @Param("spplyId") String spplyId, @Param("itemId") String itemId, @Param("contSttDt") String contSttDt, @Param("contEndDt") String contEndDt)throws Exception;
+    int updateItemUnitContEnd(@Param("brandId") String brandId, @Param("brandUnitUnqNo") String brandUnitUnqNo, @Param("contEndDt") String contEndDt) throws Exception;
+
+    int insertMergItemUnitInfo(@Param("userId") String userId, ItemUnitEntity entity) throws Exception;
 
-    int insertItemUnitInfo(@Param("userId") String userId, ItemUnitEntity entity) throws Exception;
-    int updateItemUnitInfo(@Param("userId") String userId, ItemUnitEntity entity) throws Exception;
 
 }

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

@@ -1,19 +1,24 @@
 package com.oqpo.api.mapper.stinfo;
 
 
+import com.oqpo.api.entity.stinfo.StoreItemUnitEntity;
+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 StoreItemUnitMapper {
-/*
-    List<BrandEntity> selectBrandGridList(@Param("sBrandNm") String sBrandNm, @Param("sBrandType") String sBrandType, @Param("sStCd") String sStCd, GridRequest gridRequest)throws Exception;
-    int selectBrandGridCnt(@Param("sBrandNm") String sBrandNm, @Param("sBrandType") String sBrandType, @Param("sStCd") String sStCd)throws Exception;
 
-    BrandEntity selectBrandInfo(@Param("brandId") String brandId)throws Exception;
+    List<StoreItemUnitEntity> selectStoreItemUnitGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId , GridRequest gridRequest)throws Exception;
+    int selectStoreItemUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId )throws Exception;
+
+    StoreItemUnitEntity selectStoreItemUnitInfo(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contSttDt") String contSttDt, @Param("contEndDt") String contEndDt)throws Exception;
+
+    StoreItemUnitEntity selectStoreItemUnitContDateInfo(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contSttDt") String contSttDt,  @Param("contEndDt") String contEndDt)throws Exception;
+    int updateStoreItemUnitContEnd(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contEndDt") String contEndDt) throws Exception;
 
-    int insertBrandInfo(@Param("userId") String userId, BrandEntity entity) throws Exception;
-    int updateBrandInfo(@Param("userId") String userId, BrandEntity entity) throws Exception;
+    int insertMergStoreItemUnitInfo(@Param("userId") String userId, List<StoreItemUnitEntity> gridUpdateData) throws Exception;
 
-    String selectBrandInitPw(@Param("brandId") String brandId)throws Exception;
-*/
 }

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

@@ -0,0 +1,148 @@
+package com.oqpo.api.service.stinfo;
+
+
+import com.oqpo.api.entity.oper.FileEntity;
+import com.oqpo.api.entity.stinfo.ItemClassEntity;
+import com.oqpo.api.entity.stinfo.ItemClassMngEntity;
+import com.oqpo.api.entity.stinfo.ItemEntity;
+import com.oqpo.api.entity.stinfo.ItemUnitEntity;
+import com.oqpo.api.enums.SystemMessageCode;
+import com.oqpo.api.exception.GlobalException;
+import com.oqpo.api.mapper.FileMapper;
+import com.oqpo.api.mapper.stinfo.ItemMapper;
+import com.oqpo.api.mapper.stinfo.ItemUnitMapper;
+import com.oqpo.api.service.CommonService;
+import com.oqpo.api.web.dto.request.GridRequest;
+import com.oqpo.api.web.dto.request.stinfo.item.DelItemInfolRequest;
+import com.oqpo.api.web.dto.request.stinfo.item.SaveItemClassMngInfolRequest;
+import com.oqpo.api.web.dto.request.stinfo.item.SaveItemInfolRequest;
+import com.oqpo.api.web.dto.request.stinfo.itemUnit.SaveItemUnitInfolRequest;
+import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.stinfo.item.*;
+import com.oqpo.api.web.dto.response.stinfo.itemUnit.ItemUnitInfoResponse;
+import com.oqpo.api.web.dto.response.stinfo.itemUnit.ItemUnitSearchResponse;
+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 ItemUnitService extends CommonService {
+    @Autowired
+    private ItemUnitMapper itemUnitMapper;
+
+    @Autowired
+    private FileMapper fileMapper;
+
+    /*
+      브랜드 공급사 단가 리스트 조회
+
+     */
+    public GridResponse selectItemUnitGridList(String sBrandId, String fromDt, String toDt,String sUnitStCd, String sSpplyId, String sClass1, String sClass2, String sClass3, String sClass4, 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 = itemUnitMapper.selectItemUnitGridCnt( sBrandId, fromDt,  toDt, sUnitStCd, sSpplyId, sClass1, sClass2, sClass3, sClass4,sItemNm );
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<ItemUnitEntity> entities = itemUnitMapper.selectItemUnitGridList(sBrandId, fromDt,  toDt, sUnitStCd, sSpplyId, sClass1, sClass2, sClass3, sClass4,sItemNm, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> ItemUnitSearchResponse.builder()
+                        .viewCd("R")
+                        .brandUnitUnqNo(m.getBrandUnitUnqNo())
+                        .brandId(m.getBrandId())
+                        .itemId(m.getItemId())
+                        .itemNm(m.getItemNm())
+                        .spplyId(m.getSpplyId())
+                        .spplyNm(m.getSpplyNm())
+                        .contSttDt(m.getContSttDt())
+                        .contEndDt(m.getContEndDt())
+                        .curr(m.getCurr())
+                        .currNm(m.getCurrNm())
+                        .unit(m.getUnit())
+                        .unitNm(m.getUnitNm())
+                        .unitAmt(m.getUnitAmt())
+                        .leadTime(m.getLeadTime())
+                        .spplyItemId(m.getSpplyItemId())
+                        .unitStCd(m.getUnitStCd())
+                        .stddQty(m.getStddQty())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
+
+
+    /* 공급사 단가 정보 */
+    public ItemUnitInfoResponse selectItemUnitInfo(String brandId, String brandUnitUnqNo) throws Exception {
+
+        ItemUnitEntity entity = itemUnitMapper.selectItemUnitInfo( brandId, brandUnitUnqNo);
+        List<FileEntity> fileContInfoList = null;
+
+        if (!"".equals(entity.getShortContFileNo())) {
+            fileContInfoList = fileMapper.selectFileList(entity.getShortContFileNo()) ;
+        } else {
+            fileContInfoList = new ArrayList<FileEntity>();
+        }
+
+        return ItemUnitInfoResponse.toDTO(entity,fileContInfoList );
+
+    }
+
+    /* 공급사 단가 저장 */
+    @Transactional
+    public void saveItemUnitInfo(String userId, SaveItemUnitInfolRequest saveItemUnitInfolRequest) throws Exception {
+        try {
+
+            ItemUnitEntity entity = new ItemEntity();
+            entity.setBrandUnitUnqNo(saveItemUnitInfolRequest.getBrandUnitUnqNo());
+            entity.setBrandId(saveItemUnitInfolRequest.getBrandId());
+            entity.setBrandNm(saveItemUnitInfolRequest.getBrandNm());
+            entity.setItemId(saveItemUnitInfolRequest.getItemId());
+            entity.setItemNm(saveItemUnitInfolRequest.getItemNm());
+            entity.setSpplyId(saveItemUnitInfolRequest.getSpplyId());
+            entity.setSpplyNm(saveItemUnitInfolRequest.getSpplyNm());
+            entity.setContSttDt(saveItemUnitInfolRequest.getContSttDt().replaceAll("\\.",""));
+            entity.setContEndDt(saveItemUnitInfolRequest.getContEndDt().replaceAll("\\.",""));
+            entity.setCurr(saveItemUnitInfolRequest.getCurr());
+            entity.setUnit(saveItemUnitInfolRequest.getUnit());
+            entity.setUnitAmt(saveItemUnitInfolRequest.getUnitAmt());
+            entity.setLeadTime(saveItemUnitInfolRequest.getLeadTime());
+            entity.setDlvCndt(saveItemUnitInfolRequest.getDlvCndt());
+            entity.setShortContFileNo(saveItemUnitInfolRequest.getShortContFileNo());
+            entity.setSpplyItemId(saveItemUnitInfolRequest.getSpplyItemId());
+            entity.setUnitStCd(saveItemUnitInfolRequest.getUnitStCd());
+            entity.setStddQty(saveItemUnitInfolRequest.getStddQty());
+            entity.setStoreSaleStddQty(saveItemUnitInfolRequest.getStoreSaleStddQty());
+            entity.setStoreSaleUnitAmt(saveItemUnitInfolRequest.getStoreSaleUnitAmt());
+
+            if ("C".equals(saveItemUnitInfolRequest.getViewCd())) {
+                //selectItemUnitDupContInfoNo  날짜 기준 계약 존재여부 파악
+                ItemUnitEntity condtEntity = itemUnitMapper.selectItemUnitDupContInfoNo(entity.getBrandId(), entity.getSpplyId(), entity.getItemId(), entity.getContSttDt(), entity.getContEndDt());
+
+                if (condtEntity != null && !"".equals(condtEntity.getBrandUnitUnqNo())) {
+                    itemUnitMapper.updateItemUnitContEnd(entity.getBrandId(), entity.getBrandUnitUnqNo(), entity.getContEndDt());
+                }
+            }
+            itemUnitMapper.insertMergItemUnitInfo(userId, entity);
+
+
+        } catch (GlobalException e) {
+            e.getStackTrace();
+            throw new GlobalException(e.getSystemMessageCode());
+        } catch (Exception e) {
+            e.getStackTrace();
+            throw new RuntimeException();
+        }
+    }
+
+
+
+}

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

@@ -0,0 +1,75 @@
+package com.oqpo.api.web.dto.request.stinfo.itemUnit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+public class SaveItemUnitInfolRequest {
+    @NotBlank
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "브랜드단가고유번호")
+    private String brandUnitUnqNo;
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+
+    @ApiModelProperty(value = "브랜드명")
+    private String brandNm;
+
+    @ApiModelProperty(value = "품목아이디")
+    private String itemId;
+
+    @ApiModelProperty(value = "품목명")
+    private String itemNm;
+
+    @ApiModelProperty(value = "공급사아이디")
+    private String spplyId;
+
+    @ApiModelProperty(value = "공급사명")
+    private String spplyNm;
+
+    @ApiModelProperty(value = "계약시작일자")
+    private String contSttDt;
+
+    @ApiModelProperty(value = "계약종료일자")
+    private String contEndDt;
+
+    @ApiModelProperty(value = "통화")
+    private String curr;
+
+    @ApiModelProperty(value = "단위")
+    private String unit;
+
+    @ApiModelProperty(value = "단가금액")
+    private Integer unitAmt;
+
+    @ApiModelProperty(value = "리드타임")
+    private Integer leadTime;
+
+    @ApiModelProperty(value = "배송조건")
+    private String dlvCndt;
+
+    @ApiModelProperty(value = "단기계약서파일번호")
+    private String shortContFileNo;
+
+    @ApiModelProperty(value = "공급사품목아이디")
+    private String spplyItemId;
+
+    @ApiModelProperty(value = "단가상태코드")
+    private String unitStCd;
+
+    @ApiModelProperty(value = "기준수량")
+    private Integer stddQty;
+
+    @ApiModelProperty(value = "매장판매기준수량")
+    private Integer storeSaleStddQty;
+
+    @ApiModelProperty(value = "매장판매단가금액")
+    private Integer storeSaleUnitAmt;
+}

src/main/java/com/oqpo/api/web/dto/response/stinfo/itemUnit/ItemUnitInfoResponse.java

@@ -0,0 +1,170 @@
+package com.oqpo.api.web.dto.response.stinfo.itemUnit;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.oper.FileEntity;
+import com.oqpo.api.entity.stinfo.ItemEntity;
+import com.oqpo.api.entity.stinfo.ItemUnitEntity;
+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 ItemUnitInfoResponse {
+
+    @ApiModelProperty(value = "브랜드단가고유번호")
+    private String brandUnitUnqNo;
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+
+    @ApiModelProperty(value = "브랜드명")
+    private String brandNm;
+
+    @ApiModelProperty(value = "품목아이디")
+    private String itemId;
+
+    @ApiModelProperty(value = "품목명")
+    private String itemNm;
+
+    @ApiModelProperty(value = "공급사아이디")
+    private String spplyId;
+
+    @ApiModelProperty(value = "공급사명")
+    private String spplyNm;
+
+    @ApiModelProperty(value = "계약시작일자")
+    private String contSttDt;
+
+    @ApiModelProperty(value = "계약종료일자")
+    private String contEndDt;
+
+    @ApiModelProperty(value = "통화")
+    private String curr;
+
+    @ApiModelProperty(value = "통화명")
+    private String currNm;
+
+    @ApiModelProperty(value = "단위")
+    private String unit;
+
+    @ApiModelProperty(value = "단위명")
+    private String unitNm;
+
+    @ApiModelProperty(value = "단가금액")
+    private Integer unitAmt;
+
+    @ApiModelProperty(value = "리드타임")
+    private Integer leadTime;
+
+    @ApiModelProperty(value = "배송조건")
+    private String dlvCndt;
+
+    @ApiModelProperty(value = "배송조건명")
+    private String dlvCndtNm;
+
+    @ApiModelProperty(value = "단기계약서파일번호")
+    private String shortContFileNo;
+
+    @ApiModelProperty(value = "공급사품목아이디")
+    private String spplyItemId;
+
+    @ApiModelProperty(value = "단가상태코드")
+    private String unitStCd;
+
+    @ApiModelProperty(value = "단가상태코드명")
+    private String unitStNm;
+
+    @ApiModelProperty(value = "기준수량")
+    private Integer stddQty;
+
+    @ApiModelProperty(value = "매장판매기준수량")
+    private Integer storeSaleStddQty;
+
+    @ApiModelProperty(value = "매장판매단가금액")
+    private Integer storeSaleUnitAmt;
+
+    @ApiModelProperty(value = "시스템등록일시")
+    private String sysRegDttm;
+
+    @ApiModelProperty(value = "시스템등록아이디")
+    private String sysRegId;
+
+    @ApiModelProperty(value = "시스템변경일시")
+    private String sysChgDttm;
+
+    @ApiModelProperty(value = "시스템변경아이디")
+    private String sysChgId;
+
+
+    @ApiModelProperty(value = "품목이지미 파일 정보")
+    private List<ItemUnitInfoResponse.FileContInfo> imageFileNoList;
+
+    public static ItemUnitInfoResponse toDTO(ItemUnitEntity entity, List<FileEntity>  fileImageInfoList) {
+        if (entity == null) return null;
+        return ItemUnitInfoResponse.builder()
+                .brandUnitUnqNo(entity.getBrandUnitUnqNo())
+                .brandId(entity.getBrandId())
+                .itemId(entity.getItemId())
+                .itemNm(entity.getItemNm())
+                .spplyId(entity.getSpplyId())
+                .spplyNm(entity.getSpplyNm())
+                .contSttDt(entity.getContSttDt() == null ? "" :entity.getContSttDt())
+                .contEndDt(entity.getContEndDt() == null ? "" :entity.getContEndDt())
+                .curr(entity.getCurr() == null ? "" :entity.getCurr())
+                .currNm(entity.getCurrNm() == null ? "" :entity.getCurrNm())
+                .unit(entity.getUnit() == null ? "" :entity.getUnit())
+                .unitNm(entity.getUnitNm() == null ? "" :entity.getUnitNm())
+                .unitAmt(entity.getUnitAmt() == null ? 0 :entity.getUnitAmt())
+                .leadTime(entity.getLeadTime() == null ? 0 :entity.getLeadTime())
+                .dlvCndt(entity.getDlvCndt() == null ? "" :entity.getDlvCndt())
+                .dlvCndtNm(entity.getDlvCndtNm() == null ? "" :entity.getDlvCndtNm())
+                .shortContFileNo(entity.getShortContFileNo() == null ? "" :entity.getShortContFileNo())
+                .imageFileNoList(fileImageInfoList.stream()
+                        .map(m -> FileContInfo.builder()
+                                .fileNo(m.getFileNo())
+                                .fileSeq(m.getFileSeq())
+                                .filePath(m.getFilePath())
+                                .fileNm(m.getFileNm())
+                                .fileOrgNm(m.getFileOrgNm())
+                                .build())
+                        .collect(Collectors.toList()))
+                .spplyItemId(entity.getSpplyItemId() == null ? "" :entity.getSpplyItemId())
+                .unitStCd(entity.getUnitStCd() == null ? "" :entity.getUnitStCd())
+                .unitStNm(entity.getUnitStNm() == null ? "" :entity.getUnitStNm())
+                .stddQty(entity.getStddQty() == null ? 0 :entity.getStddQty())
+                .storeSaleStddQty(entity.getStoreSaleStddQty() == null ? 0 :entity.getStoreSaleStddQty())
+                .storeSaleUnitAmt(entity.getStoreSaleUnitAmt() == null ? 0 :entity.getStoreSaleUnitAmt())
+                .sysRegDttm(entity.getSysRegDttm())
+                .sysRegId(entity.getSysRegId())
+                .sysChgDttm(entity.getSysChgDttm())
+                .sysChgId(entity.getSysChgId())
+                .build();
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class FileContInfo {
+        @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/stinfo/itemUnit/ItemUnitSearchResponse.java

@@ -0,0 +1,71 @@
+package com.oqpo.api.web.dto.response.stinfo.itemUnit;
+
+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 ItemUnitSearchResponse {
+
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "브랜드단가고유번호")
+    private String brandUnitUnqNo;
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+
+    @ApiModelProperty(value = "품목아이디")
+    private String itemId;
+
+    @ApiModelProperty(value = "품목명")
+    private String itemNm;
+
+    @ApiModelProperty(value = "공급사아이디")
+    private String spplyId;
+
+    @ApiModelProperty(value = "공급사명")
+    private String spplyNm;
+
+    @ApiModelProperty(value = "계약시작일자")
+    private String contSttDt;
+
+    @ApiModelProperty(value = "계약종료일자")
+    private String contEndDt;
+
+    @ApiModelProperty(value = "통화")
+    private String curr;
+
+    @ApiModelProperty(value = "통화명")
+    private String currNm;
+
+    @ApiModelProperty(value = "단위")
+    private String unit;
+
+    @ApiModelProperty(value = "단위명명")
+   private String unitNm;
+
+    @ApiModelProperty(value = "단가금액")
+    private Integer unitAmt;
+
+    @ApiModelProperty(value = "리드타임")
+    private Integer leadTime;
+
+    @ApiModelProperty(value = "공급사품목아이디")
+    private String spplyItemId;
+
+    @ApiModelProperty(value = "단가상태코드")
+    private String unitStCd;
+
+    @ApiModelProperty(value = "단가상태명")
+    private String unitStNm;
+
+    @ApiModelProperty(value = "기준수량")
+    private Integer stddQty;
+
+}

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

@@ -37,7 +37,7 @@
         <if test="sClass4 != null and sClass4 != ''">
             and  iclas.item_class4 = #{sClass4}
         </if>
-        <if test="sClass4 != null and sClass4 != ''">
+        <if test="sItemNm != null and sItemNm != ''">
         and   iunit.item_id like concat('%',#{sItemNm},'%') or iunit.item_nm like concat('%',#{sItemNm},'%')
         </if>
         <choose>
@@ -90,7 +90,7 @@
         <if test="sClass4 != null and sClass4 != ''">
             and  iclas.item_class4 = #{sClass4}
         </if>
-        <if test="sClass4 != null and sClass4 != ''">
+        <if test="sItemNm != null and sItemNm != ''">
             and   iunit.item_id like concat('%',#{sItemNm},'%') or iunit.item_nm like concat('%',#{sItemNm},'%')
         </if>
     </select>
@@ -101,46 +101,67 @@
                 iunit.spply_nm, date_format(iunit.cont_stt_dt,'%Y.%m.%d') as cont_stt_dt, date_format(iunit.cont_end_dt,'%Y.%m.%d') as cont_end_dt,
                 iunit.curr, fn_code_nm('CURR', iunit.curr) as curr_nm, iunit.unit, fn_code_nm('DSTRBT_COST_UNIT', iunit.unit) as unit,
                 iunit.unit_amt, iunit.lead_time, iunit.spply_item_id,
+                iunit.dlv_cndt, fn_code_nm('DLV_CNDT', iunit.dlv_cndt) as dlv_cndt_nm,
                 iunit.unit_st_cd, fn_code_nm('UNIT_ST_CD', iunit.unit_st_cd) as unit_st_nm, iunit.stdd_qyt,
                 iunit.store_sale_stdd_qty, iunit.store_sale_unit_amt, iunit.short_cont_file_no
+                date_format(iunit.sys_reg_dttm,'%Y.%m.%d %H:%i:%s') as sys_reg_dttm. iunit.sys_reg_id, date_format(iunit.sys_chg_dttm,'%Y.%m.%d %H:%i:%s') as  sys_chg_dttm, iunit.sys_chg_id
         from  brand_item_unit_info iunit
-        where iunit.brand_id = #{brandId}
-        and   iunit.brand_unit_unq_no = #{brandUnitUnqNo}
+        where iunit.brand_unit_unq_no = #{brandUnitUnqNo}
+        and   iunit.brand_id = #{brandId}
     </select>
 
-    <insert id="insertItemUnitInfo" >
-        insert into brand_item_unit_info
-            (brand_unit_unq_no, brand_id, item_id, item_nm, spply_id,
-             spply_nm, cont_stt_dt, cont_end_dt, curr, unit,
-             unit_amt, lead_time, dlv_cndt, short_cont_file_no, spply_item_id,
-             unit_st_cd, stdd_qyt, store_sale_stdd_qty, store_sale_unit_amt,
-             sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
+    <select id="selectItemUnitDupContInfoNo" resultType="com.oqpo.api.entity.stinfo.StoreItemUnitEntity">
+        select /* selectItemUnitDupContInfoNo */
+               brand_unit_unq_no
+        from   store_item_unit_info
+        where  brand_id = #{brandId}
+        and    spply_id = #{spplyId}
+        and    item_id  = #{itemId}
+        and    cont_end_dt between #{contSttDt} and #{contEndDt}
+    </select>
+
+    <update id="updateItemUnitContEnd" >
+        update /* updateItemUnitContEnd */
+                store_item_unit_info
+        set    cont_end_dt =  DATE_SUB(date_format(#{contEndDt},'%Y%m%d'), INTERVAL 1 DAY)
+        where  brand_id = #{brandId}
+        and    brand_unit_unq_no = #{brandUnitUnqNo}
+
+    </update>
+
+
+    <insert id="insertMergItemUnitInfo" >
+        insert into  /** Merge insertMergItemUnitInfo */
+        brand_item_unit_info
+        (brand_unit_unq_no, brand_id, item_id, item_nm, spply_id,
+        spply_nm, cont_stt_dt, cont_end_dt, curr, unit,
+        unit_amt, lead_time, dlv_cndt, short_cont_file_no, spply_item_id,
+        unit_st_cd, stdd_qyt, store_sale_stdd_qty, store_sale_unit_amt,
+        sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
         values
-            (#{entity.brandUnitUnqNo}, #{entity.brandId}, #{entity.itemId}, #{entity.itemNm}, #{entity.spplyId},
+            ( fn_get_dealno(33,''), #{entity.brandId}, #{entity.itemId}, #{entity.itemNm}, #{entity.spplyId},
             #{entity.spplyNm}, #{entity.contSttDt}, #{entity.contEndDt}, #{entity.curr}, #{entity.unit},
             #{entity.unitAmt}, #{entity.leadTime}, #{entity.dlvCndt}, #{entity.shortContFileNo}, #{entity.spplyItemId},
             #{entity.unitStCd}, #{entity.stddQyt}, #{entity.storeSaleStddQty}, #{entity.storeSaleUnitAmt},
             now(), #{userId}, now(), #{userId})
+        on duplicate key
+        update
+            sys_chg_dttm    = now(),
+            ,sys_chg_id      = #{userId},
+            ,cont_stt_dt     = VALUES(cont_stt_dt)
+            ,cont_end_dt     = VALUES(cont_end_dt)
+            ,curr            = VALUES(curr)
+            ,unit            = VALUES(unit)
+            ,unit_amt        = VALUES(unit_amt)
+            ,lead_time       = VALUES(lead_time)
+            ,dlv_cndt        = VALUES(dlv_cndt)
+            ,short_cont_file_no = VALUES(short_cont_file_no)
+            ,unit_st_cd      = VALUES(unit_st_cd)
+            ,stdd_qyt        = VALUES(stdd_qyt)
+            ,store_sale_stdd_qty =VALUES(store_sale_stdd_qty)
+            ,store_sale_unit_amt = VALUES(store_sale_unit_amt)
     </insert>
 
-    <update id="updateItemUnitInfo">
-        update brand_item_unit_info
-        set     cont_stt_dt = #{entity.contSttDt},
-                cont_end_dt = #{entity.contEndDt},
-                curr = #{entity.curr},
-                unit = #{entity.unit},
-                unit_amt = #{entity.unitAmt},
-                lead_time = #{entity.leadTime},
-                dlv_cndt = #{entity.dlvCndt},
-                short_cont_file_no = #{entity.shortContFileNo},
-                unit_st_cd = #{entity.unitStCd},
-                stdd_qyt = #{entity.stddQyt},
-                store_sale_stdd_qty = #{entity.storeSaleStddQty},
-                store_sale_unit_amt = #{entity.storeSaleUnitAmt},
-                sys_chg_dttm = now(),
-                sys_chg_id = #{userId}
-        where   brand_id = #{entity.brandId}
-        and     brand_unit_unq_no = #{entity.brandUnitUnqNo}
-    </update>
+
 
 </mapper>

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

@@ -0,0 +1,123 @@
+<?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.stinfo.ItemUnitMapper">
+
+    <select id="selectStoreItemUnitGridList" resultType="com.oqpo.api.entity.stinfo.StoreItemUnitEntity">
+        select  /* selectStoreItemUnitGridList */
+                iunit.brand_id, fn_brand_nm(iunit.brand_id) as brand_nm, iunit.store_id, fn_store_nm(iunit.store_id) as store_nm,
+                date_format(iunit.cont_stt_dt,'%Y.%m.%d') as cont_stt_dt, date_format(iunit.cont_end_dt,'%Y.%m.%d') as cont_end_dt,
+                date_format(iunit.sys_reg_dttm,'%Y.%m.%d') as sys_reg_dttm, iunit.item_cnt
+        from (
+        select  brand_id, store_id, cont_stt_dt, cont_end_dt, min(sys_reg_dttm) as sys_reg_dttm, count(*) as item_cnt
+        from    store_item_unit_info
+        where   brand_id = #{sBrandId}
+        <if test="sStoreId != null and sStoreId != ''">
+            and     store_id = #{sStoreId}
+        </if>
+        and     unit_target_cd = 'Y'
+        group by brand_id, store_id, cont_stt_dt, cont_end_dt
+        ) iunit
+        <choose>
+            <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
+                <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by iunit.store_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by iunit.store_nm desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by iunit.store_nm asc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectStoreItemUnitGridCnt" resultType="int">
+        select /*selectStoreItemUnitGridCnt*/
+        count(*)
+        from (
+        select  distinct brand_id, store_id, cont_stt_dt, cont_end_dt
+        from    store_item_unit_info
+        where   brand_id = #{sBrandId}
+        <if test="sStoreId != null and sStoreId != ''">
+            and     store_id = #{sStoreId}
+        </if>
+        and     unit_target_cd = 'Y'
+        ) iunit
+    </select>
+
+    <select id="selectStoreItemUnitInfo" resultType="com.oqpo.api.entity.stinfo.StoreItemUnitEntity">
+        select /*selectStoreItemUnitInfo*/
+                item.brand_id, item.item_id, item.item_nm,
+                case when unit.cont_stt_dt is null or unit.cont_stt_dt = '' then #{contSttDt} else date_format(unit.cont_stt_dt,'%Y.%m.%d') end as cont_stt_dt,
+                case when unit.cont_end_dt is null or unit.cont_end_dt = '' then #{contEndDt} else date_format(unit.cont_end_dt,'%Y.%m.%d') end as cont_end_dt,
+                case when unit.unit is null or  unit.unit = '' then item.unit else unit.unit end as unit   ,
+                case when unit.unit is null or  unit.unit = '' then fn_code_nm('DSTRBT_COST_UNIT',item.unit) else fn_code_nm('DSTRBT_COST_UNIT',unit.unit) end as unit_nm   ,
+                case when nvl(unit.stdd_qty,0) = 0 then item.store_sale_stdd_qty else unit.stdd_qty end as stdd_qty  ,
+                case when unit.curr is null or  unit.curr = '' then item.curr else unit.curr end as curr,
+                case when unit.curr is null or  unit.curr = '' then fn_code_nm('CURR',item.curr) else fn_code_nm('CURR',unit.curr) end as curr_nm,
+                case when unit.unit_amt is null or  unit.unit_amt = 0 then item.store_sale_unit_amt else unit.unit_amt end as unit_amt,
+                case when unit.unit_target_cd is null or unit.unit_target_cd = '' then 'Y' else unit.unit_target_cd end as unit_target_cd,
+                case when unit.unit_target_cd is null or unit.unit_target_cd = '' then fn_code_nm('DSTRBT_COST_UNIT','Y') else  fn_code_nm('DSTRBT_COST_UNIT',unit.unit_target_cd)  end as unit_target_nm,
+                nvl(unit.unit_amt,0) as supply_unit_amt
+        from   brand_item_unit_info item
+        left outer join store_item_unit_info unit on  item.brand_unit_unq_no = unit.brand_unit_unq_no and  item.brand_id = unit.brand_id and item.item_id = unit.item_id and unit.store_id = #{storeId}
+        where item.brand_id = #{brandId}
+    </select>
+
+    <select id="selectStoreItemUnitContDateInfo" resultType="com.oqpo.api.entity.stinfo.StoreItemUnitEntity">
+        select /* selectStoreItemUnitContDateInfo */
+                max(cont_end_dt) as cont_end_dt
+        from   store_item_unit_info
+        where  brand_id = #{brandId}
+        and    store_id = #{storeId}
+        and    cont_end_dt between #{contSttDt} and #{contEndDt}
+    </select>
+
+    <update id="updateStoreItemUnitContEnd" >
+        update /* updateStoreItemUnitContEnd */
+                store_item_unit_info
+        set    cont_end_dt =  DATE_SUB(date_format(#{contEndDt},'%Y%m%d'), INTERVAL 1 DAY)
+        where  brand_id = #{brandId}
+        and    store_id = #{storeId}
+        and    cont_end_dt = #{contEndDt}
+
+    </update>
+
+
+    <insert id="insertMergStoreItemUnitInfo" >
+            insert into  /** Merge insertMergStoreItemUnitInfo */
+                store_item_unit_info
+                (store_unit_unq_no, cont_stt_dt, cont_end_dt, unit,
+                 curr, unit_amt, store_id, brand_id, short_cont_file_no,
+                 unit_target_cd, item_id, stdd_qty, brand_unit_unq_no,
+                 sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
+            values
+            <foreach collection="gridUpdateData" item="item" separator=",">
+                ( fn_get_dealno(34,''), #{item.contSttDt}, #{item.contEndDt}, #{item.unit},
+                  #{item.curr}, #{item.unitAmt}, #{item.storeId}, #{item.brandId}, #{item.shortContFileNo},
+                  #{item.unitTargetCd}, #{item.itemId}, #{item.stddQty}, #{item.brandUnitUnqNo},
+                  NOW(), #{userId}, NOW(), #{userId})
+            </foreach>
+            on duplicate key
+            update
+              sys_chg_dttm          = now()
+            , sys_chg_id            = #{userId}
+            , cont_stt_dt       = VALUES(cont_stt_dt)
+            , cont_end_dt       = VALUES(cont_end_dt)
+            , unit              = VALUES(unit)
+            , curr              = VALUES(curr)
+            , unit_amt          = VALUES(unit_amt)
+            , unit_target_cd    = VALUES(unit_target_cd)
+            , stdd_qty          = VALUES(stdd_qty)
+    </insert>
+
+
+
+</mapper>