增加运单号正则校验

@@ -15,16 +15,17 @@
 		<attributes>
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 		</attributes>
 	</classpathentry>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 		</attributes>
 	</classpathentry>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 		<attributes>
-			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 		</attributes>
 	</classpathentry>
 	</classpathentry>
@@ -34,6 +35,5 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 		</attributes>
 	</classpathentry>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="output" path="target/classes"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
 </classpath>

@@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.compiler.source=1.7

@@ -1013,6 +1013,17 @@ $(function(){
 	
 	
 	 function checkNo(content){
 	 function checkNo(content){
 		 if (content) {
 		 if (content) {
+			 var reg = /^(\d{3})(-)(\d{8})$/;
+			 var flag = content.match(reg);
+			 if(flag==null){
+				 layui.use('layer', function(){
+					var layer = layui.layer;
+					parent.layer.alert('主单号格式错误，请检查运单号位数及格式，例如：172-30937185', {icon: 0});
+					$("#waybill").focus(); 
+				});   
+				 return;
+			 }
+			 
 			 content = content.replace(/ /g,'');
 			 content = content.replace(/ /g,'');
 			 $("#waybill").val(content);
 			 $("#waybill").val(content);