修改

adm/.gitignore

@@ -0,0 +1,43 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml

adm/src/main/resources/com/minpay/db/table/own/mapper/PurchaseAndSalesManageMapper.xml

@@ -182,7 +182,7 @@
 			and  c.ACI_TYPE = #{type, jdbcType=VARCHAR}
 		</if>
 	     <if test="contractType != null and contractType != ''">
-			and  c.ACI_CONTRACT_TYPE = #{contractType, jdbcType=VARCHAR}
+			and  replace(replace(c.ACI_CONTRACT_TYPE,'-',''),'~','') = replace(replace(#{contractType, jdbcType=VARCHAR},'-',''),'~','')
 		</if>
 	     <if test="branchId != null and branchId != ''">
 			and s.AWST_BRANCH_ID  = #{branchId,jdbcType=VARCHAR}

adm/src/main/webapp/WEB-INF/database.xml

@@ -5,9 +5,9 @@
 	http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
 	
-	<bean id="dataSource" name="dataSource" class="org.apache.commons.dbcp.BasicDataSource" 
+	<bean id="dataSource" name="dataSource" destroy-method="close" init-method="init" class="com.alibaba.druid.pool.DruidDataSource" 
 		scope="singleton"> 
-		<property name="driverClassName" value="${dataSource.driverClassName}" /> 
+		<!-- <property name="driverClassName" value="${dataSource.driverClassName}" /> 
 		<property name="url" value="${dataSource.url}" /> 
 		<property name="username" value="${dataSource.username}"/> 
 		<property name="password" value="${dataSource.password}"/> 
@@ -20,7 +20,38 @@
    		<property name="maxActive" value="20"/>
    		<property name="maxIdle" value="0"/>
    		<property name="maxWait" value="60000"/>  
-   		<property name="minEvictableIdleTimeMillis" value="3600000"/>  
+   		<property name="minEvictableIdleTimeMillis" value="3600000"/>  -->
+   		
+   		<property name="url" value="${dataSource.url}"/>
+		<property name="username" value="${dataSource.username}"/>
+		<property name="password" value="${dataSource.password}"/>
+		<!-- 初始化连接大小 -->
+		<property name="initialSize" value="0"/>
+		<!-- 连接池最大使用连接数量 -->
+		<property name="maxActive" value="20"/>
+		<!-- 连接池最小空闲 -->
+		<property name="minIdle" value="0"/>
+		<!-- 获取连接最大等待时间 -->
+		<property name="maxWait" value="60000"/>
+		<property name="poolPreparedStatements" value="true"/>
+		<property name="maxPoolPreparedStatementPerConnectionSize" value="33"/>
+		<!-- 用来检测有效sql -->
+		<property name="validationQuery" value="SELECT 1 from dual"/>
+		<property name="testOnBorrow" value="false"/>
+		<property name="testOnReturn" value="false"/>
+		<property name="testWhileIdle" value="true"/>
+		<!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
+		<property name="timeBetweenEvictionRunsMillis" value="60000"/>
+		<!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
+		<property name="minEvictableIdleTimeMillis" value="25200000"/>
+		<!-- 打开removeAbandoned功能 -->
+		<property name="removeAbandoned" value="true"/>
+		<!-- 1800秒，也就是30分钟 -->
+		<property name="removeAbandonedTimeout" value="1800"/>
+		<!-- 关闭abanded连接时输出错误日志 -->
+		<property name="logAbandoned" value="true"/>
+		<!-- 监控数据库 -->
+		<property name="filters" value="stat"/>
 	</bean>
 	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean"
 		scope="singleton" lazy-init="true">

adm/src/main/webapp/WEB-INF/web.xml

@@ -39,6 +39,39 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
   
+  
+  	<!-- druid 监控 -->
+	<filter>
+		<filter-name>druidWebStatFilter</filter-name>
+		<filter-class>com.alibaba.druid.support.http.WebStatFilter</filter-class>
+		<init-param>
+			<param-name>exclusions</param-name>
+			<param-value>/assets/*,*.css,*.js,*.gif,*.jpg,*.png,*.ico,*.eot,*.svg,*.ttf,*.woff,*.jsp,*.tpl,/druid/*</param-value>
+		</init-param>
+	</filter>
+	<filter-mapping>
+		<filter-name>druidWebStatFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+	<servlet>
+		<servlet-name>druidStatView</servlet-name>
+		<servlet-class>com.alibaba.druid.support.http.StatViewServlet</servlet-class>
+		<init-param>
+			<!-- 用户名 -->
+			<param-name>loginUsername</param-name>
+			<param-value>admin</param-value>
+		</init-param>
+		<init-param>
+			<!-- 密码 -->
+			<param-name>loginPassword</param-name>
+			<param-value>admin</param-value>
+		</init-param>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>druidStatView</servlet-name>
+		<url-pattern>/druid/*</url-pattern>
+	</servlet-mapping>
+
   <servlet>
     <servlet-name>springFrame</servlet-name>
     <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>

adm/src/main/webapp/admin/orderManage/orderCD.html

@@ -100,6 +100,9 @@
 	 			<button class="layui-btn left-bnt1 in-b" id="WarehouseCheckMore">
 					 批量打印出库单（提货单）
 	 			</button>
+	 			<button class="layui-btn left-bnt1 in-b" id="WarehouseCheckMoreNew">
+					新批量打印出库单（提货单）
+	 			</button>
 	 			<button class="layui-btn left-bnt1 in-b" id="printWarehouseOrder">
 					 打印入库单
 	 			</button>
@@ -194,16 +197,19 @@
 			$("#batchPrintOut").attr("style","display:none;");
 			$("#batchPrintCheck").attr("style","display:none;");
 			$("#WarehouseCheckMore").attr("style","display:none;");
+			$("#WarehouseCheckMoreNew").attr("style","display:none;");
 		}else{//销售铝---显示
 			$("#batchPrintOut").attr("style","display:show();");
 			$("#batchPrintCheck").attr("style","display:show();");
 			$("#WarehouseCheckMore").attr("style","display:show();");
+			$("#WarehouseCheckMoreNew").attr("style","display:show();");
 			$("#createDateDiv").show();
 		}
 	}else{//隐藏
-		$("#batchPrintOut").attr("style","display:none;");
-		$("#batchPrintCheck").attr("style","display:none;");
-		$("#WarehouseCheckMore").attr("style","display:none;");
+		$("#batchPrintOut").hide();
+		$("#batchPrintCheck").hide();
+		$("#WarehouseCheckMore").hide();
+		$("#WarehouseCheckMoreNew").hide();
 	}
 	layui.use(['laydate','form'], function(){
 		var laydate = layui.laydate;
@@ -727,7 +733,31 @@
 	     
 	     setTempVal('batchPrintOut', datas);
 	     var orderName = encodeURI(encodeURI(datas[0].orderName));
-	     openMainTabPageParent(tabPageId+'-21', '打印出库单（提货单）', 'stockManage/enteringWarehouseCheckMore.html?orderName='+orderName+'&conType='+conType+'&tabPageId='+tabPageId+'-21','',tabPageId,null);
+	     openMainTabPageParent(tabPageId+'-21', '打印出库单（提货单）', 'stockManage/enteringWarehouseCheckMore.html?orderName='+orderName+'&conType='+conType+'&new=0'+'&tabPageId='+tabPageId+'-21','',tabPageId,null);
+	});
+	//出库单（提货单）打印
+	$(document).on('click','#WarehouseCheckMoreNew',function(){
+		var datas = gloable_pm_id;
+	     if(datas.length == 0){
+				layer.msg('请勾选订单！', {icon: 5});
+	    		return;
+		 }
+	     console.log(datas)
+		var warehouseName = null;
+		for (var i = 0; i < datas.length; i ++) {
+			if (!isEmpty(warehouseName)) {
+				if (datas[i].warehouseName != warehouseName) {
+					$.ErrorAlert("请选择相同仓库的数据!");
+					return;
+				}
+			} else {
+				warehouseName = datas[i].warehouseName;
+			}
+		}
+	     
+	     setTempVal('batchPrintOut', datas);
+	     var orderName = encodeURI(encodeURI(datas[0].orderName));
+	     openMainTabPageParent(tabPageId+'-22', '打印出库单（提货单新）', 'stockManage/enteringWarehouseCheckMore.html?orderName='+orderName+'&conType='+conType+'&new=1'+'&tabPageId='+tabPageId+'-22','',tabPageId,null);
 	});
 	
 	$(document).on('click','#downDetail',function(){

adm/src/main/webapp/admin/orderManage/orderXH.html

@@ -94,6 +94,9 @@
 	 			<button class="layui-btn left-bnt1 in-b" id="WarehouseCheckMore">
 					 批量打印出库单（提货单）
 	 			</button>
+	 			<button class="layui-btn left-bnt1 in-b" id="WarehouseCheckMoreNew">
+					 新批量打印出库单（提货单）
+	 			</button>
 	 			<button class="layui-btn left-bnt1 in-b" id="printWarehouseOrder">
 					 打印入库单
 	 			</button>
@@ -158,10 +161,12 @@
 		$("#batchPrintOut").attr("style","display:show();");
 		$("#batchPrintCheck").attr("style","display:show();");
 		$("#WarehouseCheckMore").attr("style","display:show();");
+		$("#WarehouseCheckMoreNew").show();
 	}else{//隐藏
 		$("#batchPrintOut").attr("style","display:none;");
 		$("#batchPrintCheck").attr("style","display:none;");
 		$("#WarehouseCheckMore").attr("style","display:none;");
+		$("#WarehouseCheckMoreNew").hide();
 	}
 	
 	if(!isYHL(branchid) && conType =='00'){//采购铝---显示
@@ -729,7 +734,30 @@
 		}
 	    setTempVal('batchPrintOut', datas);
 	    var orderName = encodeURI(encodeURI(datas[0].orderName));
-	    openMainTabPageParent(tabPageId+'-21', '打印出库单（提货单）', 'stockManage/enteringWarehouseCheckMore.html?orderName='+orderName+'&conType='+conType+'&tabPageId='+tabPageId+'-21','',tabPageId,null);
+	    openMainTabPageParent(tabPageId+'-21', '打印出库单（提货单）', 'stockManage/enteringWarehouseCheckMore.html?orderName='+orderName+'&conType='+conType+'&new=0'+'&tabPageId='+tabPageId+'-21','',tabPageId,null);
+	});
+	$(document).on('click','#WarehouseCheckMoreNew',function(){
+		var datas = gloable_pm_id;
+		
+		if(datas.length == 0){
+			layer.msg('请勾选订单！', {icon: 5});
+		  		return;
+		}
+	    console.log(datas)
+		var warehouseName = null;
+		for (var i = 0; i < datas.length; i ++) {
+			if (!isEmpty(warehouseName)) {
+				if (datas[i].warehouseName != warehouseName) {
+					$.ErrorAlert("请选择相同仓库的数据!");
+					return;
+				}
+			} else {
+				warehouseName = datas[i].warehouseName;
+			}
+		}
+	    setTempVal('batchPrintOut', datas);
+	    var orderName = encodeURI(encodeURI(datas[0].orderName));
+	    openMainTabPageParent(tabPageId+'-22', '打印出库单（提货单）', 'stockManage/enteringWarehouseCheckMore.html?orderName='+orderName+'&conType='+conType+'&new=1'+'&tabPageId='+tabPageId+'-22','',tabPageId,null);
 	});
 	
 	$(document).on('click','#downDetail',function(){

adm/src/main/webapp/admin/stockManage/enteringWarehouseCheckMore.html

@@ -121,7 +121,7 @@
 						<div style="margin-right: 150px;">
 							<span id="branchName" contenteditable="true"></span>：
 						</div>
-						<div style="margin-right: 150px;" contenteditable="true">财务部：</div>
+						<div style="margin-right: 150px;" contenteditable="true" id = "caiwubu">财务部：</div>
 					</div>
 					<div class="display5" align="center" style="font-size: 12px;">
 						<div>电话：</div>
@@ -147,6 +147,11 @@
 	$("#ckId").val(orderName);
 	$("#outNumber").html(orderName);
 	
+	var newFlag = getQueryString("new");
+	if (newFlag == "1") {
+		$("#caiwubu").html('运营管理部：')
+	}
+	
 		//打印
   	$(document).on('click','#printBtn',function(){
   		$("#tableTestOne").show();