Просмотр исходного кода

Merge branch 'master' of http://112.172.147.34:4936/style24/style24.doc.git

gagamel 5 лет назад
Родитель
Сommit
af1486cccf

+ 7 - 2
산출물/3.설계/05.DB-Object/03.db_function/FN_GET_APPLY_CPN1_PRICE.sql

@@ -147,8 +147,13 @@ BEGIN
 	) Y
 	LIMIT   1
 	;
-
-	SET O_RET_VALUE = O_CURR_PRICE - O_DC_VAL;
+	
+	IF O_CURR_PRICE > O_DC_VAL THEN
+		SET O_RET_VALUE = O_CURR_PRICE - O_DC_VAL;	
+	ELSE
+		SET O_RET_VALUE = 0;
+	END IF
+	;
 
 	RETURN O_RET_VALUE;
 END

+ 29 - 9
산출물/3.설계/05.DB-Object/06.DDL/table.sql

@@ -10,7 +10,7 @@ grant all privileges on style.style* to 'style'@'%' WITH GRANT OPTION;
 
 /**
 기본 character_set과 collation이 mysql 버전별로 다음과 같다.
-mysql 5.7 > show session variables like '%char%';
+mysql 5.7 > show session variables like '%char%';
 +--------------------------+----------------------------------------+
 | Variable_name            | Value                                  |
 +--------------------------+----------------------------------------+
@@ -406,8 +406,8 @@ CREATE TABLE TB_BRAND
   BRAND_CD         VARCHAR(5) NOT NULL COMMENT '브랜드코드',
   BRAND_ENM        VARCHAR(50) NOT NULL COMMENT '브랜드영문명',
   BRAND_KNM        VARCHAR(50) NOT NULL COMMENT '브랜드한글명',
-  # DISP_NM_LANG     VARCHAR(2)  NOT NULL DEFAULT 'EN' COMMENT '노출명언어', -- 노출명언어 -- #
-  # BRAND_GRP_NM     VARCHAR(50) COMMENT '브랜드그룹명', -- #
+  DISP_NM_LANG     VARCHAR(2)  NOT NULL DEFAULT 'EN' COMMENT '노출명언어', -- 노출명언어 -- #
+  BRAND_GRP_NM     VARCHAR(50) COMMENT '브랜드그룹명', -- #
   SUPPLY_COMP_CD   VARCHAR(20)   NULL COMMENT '공급업체코드(공급업체)',
   DISTRIBUTION_GB  VARCHAR(20) NOT NULL COMMENT '유통구분(공통코드 G065)',
   SELF_YN          CHAR(1) DEFAULT 'N' NOT NULL COMMENT '자사여부(Y:자사, N:입점)',
@@ -417,13 +417,13 @@ CREATE TABLE TB_BRAND
   DELV_FEE         INT DEFAULT 0 NOT NULL COMMENT '배송비(사용안함)',
   DELV_LOC_CD      VARCHAR(20) COMMENT '출고처코드(출고처)',
   SELL_FEE_RATE    FLOAT(5,2) UNSIGNED DEFAULT 0.0 NOT NULL COMMENT '판매수수료율',
-  # BRAND_IMG        VARCHAR(100) COMMENT '브랜드이미지', -- #
+  BRAND_IMG        VARCHAR(100) COMMENT '브랜드이미지', -- #
   PNT_PRATE10      FLOAT(5,2) UNSIGNED DEFAULT 0 NOT NULL COMMENT '포인트적립율(PC정상)',
   PNT_MRATE10      FLOAT(5,2) UNSIGNED DEFAULT 0 NOT NULL COMMENT '포인트적립율(모바일정상)',
   PNT_PRATE20      FLOAT(5,2) UNSIGNED DEFAULT 0 NOT NULL COMMENT '포인트적립율(PC이월)',
   PNT_MRATE20      FLOAT(5,2) UNSIGNED DEFAULT 0 NOT NULL COMMENT '포인트적립율(모바일이월)',
-  # LOGO_FILE_NM     VARCHAR(50) NULL COMMENT '로고파일명', -- 로고파일명 -- #
-  # RGB_CD           VARCHAR(10) NULL COMMENT 'RGB코드', -- RGB코드  -- #
+  LOGO_FILE_NM     VARCHAR(50) NULL COMMENT '로고파일명', -- 로고파일명 -- #
+  RGB_CD           VARCHAR(10) NULL COMMENT 'RGB코드', -- RGB코드  -- #
   DISP_ORD         SMALLINT UNSIGNED DEFAULT 1 NOT NULL COMMENT '표시순서',
   USE_YN           CHAR(1) DEFAULT 'Y' NOT NULL COMMENT '사용여부(Y:사용)',
   BRAND_NO         INT UNSIGNED NOT NULL COMMENT '브랜드번호(WMS 연동용)',
@@ -2744,6 +2744,8 @@ INSERT INTO TB_COMMON_CODE VALUES ('G054', 'G054_204', '회원-1:1문의답변',
 INSERT INTO TB_COMMON_CODE VALUES ('G054', 'G054_205', '회원-가입탈퇴안내', NULL, 'Y', 205, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G054', 'G054_206', '회원-기본LMS안내발송', null, 'Y', 206, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G054', 'G054_207', '회원-휴면계정전환예정', null, 'Y', 207, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G054', 'G054_208', '회원-개인정보 이용내역', NULL, 'Y', 208, 1,  NOW(), 1,  NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G054', 'G054_209', '회원-마케팅 정보 수신동의 내역 ', NULL, 'Y', 209, 1,  NOW(), 1,  NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G054', 'G054_301', '주문-주문안내', NULL, 'Y', 301, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G054', 'G054_302', '주문-무통장입금안내', NULL, 'Y', 302, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G054', 'G054_303', '주문-결품예정안내', NULL, 'Y', 303, 1, NOW(), 1, NOW());
@@ -3234,6 +3236,19 @@ INSERT INTO TB_COMMON_CODE VALUES ('G082', 'G082_50', '상품(1컨)', NULL, 'Y',
 INSERT INTO TB_COMMON_CODE VALUES ('G082', 'G082_51', '상품(2컷)', NULL, 'Y', 7, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G082', 'G082_52', '상품(4컷)', NULL, 'Y', 8, 1, NOW(), 1, NOW());
 
+INSERT INTO TB_COMMON_CODE VALUES ('ROOT', 'G083', '인증대상구분', NULL, 'N', 81, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G083', 'G083_1', '인증대상', NULL, 'Y', 1, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G083', 'G083_2', '인증대상아님', NULL, 'Y', 2, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G083', 'G083_3', '상세설명별도표기', NULL, 'Y', 3, 1, NOW(), 1, NOW());
+
+INSERT INTO TB_COMMON_CODE VALUES ('ROOT', 'G084', '인증형태구분', NULL, 'N', 81, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G084', 'G084_1', '전기용품', NULL, 'Y', 1, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G084', 'G084_2', '생활제품', NULL, 'Y', 2, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G084', 'G084_3', '어린이제품', NULL, 'Y', 3, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G084', 'G084_4', '방송통신기자재', NULL, 'Y', 4, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G084', 'G084_5', '위해우려상품', NULL, 'Y', 5, 1, NOW(), 1, NOW());
+
+
 INSERT INTO TB_COMMON_CODE VALUES ('ROOT', 'G090', '상품평키-성인', NULL, 'N', 90, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G090', '0-149', '150cm 미만', NULL, 'Y', 1, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G090', '150-154', '150~154cm', NULL, 'Y', 2, 1, NOW(), 1, NOW());
@@ -4596,7 +4611,6 @@ CREATE TABLE TB_FREE_GOODS
 (
   PRODUCT_NO         INT UNSIGNED        NOT NULL COMMENT '사은품상품번호 ProductNo(WMS)',
   PRODUCT_CODE       VARCHAR(50)         NOT NULL COMMENT 'ProductCode(WMS)',
-  GOODS_NUM          VARCHAR(20)         NULL     COMMENT '품번(자사상품만 사용)', -- 품번
   BRAND_CD           VARCHAR(5)          NOT NULL COMMENT '브랜드코드', -- 브랜드코드
   GOODS_NM           VARCHAR(200)        NOT NULL COMMENT '상품명', -- 상품명
   USE_YN            CHAR(1)           NOT NULL DEFAULT 'Y' COMMENT '사용여부', -- 사용여부
@@ -11531,9 +11545,12 @@ ALTER TABLE TB_GOODS_EP_SKIP
 DROP TABLE IF EXISTS TB_GOODS_SAFE_NO RESTRICT;
 CREATE TABLE TB_GOODS_SAFE_NO (
   GOODS_CD         VARCHAR(20)   NOT NULL COMMENT '상품코드', -- 상품코드
-  CERT_NUM         VARCHAR(20)   NOT NULL COMMENT '안전인증번호(해당없음,인증번호)', -- 안전인증번호
+  CERT_TARGET_GB   VARCHAR(20)   NULL COMMENT '인증대상구분(공통코드G083)', -- 인증대상구분
+  CERT_FORM_GB     VARCHAR(20)   NULL COMMENT '인증형태구분(공통코드G084)', -- 인증형태구분
+  CERT_TYPE        VARCHAR(20)   NULL COMMENT '인증타입(공통코드G081)', -- 인증타입
+  CERT_NUM         VARCHAR(20)   NULL COMMENT '안전인증번호', -- 안전인증번호
   CERT_STATE       VARCHAR(100)  NULL COMMENT '인증상태(적합,반납,청문실시,기간만료,안저인증취소 등)', -- 인증상태
-  CERT_DIV         VARCHAR(20)   NULL COMMENT '인증구분(공통코드G081)', -- 인증구분
+  CERT_DIV         VARCHAR(20)   NULL COMMENT '인증구분', -- 인증구분
   CERT_ORGAN_NAME  VARCHAR(100)  NULL COMMENT '인증기관', -- 인증기관
   CERT_DT          VARCHAR(8)    NULL COMMENT '안전인증일', -- 안전인증일
   REG_NO           INT UNSIGNED  NOT NULL COMMENT '등록자번호', -- 등록자번호
@@ -15207,6 +15224,9 @@ CREATE TABLE TB_ORDER_DELIVERY_EXCEPTION_ITEM
 	REASON_CD VARCHAR(100) NULL COMMENT '사유',
 	ORD_NO INT UNSIGNED NULL COMMENT '주문번호',
 	ORD_DTL_NO INT UNSIGNED NULL COMMENT '주문상세번호',
+	GIFT_YN   CHAR(1) NOT NULL COMMENT '사은품여부',
+	PRODUCT_NO INT UNSIGNED NULL COMMENT '상품번호',
+	PRODUCT_CODE VARCHAR(20) NULL COMMENT '상품코드',
 	REG_NO INT UNSIGNED NOT NULL COMMENT '등록자NO',
 	REG_DT TIMESTAMP NOT NULL COMMENT '등록일시',
 	UPD_NO INT UNSIGNED NOT NULL COMMENT '수정자NO',

+ 70 - 0
산출물/3.설계/ERD/.metadata/.log

@@ -5148,3 +5148,73 @@ Command-line arguments:  -os win32 -ws win32 -arch x86 D:\WIDE\workspace\webapps
 
 !ENTRY org.eclipse.osgi 2 1 2021-04-30 19:12:15.106
 !MESSAGE NLS unused message: ToggleColumnVisibilityHandler_5 in: com.tomato.exerd.handler.messages
+!SESSION 2021-05-03 13:47:26.951 -----------------------------------------------
+eclipse.buildId=M20090211-1700
+java.version=1.6.0_24
+java.vendor=Sun Microsystems Inc.
+BootLoader constants: OS=win32, ARCH=x86, WS=win32, NL=ko_KR
+Framework arguments:  D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\ST24.exerd
+Command-line arguments:  -os win32 -ws win32 -arch x86 D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\ST24.exerd
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:28.014
+!MESSAGE NLS unused message: OpenResourceDialog_openButton_text in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:28.014
+!MESSAGE NLS unused message: OpenResourceDialog_openWithMenu_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:28.014
+!MESSAGE NLS unused message: OpenResourceDialog_openWithButton_toolTip in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:28.014
+!MESSAGE NLS unused message: CleanDialog_cleanSelectedTaskName in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:28.014
+!MESSAGE NLS unused message: RecentWorkspacesPreferencePage_PromptAtStartup_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:28.014
+!MESSAGE NLS unused message: RecentWorkspacesPreferencePage_RemoveButton_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:29.764
+!MESSAGE NLS unused message: url_couldNotResolve_projectDoesNotExist in: org.eclipse.core.internal.utils.messages
+
+!ENTRY org.eclipse.core.resources 2 10035 2021-05-03 13:47:29.858
+!MESSAGE The workspace exited with unsaved changes in the previous session; refreshing workspace to recover changes.
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:30.170
+!MESSAGE NLS unused message: Shortcuts_shortcutTab in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:30.186
+!MESSAGE NLS unused message: Shortcuts_selectShortcutsLabel in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:30.186
+!MESSAGE NLS unused message: Shortcuts_availableMenus in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:30.186
+!MESSAGE NLS unused message: Shortcuts_availableCategories in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:30.186
+!MESSAGE NLS unused message: Shortcuts_allShortcuts in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:30.186
+!MESSAGE NLS unused message: Util_listNull in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:30.186
+!MESSAGE NLS unused message: OpenBrowserHandler_NoInfoDialogTitle in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:30.186
+!MESSAGE NLS unused message: AboutFeaturesDialog_SimpleTitle in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:35.596
+!MESSAGE NLS unused message: BinaryDumpHandler_1 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:35.596
+!MESSAGE NLS unused message: ConvertToXMLHandler_1 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:35.596
+!MESSAGE NLS unused message: SelectHandler_11 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:35.596
+!MESSAGE NLS unused message: ToggleColumnVisibilityHandler_4 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-05-03 13:47:35.596
+!MESSAGE NLS unused message: ToggleColumnVisibilityHandler_5 in: com.tomato.exerd.handler.messages

BIN
산출물/3.설계/ERD/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index


BIN
산출물/3.설계/ERD/ST24.exerd


BIN
산출물/3.설계/ST24_TSIT-D202-프로그램목록(V3.1)-20210430.xlsx