Przeglądaj źródła

배송구분추가

dwkim 2 lat temu
rodzic
commit
e0f6ec1ff7

+ 3 - 0
src/main/java/com/oqpo/api/entity/stinfo/ItemUnitEntity.java

@@ -60,6 +60,9 @@ public class ItemUnitEntity implements Serializable {
60 60
     private Integer prpStckQty ;
61 61
     private String whsNm;
62 62
 
63
+    private String storeDeliType;
64
+    private String storeDeliTypeNm;
65
+
63 66
 
64 67
     private List<FileEntity> fileEntity ;
65 68
 

+ 2 - 0
src/main/java/com/oqpo/api/service/stinfo/ItemService.java

@@ -918,6 +918,8 @@ public class ItemService extends CommonService {
918 918
                         .brandUnitUnqNo(m.getBrandUnitUnqNo())
919 919
                         .storeUnitUnqNo(m.getStoreUnitUnqNo() == null ? "" : m.getStoreUnitUnqNo())
920 920
                         .whsPassQty(m.getWhsPassQty() == null ? 0 : m.getWhsPassQty())
921
+                        .storeDeliType(m.getStoreDeliType() == null ? "" : m.getStoreDeliType())
922
+                        .storeDeliTypeNm(m.getStoreDeliTypeNm() == null ? "" : m.getStoreDeliTypeNm())
921 923
                         .build())
922 924
                 .collect(Collectors.toList());
923 925
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);

+ 6 - 0
src/main/java/com/oqpo/api/web/dto/response/stinfo/item/ItemPopSearchResponse.java

@@ -55,4 +55,10 @@ public class ItemPopSearchResponse {
55 55
 
56 56
     @ApiModelProperty(value = "매장단가고유번호")
57 57
     private String storeUnitUnqNo;
58
+
59
+    @ApiModelProperty(value = "배송구분코드")
60
+    private String storeDeliType;
61
+
62
+    @ApiModelProperty(value = "배송구분명")
63
+    private String storeDeliTypeNm;
58 64
 }

+ 2 - 0
src/main/resources/mybatis/sqlmaps/stinfo/ItemUnit.xml

@@ -759,6 +759,7 @@
759 759
         select  /* selectPopNewItemBrandUnitGridList */
760 760
             iInfo.item_id,iInfo.item_nm,iInfo.podr_pssbl_dvsn, fn_code_nm('PODR_PSSBL_DVSN',iInfo.podr_pssbl_dvsn) AS podr_pssbl_dvsn_nm
761 761
             ,iInfo.unit, fn_code_nm('DSTRBT_COST_UNIT', iInfo.unit) as unit_nm
762
+            , iInfo.store_deli_type, fn_code_nm('STORE_DELI_TYPE', iInfo.store_deli_type) as store_deli_type_nm
762 763
         from item_base_info iInfo
763 764
         where iInfo.brand_id = #{sBrandId}
764 765
         AND   iInfo.item_st_cd = 'IS00'
@@ -793,6 +794,7 @@
793 794
         select  /* selectPopItemStoreUnitBaseGridList */
794 795
          distinct iInfo.item_id,iInfo.item_nm,iInfo.podr_pssbl_dvsn, fn_code_nm('PODR_PSSBL_DVSN',iInfo.podr_pssbl_dvsn) AS podr_pssbl_dvsn_nm
795 796
                 ,sInfo.unit, fn_code_nm('DSTRBT_COST_UNIT', sInfo.unit) as unit_nm
797
+                , iInfo.store_deli_type, fn_code_nm('STORE_DELI_TYPE', iInfo.store_deli_type) as store_deli_type_nm
796 798
         from item_base_info iInfo
797 799
         join store_base_info store on iInfo.brand_id = store.brand_id   and store.store_id = #{sStoreId}
798 800
         join store_item_unit_info sInfo on iInfo.brand_id = sInfo.brand_id and iInfo.item_id = sInfo.item_id and sInfo.unit_target_cd = 'Y'