库存对比没有数据报错规避，交底结论查询

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/ConstructionMapper.xml

@@ -367,34 +367,42 @@
 
 	<select id="findDisclosePage" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction">
 		select a.project_id,
-		a.require_name,
-		channel,
-		b.requireName,
-		b.capacity,
-		b.sceneSize,
-		b.capacitySize,
-		b.hiddenDanger,
-		b.influenceConstruction,
-		b.projectRepetition,
-		b.implemented,
-		b.transformer,
-		b.lineName,
-		b.quantities,
-		b.rodNumber,
-		b.administrationType,
-		b.precondition,
-		b.placementMode,
-		b.productionDate,
-		b.IntegrateModule,
-		b.needReplace,
-		b.overallTransformation,
-		b.explanationOfNecessity,
-		b.inconsistentDescription,
-		b.policyHandlingInstructions,
-		b.otherProblem,
-		b.implementedContent
-		from xm_project_details  a
+		a.require_name as `disclose.requireName`,
+		b.channel as `disclose.channel`,
+		b.capacity as `disclose.capacity`,
+		b.sceneSize as `disclose.sceneSize`,
+		b.capacitySize as `disclose.capacitySize`,
+		b.hiddenDanger as `disclose.hiddenDanger`,
+		b.influenceConstruction as `disclose.influenceConstruction`,
+		b.projectRepetition as `disclose.projectRepetition`,
+		b.implemented as `disclose.implemented`,
+		b.transformer as `disclose.transformer`,
+		b.lineName as `disclose.lineName`,
+		b.quantities as `disclose.quantities`,
+		b.rodNumber as `disclose.rodNumber`,
+		b.administrationType as `disclose.administrationType`,
+		b.precondition as `disclose.precondition`,
+		b.placementMode as `disclose.placementMode`,
+		b.productionDate as `disclose.productionDate`,
+		b.IntegrateModule as `disclose.IntegrateModule`,
+		b.needReplace as `disclose.needReplace`,
+		b.overallTransformation as `disclose.overallTransformation`,
+		b.explanationOfNecessity as `disclose.explanationOfNecessity`,
+		b.inconsistentDescription as `disclose.inconsistentDescription`,
+		b.policyHandlingInstructions as `disclose.policyHandlingInstructions`,
+		b.otherProblem as `disclose.otherProblem`,
+		b.implementedContent as `disclose.implementedContent`
+		from xm_project_details a
 		LEFT JOIN xm_disclose_conclusion b
 		on a.require_name = b.requireName
+		<where>
+			1=1
+			<if test="projectId != null and projectId != ''">
+				and a.project_id = #{projectId}
+			</if>
+			<if test="disclose.requireName != null and disclose.requireName != ''">
+				and b.requireName = #{disclose.requireName}
+			</if>
+		</where>
 	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/PickIngController.java

@@ -336,6 +336,11 @@ public class PickIngController extends BaseController {
 
         //先查出所有在物资专职的节点的信息
         List<String> activity = MyActiviUtils.findMdActivity("领料:配网物资专职审核领料单");
+        if (activity.size()>=0) {
+            activity.add("错误提示");
+            Page<ShowList> page = showListService.inventoryComparisonData(new Page<ShowList>(request, response), showList, activity);
+            return getBootstrapData(page);
+        }
         Page<ShowList> page = showListService.inventoryComparisonData(new Page<ShowList>(request, response), showList, activity);
         List<ShowList> list = page.getList();
         //相同的物料信息相加

src/main/webapp/webpage/modules/sg/managementcenter/activiti/discloseList.js

@@ -32,7 +32,7 @@ $(document).ready(function() {
                //初始化加载第一页，默认第一页
                pageNumber:1,   
                //每页的记录行数（*）   
-               pageSize: 5,
+               pageSize: 10,
                //可供选择的每页的行数（*）    
                pageList: [5,10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
@@ -83,17 +83,10 @@ $(document).ready(function() {
                        field: 'projectNumber',
                        title: '工程定义号',
                        width:120
-
                    }
                    ,{
                        field: 'projectId',
-                       title: '工程编号',
-                       width:110
-
-                   }
-                   ,{
-                       field: 'projectName',
-                       title: '项目名称',
+                       title: '项目定义号',
                        width:110
                    }
                    ,{

src/main/webapp/webpage/modules/sg/managementcenter/activiti/discloseList.jsp

@@ -21,6 +21,10 @@
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="construction" 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="projectId" htmlEscape="false" maxlength="100"  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="disclose.requireName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>

src/main/webapp/webpage/modules/sg/managementcenter/privilege/allProcDef.js

@@ -126,6 +126,7 @@ function save() {
     var uid = $("#uid").val();
     jp.get("${ctx}/sg/managementcenter/privilegepre/addPerson?pid=" + getIdSelections() + "&uid=" + uid);
     jp.close();
+    jp.success("添加成功");
 }
 
 function refresh() {

src/main/webapp/webpage/modules/sg/managementcenter/privilege/privilegeProcdef.jsp

@@ -17,11 +17,12 @@
 	</div>
 	<div class="panel-body">
 	<div class="row">
-			<!-- 搜索框-->
+		<form:form id="privilegePre" modelAttribute="privilegePre" class="form-horizontal">
+			<form:hidden path="uid"/>
+		</form:form>
+			<%--<!-- 搜索框-->
 			<div id="search-collapse" class="collapse">
-				<form:form id="privilegePre" modelAttribute="privilegePre" class="form-horizontal">
-					<form:input path="uid"/>
-				</form:form>
+
 				<div class="accordion-inner">
 					<form id="searchForm" class="form form-horizontal well clearfix" >
 						<div class="col-sm-4">
@@ -40,7 +41,7 @@
 					    </div>
 					</form>
 				</div>
-			</div><!-- 搜索框结束 -->
+			</div><!-- 搜索框结束 -->--%>
 		
 		<!-- 工具栏 -->
 	    <div id="toolbar">