Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/java/com/baosight/hggp/hg/wd/sql/HGWD001.xml

src/main/java/com/baosight/hggp/hg/constant/HGConstant.java

@@ -131,6 +131,8 @@ public class HGConstant {
 		//销售退货单号
 		public static final String RETURN_CODE = "RETURN_CODE";
 
+		public static final String WD_FILE_ID = "WD_FILE_ID";
+
 	}
 
 	/**

src/main/java/com/baosight/hggp/hg/wd/domain/HGWD001.java

@@ -78,6 +78,7 @@ public class HGWD001 extends DaoEPBase {
 	public static final String INSERT = "HGWD001.insert";
 	public static final String UPDATE = "HGWD001.update";
 	public static final String DELETE = "HGWD001.delete";
+	public static final String RELEASE_DATE = "HGWD001.releaseDate";
 
 	private Long id = new Long(0);
 	private String accountCode = " ";		/* 企业编码*/

src/main/java/com/baosight/hggp/hg/wd/sql/HGWD001.xml

@@ -97,6 +97,9 @@
 		<isNotEmpty prepend=" AND " property="remark">
 			REMARK = #remark#
 		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="releaseDate">
+                RELEASE_DATE = #releaseDate#
+        </isNotEmpty>
 	</sql>
 
     <sql id="orderBy">
@@ -136,20 +139,21 @@
         COMPANY_CODE,  <!-- 公司编码 -->
         COMPANY_NAME,  <!-- 公司名称 -->
         PROJ_CODE,  <!-- 项目编码 -->
-        FILE_ID,  <!-- 文件ID -->
         PROJ_NAME,  <!-- 项目名称 -->
+        FILE_ID,  <!-- 文件ID -->
         FILE_TYPE,  <!-- 文件类型 -->
         FILE_NAME,  <!-- 文件名称 -->
         DOC_ID,  <!-- 文件号 -->
         DOC_NAME,  <!-- 文件附件名称 -->
         DOC_VERSION,  <!-- 文件版本号 -->
         STATUS,  <!-- 状态 -->
-        REMARK  <!-- 备注 -->
+        REMARK,  <!-- 备注 -->
+        RELEASE_DATE
         ) VALUES (
         #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
         #deleteFlag#, #companyCode#, #companyName#, #projCode#, #projName#,
         #fileId#, #fileType#, #fileName#,
-        #docId#, #docName#, #docVersion#, #status#, #remark#
+        #docId#, #docName#, #docVersion#, #status#, #remark#, #releaseDate#
         )
     </insert>
 
@@ -169,6 +173,16 @@
         DOC_VERSION = #docVersion#,   <!-- 文件版本号 -->
         STATUS = #status#,   <!-- 状态 -->
         REMARK = #remark#,  <!-- 备注 -->
+        RELEASE_DATE = #releaseDate#,  <!--发布时间-->
+        <include refid="SqlBase.updateRevise"/>
+        WHERE ID = #id#
+    </update>
+
+    <update id="updateReleaseDate">
+        UPDATE ${hggpSchema}.HGWD001
+        SET
+        RELEASE_DATE = #releaseDate#,  <!--发布时间-->
+        STATUS = #status#,   <!-- 状态 -->
         <include refid="SqlBase.updateRevise"/>
         WHERE ID = #id#
     </update>