Ver código fonte

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

gagamel 5 anos atrás
pai
commit
24ebf3de46

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

@@ -2402,7 +2402,8 @@ INSERT INTO TB_COMMON_CODE VALUES ('ROOT', 'G026', '장바구니구분', NULL, '
 INSERT INTO TB_COMMON_CODE VALUES ('G026', 'G026_BC', '장바구니', NULL, 'Y', 1, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G026', 'G026_DP', '바로구매(PC)', NULL, 'Y', 2, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G026', 'G026_DM', '바로구매(모바일)', NULL, 'Y', 3, 1, NOW(), 1, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G026', 'G026_PP', '주문생성', NULL, 'Y', 4, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G026', 'G026_GF', '선물하기', NULL, 'Y', 4, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G026', 'G026_PP', '주문생성', NULL, 'Y', 5, 1, NOW(), 1, NOW());
 
 INSERT INTO TB_COMMON_CODE VALUES ('ROOT', 'G027', '유입경로', NULL, 'Y', 27, 1, NOW(), 1, NOW());
 -- INSERT INTO TB_COMMON_CODE VALUES ('G027', 'IN01_01', '메인>신상품', NULL, 'Y', 1, 1, NOW(), 1, NOW());
@@ -2940,13 +2941,18 @@ INSERT INTO TB_COMMON_CODE VALUES ('G069', 'G069_33', '재방문', NULL, 'N', 33
 INSERT INTO TB_COMMON_CODE VALUES ('G069', 'G069_34', '패밀리세일', NULL, 'N', 34, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G069', 'G069_35', 'APP다운로드', NULL, 'Y', 35, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G069', 'G069_36', '사은품구매', NULL, 'Y', 36, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G069', 'G069_37', '출석체크', NULL, 'Y', 37, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G069', 'G069_40', '구매포인트사용',null,'Y',40,1,now(),1,now());
 INSERT INTO TB_COMMON_CODE VALUES ('G069', 'G069_41', '구매포인트사용취소',null,'Y',41,1,now(),1,now());
 INSERT INTO TB_COMMON_CODE VALUES ('G069', 'G069_42', '사은품포인트사용',null,'Y',42,1,now(),1,now());
 INSERT INTO TB_COMMON_CODE VALUES ('G069', 'G069_43', '사은품포인트사용취소',null,'Y',43,1,now(),1,now());
+INSERT INTO TB_COMMON_CODE VALUES ('G069', 'G069_44', '관리자지급', NULL, 'Y', 44, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G069', 'G069_45', '관리자취소', NULL, 'Y', 45, 1, NOW(), 1, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G069', 'G069_46', '적립취소', NULL, 'Y', 46, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G069', 'G069_90', '기타', NULL, 'Y', 90, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G069', 'G069_99', '포인트소멸', NULL, 'Y', 99, 1, NOW(), 1, NOW());
 
+
 INSERT INTO TB_COMMON_CODE VALUES ('ROOT', 'G070', '포인트반영상태', NULL, 'Y', 280, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G070', 'G070_10', '반영예정', NULL, 'Y', 10, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G070', 'G070_20', '반영전취소', NULL, 'Y', 20, 1, NOW(), 1, NOW());
@@ -3365,6 +3371,7 @@ INSERT INTO TB_COMMON_CODE VALUES ('G260', 'G260_10', '상품', NULL, 'Y', 10, 2
 INSERT INTO TB_COMMON_CODE VALUES ('G260', 'G260_11', '카테고리', NULL, 'Y', 11, 2, NOW(), 2, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G260', 'G260_12', '브랜드', NULL, 'Y', 12, 2, NOW(), 2, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G260', 'G260_13', '공급업체', NULL, 'Y', 13, 2, NOW(), 2, NOW());
+INSERT INTO TB_COMMON_CODE SELECT 'G260', 'G260_14', '제외상품', NULL, 'Y', 14, 1, NOW(), 1, NOW();
 
 INSERT INTO TB_COMMON_CODE VALUES ('ROOT', 'G680', '주문변경요청구분', NULL, 'Y', 680, 2, NOW(), 2, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G680', 'G680_10', '결제전취소', NULL, 'Y', 10, 2, NOW(), 2, NOW());
@@ -3563,6 +3570,16 @@ INSERT INTO TB_COMMON_CODE VALUES ('G300', 'G300_30', '불량', '', 'Y', 3, 1, n
 INSERT INTO TB_COMMON_CODE VALUES ('G300', 'G300_40', '고객주문취소', '', 'Y', 4, 1, now(), 1, now());
 INSERT INTO TB_COMMON_CODE VALUES ('G300', 'G300_90', '미응답', '매장에서 3시간동안 수락,거부 를 하지 않을 시 자동으로 거부 처리 할때 사용', 'Y', 5, 1, now(), 1, now());
 
+# G310 배송상태 (스윗트래커 코드에 맞춤)
+INSERT INTO tb_common_code VALUES ('ROOT','G310','배송상태','스윗트래커 배송상태','Y',0,7,now(),7,now());
+INSERT INTO TB_COMMON_CODE VALUES ('G310','1','배송준비','배송준비','Y',1,7,now(),7,now());
+INSERT INTO TB_COMMON_CODE VALUES ('G310','2','집화완료','집화완료','Y',2,7,now(),7,now());
+INSERT INTO TB_COMMON_CODE VALUES ('G310','3','배송진행','배송진행','Y',3,7,now(),7,now());
+INSERT INTO TB_COMMON_CODE VALUES ('G310','4','지점도착','지점도착','Y',4,7,now(),7,now());
+INSERT INTO TB_COMMON_CODE VALUES ('G310','5','배송출발','배송출발','Y',5,7,now(),7,now());
+INSERT INTO TB_COMMON_CODE VALUES ('G310','6','배송완료','배송완료','Y',6,7,now(),7,now());
+	 
+
 	 
 UPDATE TB_COMMON_CODE SET DISP_ORD = DISP_ORD-1 WHERE CD_GB = 'G941';
 
@@ -13857,3 +13874,29 @@ CREATE TABLE TB_CATE_FILTER_TMP
 )
 COMMENT '카테고리필터임시. 카테고리의 상품 조회를 위한 필터 생성에 의한 발생'
 ;
+
+################################################################################
+#스윗트래커 운송장 상태
+################################################################################
+DROP TABLE IF EXISTS TB_SWEET_TRACKER;
+CREATE TABLE TB_SWEET_TRACKER
+(
+  INVOICE_NO     VARCHAR(50)       NOT NULL COMMENT '운송장번호',
+  DELV_LEVEL     INT UNSIGNED      NOT NULL COMMENT '배송단계  (공통코드 G310)',
+  TIME_TRANS     TIMESTAMP         DEFAULT NULL COMMENT '택배사 처리시간',
+  TIME_SWEET     TIMESTAMP         DEFAULT NULL COMMENT '스윗트래커 등록시간',
+  DELV_WHERE     VARCHAR(100)      DEFAULT NULL COMMENT '택배 위치',
+  TELNO_OFFICE   VARCHAR(50)       DEFAULT NULL COMMENT '사업소 기반 전화번호',
+  TELNO_MAN      VARCHAR(50)       DEFAULT NULL COMMENT '사업소 기반 전화번호',
+  DETAILS        VARCHAR(255)      DEFAULT NULL COMMENT '배송상세 정보',
+  RECV_ADDR      VARCHAR(100)      DEFAULT NULL COMMENT '수취인 주소',
+  RECV_NAME      VARCHAR(100)      DEFAULT NULL COMMENT '수취인 이름',
+  SEND_NAME      VARCHAR(100)      DEFAULT NULL COMMENT '발신인 이름',
+  MAN            VARCHAR(50)       DEFAULT NULL COMMENT '배송기사 이름',
+  ESTMATE        VARCHAR(255)      DEFAULT NULL COMMENT '배송예정 시간',
+  REG_DT         TIMESTAMP         NOT NULL COMMENT '등록일시',
+  PRIMARY KEY (INVOICE_NO, DELV_LEVEL),
+  INDEX TB_SWEET_TRACKER_INVOICE_NO_IDX (INVOICE_NO,DELV_LEVEL)
+)
+COMMENT '스윗트래커 운송장 상태'
+;

+ 12 - 12
산출물/3.설계/ERD/.metadata/.plugins/com.tomato.exerd.core/dialog_settings.xml

@@ -3,38 +3,38 @@
 	<section name="com.tomato.exerd.handler.DiagramSelectDialog">
 		<item value="400" key="DIALOG_WIDTH"/>
 		<item value="588" key="DIALOG_Y_ORIGIN"/>
-		<item value="300" key="DIALOG_HEIGHT"/>
 		<item value="1088" key="DIALOG_X_ORIGIN"/>
+		<item value="300" key="DIALOG_HEIGHT"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
 	<section name="com.tomato.exerd.handler.Helper.FindTableDialog2">
 		<item value="" key="history"/>
 		<item value="744" key="DIALOG_WIDTH"/>
 		<item value="613" key="DIALOG_Y_ORIGIN"/>
-		<item value="1174" key="DIALOG_X_ORIGIN"/>
 		<item value="428" key="DIALOG_HEIGHT"/>
+		<item value="1174" key="DIALOG_X_ORIGIN"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
 	<section name="com.tomato.exerd.export.ModelExportWizardDialog">
 		<item value="701" key="DIALOG_WIDTH"/>
 		<item value="" key="destinationPath"/>
 		<item value="342" key="DIALOG_Y_ORIGIN"/>
-		<item value="테이블 정의서 HTML(기본)" key="lastUsedTemplateName"/>
-		<item value="938" key="DIALOG_X_ORIGIN"/>
 		<item value="670" key="DIALOG_HEIGHT"/>
+		<item value="938" key="DIALOG_X_ORIGIN"/>
+		<item value="테이블 정의서 HTML(기본)" key="lastUsedTemplateName"/>
 		<item value="file" key="sendType"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
-	<section name="solutionSelectionDialog">
-		<item value="1" key="applyScope"/>
-	</section>
 	<section name="com.tomato.exerd.print.PrintSettingsEditorDialog">
 		<item value="721" key="DIALOG_WIDTH"/>
 		<item value="374" key="DIALOG_Y_ORIGIN"/>
-		<item value="621" key="DIALOG_HEIGHT"/>
 		<item value="928" key="DIALOG_X_ORIGIN"/>
+		<item value="621" key="DIALOG_HEIGHT"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
+	<section name="solutionSelectionDialog">
+		<item value="1" key="applyScope"/>
+	</section>
 	<section name="com.tomato.exerd.export.ExportModelWizard">
 		<list key="templateContents">
 		</list>
@@ -44,17 +44,17 @@
 	<section name="com.tomato.exerd.domain.internal.FindDomainDialog">
 		<item value="228" key="DIALOG_WIDTH"/>
 		<item value="533" key="DIALOG_Y_ORIGIN"/>
-		<item value="1174" key="DIALOG_X_ORIGIN"/>
 		<item value="263" key="DIALOG_HEIGHT"/>
+		<item value="1174" key="DIALOG_X_ORIGIN"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
-	<section name="solution">
-	</section>
 	<section name="com.tomato.exerd.handler.Helper.DiagramOrderEditor">
 		<item value="350" key="DIALOG_WIDTH"/>
 		<item value="486" key="DIALOG_Y_ORIGIN"/>
-		<item value="1113" key="DIALOG_X_ORIGIN"/>
 		<item value="453" key="DIALOG_HEIGHT"/>
+		<item value="1113" key="DIALOG_X_ORIGIN"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
+	<section name="solution">
+	</section>
 </section>

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


BIN
산출물/3.설계/ERD/.metadata/.plugins/org.eclipse.core.resources/.root/61.tree


BIN
산출물/3.설계/ERD/.metadata/.plugins/org.eclipse.core.resources/.root/62.tree


BIN
산출물/3.설계/ERD/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources


BIN
산출물/3.설계/ERD/.metadata/.plugins/org.eclipse.core.resources/.snap


+ 1 - 1
산출물/3.설계/ERD/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml

@@ -7,8 +7,8 @@
 	<section name="SaveAsDialogSettings">
 		<item value="525" key="DIALOG_WIDTH"/>
 		<item value="-51" key="DIALOG_Y_ORIGIN"/>
-		<item value="88" key="DIALOG_X_ORIGIN"/>
 		<item value="580" key="DIALOG_HEIGHT"/>
+		<item value="88" key="DIALOG_X_ORIGIN"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
 </section>

+ 11 - 10
산출물/3.설계/ERD/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml

@@ -32,10 +32,10 @@
 </folder>
 </info>
 </editorArea>
-<editor activePart="true" focus="true" id="com.tomato.exerd.editor.DiagramEditor" name="ST24.exerd" partName="ST24.exerd" title="ST24.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\ST24.exerd" workbook="DefaultEditorWorkbook">
+<editor id="com.tomato.exerd.editor.DiagramEditor" name="ST24.exerd" partName="ST24.exerd" title="ST24.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\ST24.exerd" workbook="DefaultEditorWorkbook">
 <input factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/ST24.exerd"/>
 </editor>
-<editor id="com.tomato.exerd.editor.DiagramEditor" name="iSTYLE24_Mall.exerd" partName="iSTYLE24_Mall.exerd" title="iSTYLE24_Mall.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\asis\iSTYLE24_Mall.exerd" workbook="DefaultEditorWorkbook">
+<editor activePart="true" focus="true" id="com.tomato.exerd.editor.DiagramEditor" name="iSTYLE24_Mall.exerd" partName="iSTYLE24_Mall.exerd" title="iSTYLE24_Mall.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\asis\iSTYLE24_Mall.exerd" workbook="DefaultEditorWorkbook">
 <input factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/asis/iSTYLE24_Mall.exerd"/>
 </editor>
 <editor id="com.tomato.exerd.editor.DiagramEditor" name="iSTYLE24_Wms.exerd" partName="iSTYLE24_Wms.exerd" title="iSTYLE24_Wms.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\asis\iSTYLE24_Wms.exerd" workbook="DefaultEditorWorkbook">
@@ -171,14 +171,8 @@
 <editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/asis/iSTYLE24_Mall.exerd"/>
 <editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/ST24.exerd"/>
 <editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/asis/iSTYLE24_Mall.exerd"/>
+<editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/asis/iSTYLE24_Mall.exerd"/>
 </editors>
-<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
-<item historyLabel="ST24.exerd" index="0"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
-<item historyLabel="ST24.exerd" index="0"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
-<item historyLabel="ST24.exerd" index="0"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
 <item historyLabel="ST24.exerd" index="0"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
 <item historyLabel="ST24.exerd" index="0"/>
@@ -221,7 +215,14 @@
 <item historyLabel="iSTYLE24_Mall.exerd" index="3"/>
 <item historyLabel="ST24.exerd" index="2"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="3"/>
-<item active="true" historyLabel="ST24.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="2"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
+<item historyLabel="ST24.exerd" index="2"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
+<item historyLabel="ST24.exerd" index="2"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
+<item historyLabel="ST24.exerd" index="2"/>
+<item active="true" historyLabel="iSTYLE24_Mall.exerd" index="4"/>
 </navigationHistory>
 <input factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/" type="8"/>
 </page>