Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/java/com/baosight/hggp/core/extapp/decheng/annotation/AliasNameAnon.java

 package com.baosight.hggp.core.extapp.decheng.annotation;
 
+import org.springframework.core.annotation.AliasFor;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -11,10 +13,19 @@ import java.lang.annotation.RetentionPolicy;
 public @interface AliasNameAnon {
 	
 	/**
+	 * 值
+	 *
+	 * @return
+	 */
+	@AliasFor("name")
+	String value() default "";
+	
+	/**
 	 * 名称
 	 *
 	 * @return
 	 */
+	@AliasFor("value")
 	String name() default "";
 	
 }

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC001.xml

@@ -133,7 +133,7 @@
         SELECT
         <include refid="column"/>
         FROM ${hggpSchema}.HGSC001
-        WHERE PROJ_CODE = #projCode
+        WHERE PROJ_CODE = #projCode#
     </select>
 
     <select id="query" resultClass="com.baosight.hggp.hg.sc.domain.HGSC001">

src/main/webapp/HG/CG/HGCG003A.jsp

@@ -55,6 +55,10 @@
 			<EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="inventRecordId" cname="规格ID" enable="false" width="100" align="center" hidden="true"/>
 			<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
+			<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="width" cname="宽(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="thick" cname="厚(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="bcReceiveQty" cname="本次</br>收货数量" width="100" align="right" format="{0:N3}"
 			             required="true"/>
 			<EF:EFColumn ename="bcMaxReceiveQty" cname="本次最大</br>收货数量" enable="false" width="100" align="right"
@@ -84,10 +88,7 @@
 			             sumType="page"/>
 			<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="120" align="right"
 			             format="{0:C3}" sumType="page"/>
-			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
-			<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="width" cname="宽(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="thick" cname="厚(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
+
 			<EF:EFColumn ename="planNo" cname="计划单号" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"