Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-api

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

@@ -43,6 +43,7 @@ public class StoreItemUnitEntity implements Serializable {
     private String unitTargetNm;
     private String spplyId;
     private String spplyNm;
+    private String spplyAmt;
 
     private List<FileEntity> fileEntity ;
 }

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

@@ -0,0 +1,46 @@
+package com.oqpo.api.enums;
+
+import com.oqpo.api.exception.GlobalException;
+import lombok.Getter;
+import lombok.Setter;
+
+public enum StoreDeliType {
+    
+    SDT01("10", "본사배송"), //
+    SDT02("20", "공급사배송"), //
+    ;
+
+    StoreDeliType(String cd, String nm) {
+        this.cd = cd;
+        this.name = nm;
+    }
+
+    @Getter
+    @Setter
+    private String cd;
+
+    @Getter
+    @Setter
+    private String name;
+
+    public static String getCd(String nname) {
+        StoreDeliType[] values = StoreDeliType.values();
+        for (StoreDeliType icd : values) {
+            if (icd.name.equals(nname)) {
+                return icd.cd;
+            }
+        }
+        return nname;
+    }
+
+    public static String getName(String ccd) {
+        StoreDeliType[] values = StoreDeliType.values();
+        for (StoreDeliType icd : values) {
+            if (icd.cd.equals(ccd)) {
+                return icd.name;
+            }
+        }
+        return ccd;
+    }
+
+}

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

@@ -598,7 +598,7 @@ public class ItemService extends CommonService {
         entity.setItemType(ItemType.getCd(item.getItemTypeNm()));
         entity.setBarcode(item.getBarcode());
         entity.setStoreDeliTypeNm(item.getStoreDeliTypeNm());
-        entity.setStoreDeliType(item.getStoreDeliTypeNm() == "본사배송" ? "10" : "20");
+        entity.setStoreDeliType(StoreDeliType.getCd(item.getStoreDeliTypeNm()));
         entity.setSysRegId(userId);
         entity.setSysChgId(userId);
         return entity;

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

@@ -60,6 +60,7 @@ public class StoreItemUnitInfoResponse {
                                 .spplyUnitAmt (m.getSpplyUnitAmt() == null ? 0 :m.getSpplyUnitAmt())
                                 .spplyId(m.getSpplyId() == null ? "" : m.getSpplyId())
                                 .spplyNm(m.getSpplyNm() == null ? "" : m.getSpplyNm())
+                                .spplyAmt(m.getSpplyAmt() == null ? "" : m.getSpplyAmt())
                                 .build())
                         .collect(Collectors.toList()))
                 .build();
@@ -130,6 +131,9 @@ public class StoreItemUnitInfoResponse {
 
         @ApiModelProperty(value = "공급사명")
         private String spplyNm ;
+
+        @ApiModelProperty(value = "공급사대표단가")
+        private String spplyAmt ;
     }
 
 

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

@@ -105,26 +105,41 @@
 -->
     <select id="selectStoreItemUnitInfo" resultType="com.oqpo.api.entity.stinfo.StoreItemUnitEntity">
         select /*selectStoreItemUnitInfo*/
-                        case when unit.store_unit_unq_no is null then 'C' else 'R' end view_cd,
-                        unit.store_unit_unq_no, item.brand_id, item.item_id, item.item_nm,
-                        case when unit.cont_stt_dt is null or unit.cont_stt_dt = '' then date_format(#{contSttDt},'%Y.%m.%d') 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 date_format(#{contEndDt},'%Y.%m.%d') else date_format(unit.cont_end_dt,'%Y.%m.%d') end as cont_end_dt,
-                        case when unit.unit is null or  unit.unit = '' or store.loan_dvsn = 'LD03' then item.unit else unit.unit end as unit   ,
-                        case when unit.unit is null or  unit.unit = '' or store.loan_dvsn = 'LD03' 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 or store.loan_dvsn = 'LD03' then item.store_sale_stdd_qty else unit.stdd_qty end as stdd_qty  ,
-                        case when unit.curr is null or  unit.curr = '' or store.loan_dvsn = 'LD03' then item.curr else unit.curr end as curr,
-                        case when unit.curr is null or  unit.curr = '' or store.loan_dvsn = 'LD03' 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 or store.loan_dvsn = 'LD03' 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 = '' or store.loan_dvsn = 'LD03' 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 = '' or store.loan_dvsn = 'LD03' 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(item.unit_amt,0) as spply_unit_amt
-                        ,item.brand_unit_unq_no,item.spply_id,fn_spply_nm(item.spply_id) as spply_nm
-                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}
-                                  and unit.cont_stt_dt = #{contSttDt} and unit.cont_end_dt = #{contEndDt}
-                left outer join store_base_info store on unit.store_id = store.store_id and store.store_id = #{storeId}
-                where item.brand_id = #{brandId}
-                order by view_cd, item.item_id, item.unit_amt
+                case when unit.store_unit_unq_no is null then 'C' else 'R' end view_cd,
+                unit.store_unit_unq_no, item.brand_id, item.item_id, item.item_nm,
+                case when unit.cont_stt_dt is null or unit.cont_stt_dt = '' then date_format(#{contSttDt},'%Y.%m.%d') 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 date_format(#{contEndDt},'%Y.%m.%d') else date_format(unit.cont_end_dt,'%Y.%m.%d') end as cont_end_dt,
+                case when unit.unit is null or  unit.unit = '' or store.loan_dvsn = 'LD03' then item.unit else unit.unit end as unit   ,
+                case when unit.unit is null or  unit.unit = '' or store.loan_dvsn = 'LD03' 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 or store.loan_dvsn = 'LD03' then item.store_sale_stdd_qty else unit.stdd_qty end as stdd_qty  ,
+                case when unit.curr is null or  unit.curr = '' or store.loan_dvsn = 'LD03' then item.curr else unit.curr end as curr,
+                case when unit.curr is null or  unit.curr = '' or store.loan_dvsn = 'LD03' 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 or store.loan_dvsn = 'LD03' 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 = '' or store.loan_dvsn = 'LD03' 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 = '' or store.loan_dvsn = 'LD03' 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(item.unit_amt,0) as spply_unit_amt
+                , item.brand_unit_unq_no,item.spply_id,fn_spply_nm(item.spply_id) as spply_nm
+                , spply.spply_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}
+                and unit.cont_stt_dt = #{contSttDt} and unit.cont_end_dt = #{contEndDt}
+            left outer join store_base_info store 
+                on unit.store_id = store.store_id 
+                and store.store_id = #{storeId}
+            LEFT join ( 
+                SELECT brand_id, item_id, MAX(unit_amt) AS spply_amt 
+                FROM brand_item_unit_info 
+                GROUP BY brand_id, item_id 
+            ) spply 
+                ON item.brand_id=spply.brand_id 
+                AND item.ITEM_ID = spply.item_id  
+        where 
+            item.brand_id = #{brandId}
+        order by view_cd, item.item_id, item.unit_amt
     </select>
 
     <select id="selectStoreItemUnitContDateInfo" resultType="String">