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

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

@@ -3581,7 +3581,9 @@ ALTER TABLE TB_DELIVERY_ADDR
   MODIFY COLUMN DELV_ADDR_SQ INT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '배송지일련번호';
 
 ALTER TABLE TB_DELIVERY_ADDR
-  AUTO_INCREMENT = 54805291;
+  AUTO_INCREMENT = 1;
+
+CREATE INDEX IX_DELIVERY_ADDR_01 ON tb_delivery_addr (OLD_ORD_NO);
 
 ################################################################################
 #배송비
@@ -5266,6 +5268,7 @@ CREATE TABLE TB_PLAN_CONTENTS (
   TMPL_TYPE    VARCHAR(20)       NOT NULL COMMENT '템플릿유형(공통코드G082)', -- 템플릿유형(공통코드G082)
   TITLE        VARCHAR(200)      NULL     COMMENT '타이틀', -- 타이틀
   LINK_URL     VARCHAR(200)      NULL     COMMENT '링크URL', -- 링크URL
+  NOTE         VARCHAR(4000)     NULL     COMMENT '노트',
   DISP_YN      CHAR(1)           NOT NULL DEFAULT 'Y' COMMENT '표시여부', -- 표시여부
   DISP_ORD     SMALLINT UNSIGNED NOT NULL DEFAULT 100 COMMENT '표시순서', -- 표시순서
   REG_NO       INT UNSIGNED      NOT NULL COMMENT '등록자번호', -- 등록자번호
@@ -5922,10 +5925,10 @@ CREATE TABLE TB_DELV_FEE_POLICY
 COMMENT '배송비정책. 업체별 배송비 정책 등록에 의한 발생'
 ;
 
-INSERT INTO TB_DELV_FEE_POLICY VALUES ('S0001_01', 'S0001', 'G078_10', 40000, 2500, 2500, 'Y', 1, NOW(), 1, NOW());
-INSERT INTO TB_DELV_FEE_POLICY VALUES ('S0002_01', 'S0002', 'G078_10', 40000, 2500, 2500, 'Y', 1, NOW(), 1, NOW());
 COMMIT;
 
+CREATE INDEX IX_DELV_FEE_POLICY_01 ON tb_delv_fee_policy (DELIVERY_UNIT_NO);
+
 ################################################################################
 # 상품권API내역
 ################################################################################
@@ -9577,6 +9580,7 @@ CREATE TABLE TB_OPTION (
   PRODUCT_NO     INT UNSIGNED      NULL COMMENT 'ProductNo(WMS)',
   PRODUCT_CODE   VARCHAR(50)       NULL COMMENT 'ProductCode(WMS)',
   BASE_STOCK_QTY SMALLINT          NOT NULL DEFAULT 0 COMMENT '기준재고(안전재고)수량', -- 기준재고(안전재고)수량
+  STORE_STOCK_QTY SMALLINT         DEFAULT 0 NOT NULL comment '매장재고수량',
   CURR_STOCK_QTY SMALLINT          NOT NULL DEFAULT 0 COMMENT '현재고수량', -- 현재고수량
   ADD_PRICE      INT               NOT NULL DEFAULT 0 COMMENT '추가가격', -- 추가가격
   SOLDOUT_YN     CHAR(1)           NOT NULL DEFAULT 'N' COMMENT '결품여부', -- 결품여부
@@ -9618,6 +9622,7 @@ CREATE TABLE TB_OPTION_HST (
   PRODUCT_CODE   VARCHAR(50)       NOT NULL COMMENT 'ProductCode(WMS)',
   BASE_STOCK_QTY SMALLINT          NOT NULL DEFAULT 0 COMMENT '기준재고(안전재고)수량', -- 기준재고(안전재고)수량
   CURR_STOCK_QTY SMALLINT          NOT NULL DEFAULT 0 COMMENT '현재고수량', -- 현재고수량
+  STORE_STOCK_QTY SMALLINT         DEFAULT 0 NOT NULL comment '매장재고수량',
   ADD_PRICE      INT               NOT NULL DEFAULT 0 COMMENT '추가가격', -- 추가가격
   SOLDOUT_YN     CHAR(1)           NOT NULL DEFAULT 'N' COMMENT '결품여부', -- 결품여부
   DISP_ORD       SMALLINT UNSIGNED  NOT NULL DEFAULT 1 COMMENT '표시순서', -- 표시순서

산출물/3.설계/ERD/.metadata/.log

@@ -4518,3 +4518,73 @@ Command-line arguments:  -os win32 -ws win32 -arch x86 D:\WIDE\workspace\webapps
 
 !ENTRY org.eclipse.osgi 2 1 2021-03-22 10:32:03.772
 !MESSAGE NLS unused message: ToggleColumnVisibilityHandler_5 in: com.tomato.exerd.handler.messages
+!SESSION 2021-04-01 10:27:20.757 -----------------------------------------------
+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-04-01 10:27:21.976
+!MESSAGE NLS unused message: OpenResourceDialog_openButton_text in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:21.976
+!MESSAGE NLS unused message: OpenResourceDialog_openWithMenu_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:21.976
+!MESSAGE NLS unused message: OpenResourceDialog_openWithButton_toolTip in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:21.976
+!MESSAGE NLS unused message: CleanDialog_cleanSelectedTaskName in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:21.976
+!MESSAGE NLS unused message: RecentWorkspacesPreferencePage_PromptAtStartup_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:21.976
+!MESSAGE NLS unused message: RecentWorkspacesPreferencePage_RemoveButton_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:23.350
+!MESSAGE NLS unused message: url_couldNotResolve_projectDoesNotExist in: org.eclipse.core.internal.utils.messages
+
+!ENTRY org.eclipse.core.resources 2 10035 2021-04-01 10:27:23.413
+!MESSAGE The workspace exited with unsaved changes in the previous session; refreshing workspace to recover changes.
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:23.632
+!MESSAGE NLS unused message: Shortcuts_shortcutTab in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:23.632
+!MESSAGE NLS unused message: Shortcuts_selectShortcutsLabel in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:23.632
+!MESSAGE NLS unused message: Shortcuts_availableMenus in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:23.648
+!MESSAGE NLS unused message: Shortcuts_availableCategories in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:23.648
+!MESSAGE NLS unused message: Shortcuts_allShortcuts in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:23.648
+!MESSAGE NLS unused message: Util_listNull in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:23.648
+!MESSAGE NLS unused message: OpenBrowserHandler_NoInfoDialogTitle in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:23.648
+!MESSAGE NLS unused message: AboutFeaturesDialog_SimpleTitle in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:27.367
+!MESSAGE NLS unused message: BinaryDumpHandler_1 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:27.367
+!MESSAGE NLS unused message: ConvertToXMLHandler_1 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:27.367
+!MESSAGE NLS unused message: SelectHandler_11 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:27.367
+!MESSAGE NLS unused message: ToggleColumnVisibilityHandler_4 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-04-01 10:27:27.367
+!MESSAGE NLS unused message: ToggleColumnVisibilityHandler_5 in: com.tomato.exerd.handler.messages

산출물/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="580" key="DIALOG_HEIGHT"/>
 		<item value="88" key="DIALOG_X_ORIGIN"/>
+		<item value="580" 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>

산출물/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">
@@ -167,42 +167,34 @@
 <workingSets/>
 <navigationHistory>
 <editors>
-<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/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/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/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/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"/>
 </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"/>
-<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="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
-<item historyLabel="ST24.exerd" index="2"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="0"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="0"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="0"/>
+<item historyLabel="ST24.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
 <item historyLabel="ST24.exerd" index="3"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
 <item historyLabel="ST24.exerd" index="3"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
 <item historyLabel="ST24.exerd" index="3"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
 <item historyLabel="ST24.exerd" index="3"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
 <item historyLabel="ST24.exerd" index="3"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
+<item historyLabel="ST24.exerd" index="3"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="2"/>
 <item historyLabel="ST24.exerd" index="3"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
 <item historyLabel="ST24.exerd" index="5"/>
@@ -212,20 +204,27 @@
 <item historyLabel="ST24.exerd" index="5"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
 <item historyLabel="ST24.exerd" index="5"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="6"/>
 <item historyLabel="ST24.exerd" index="5"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="6"/>
 <item historyLabel="ST24.exerd" index="5"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="6"/>
 <item historyLabel="ST24.exerd" index="5"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="6"/>
-<item historyLabel="ST24.exerd" index="7"/>
+<item historyLabel="ST24.exerd" index="5"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="6"/>
+<item historyLabel="ST24.exerd" index="5"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="6"/>
+<item historyLabel="ST24.exerd" index="5"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="6"/>
-<item historyLabel="ST24.exerd" index="7"/>
+<item historyLabel="ST24.exerd" index="5"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="6"/>
-<item historyLabel="ST24.exerd" index="7"/>
+<item historyLabel="ST24.exerd" index="5"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="6"/>
-<item active="true" historyLabel="ST24.exerd" index="7"/>
+<item historyLabel="ST24.exerd" index="5"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="6"/>
+<item historyLabel="ST24.exerd" index="5"/>
+<item active="true" historyLabel="iSTYLE24_Mall.exerd" index="6"/>
 </navigationHistory>
 <input factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/" type="8"/>
 </page>