Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/mapper/xml/MaterialProvidedMapper.xml

@@ -37,6 +37,21 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
+			<if test="materialCode != null and  materialCode != ''">
+				AND a.materialCode LIKE CONCAT(CONCAT('%',#{materialCode},'%'))
+			</if>
+			<if test="materialDescription != null and  materialDescription != ''">
+				AND a.materialDescription LIKE CONCAT(CONCAT('%',#{materialDescription},'%'))
+			</if>
+			<if test="extendedCode != null and  extendedCode != ''">
+				AND a.extendedCode LIKE CONCAT(CONCAT('%',#{extendedCode},'%'))
+			</if>
+			<if test="extendedDescription != null and  extendedDescription != ''">
+				AND a.extendedDescription LIKE CONCAT(CONCAT('%',#{extendedDescription},'%'))
+			</if>
+			<if test="version != null and  version != ''">
+				AND a.version LIKE CONCAT(CONCAT('%',#{version},'%'))
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

src/main/webapp/webpage/modules/sg/managementcenter/materialProvided/materialProvided.js

@@ -98,9 +98,6 @@ $(document).ready(function() {
 		},
                columns: [
                    {
-		        checkbox: true
-		    	}
-                   ,{
                        field: 'materialCode',
                        width:130,
                        title: '物料编码'

src/main/webapp/webpage/modules/sg/managementcenter/materialProvided/materialProvided.jsp

@@ -22,18 +22,6 @@
 		<div class="accordion-inner">
 			<form:form id="searchForm" modelAttribute="materialProvided" class="form form-horizontal well clearfix">
 				<div class="col-xs-12 col-sm-6 col-md-4">
-					<label class="label-item single-overflow pull-left" title="计划批次：">计划批次：</label>
-					<form:input path="planToBatch" htmlEscape="false" maxlength="64"  class=" form-control"/>
-				</div>
-				<div class="col-xs-12 col-sm-6 col-md-4">
-					<label class="label-item single-overflow pull-left" title="分标信息：">分标信息：</label>
-					<form:input path="caseInformation" htmlEscape="false" maxlength="64"  class=" form-control"/>
-				</div>
-				<div class="col-xs-12 col-sm-6 col-md-4">
-					<label class="label-item single-overflow pull-left" title="物料加扩展：">物料加扩展：</label>
-					<form:input path="materialExtension" htmlEscape="false" maxlength="64"  class=" form-control"/>
-				</div>
-				<div class="col-xs-12 col-sm-6 col-md-4">
 					<label class="label-item single-overflow pull-left" title="物料编码：">物料编码：</label>
 					<form:input path="materialCode" htmlEscape="false" maxlength="64"  class=" form-control"/>
 				</div>
@@ -50,10 +38,6 @@
 					<form:input path="extendedDescription" htmlEscape="false" maxlength="64"  class=" form-control"/>
 				</div>
 				<div class="col-xs-12 col-sm-6 col-md-4">
-					<label class="label-item single-overflow pull-left" title="计量单位：">计量单位：</label>
-					<form:input path="measuringUnit" htmlEscape="false" maxlength="64"  class=" form-control"/>
-				</div>
-				<div class="col-xs-12 col-sm-6 col-md-4">
 					<label class="label-item single-overflow pull-left" title="版本号：">版本号：</label>
 					<form:input path="version" htmlEscape="false" maxlength="64"  class=" form-control"/>
 				</div>