设计变更流程：设计单位人员显示变更图纸显示变化

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -1166,11 +1166,11 @@ public class ActTaskService extends BaseService {
 		//pass对应进入问题模块，pass4对应没有问题完成施工交底
 		vars.put("pass", false);
 		vars.put("pass4", false);
-
 		vars.put("pass1", false);
 		vars.put("pass2", false);
 		vars.put("pass3", false);
 		vars.put("pass5", false);
+		vars.put("pass6", false);
 		String flag = act.getFlag();
 		String[] split = flag.split(";");
 		for (String a : split) {

src/main/java/com/jeeplus/modules/sg/picking/activiti/entity/ShowList.java

@@ -6,6 +6,12 @@ import com.jeeplus.core.persistence.DataEntity;
 import java.util.List;
 
 public class ShowList extends ActEntity<ShowList> implements Comparable<ShowList> {
+    //模块大类
+    private String mdBigClass;
+    //模块中类
+    private String mdTheClass;
+    //模块名称
+    private String mdName;
     //物料编码
     private String materialCode;
     //物料名称;
@@ -199,6 +205,30 @@ public class ShowList extends ActEntity<ShowList> implements Comparable<ShowList
         this.mdCount = mdCount;
     }
 
+    public String getMdBigClass() {
+        return mdBigClass;
+    }
+
+    public void setMdBigClass(String mdBigClass) {
+        this.mdBigClass = mdBigClass;
+    }
+
+    public String getMdTheClass() {
+        return mdTheClass;
+    }
+
+    public void setMdTheClass(String mdTheClass) {
+        this.mdTheClass = mdTheClass;
+    }
+
+    public String getMdName() {
+        return mdName;
+    }
+
+    public void setMdName(String mdName) {
+        this.mdName = mdName;
+    }
+
     @Override
     public int compareTo(ShowList o) {
         String materialCode = this.getMaterialCode();

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/xml/ShowListMapper.xml

@@ -3,6 +3,9 @@
 <mapper namespace="com.jeeplus.modules.sg.picking.activiti.mapper.ShowListMapper">
 
     <sql id="classColumns">
+		a.md_big_class AS "mdBigClass",
+		a.md_the_class AS "mdTheClass",
+		a.md_name AS "mdName",
 		a.material_code AS "materialCode",
 		a.material_description AS "materialDescription",
 		a.extension_description AS "extensionDescription",

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

@@ -24,7 +24,9 @@ import java.util.*;
 public class ShowListController extends BaseController {
     @Autowired
     private ShowListService showListService;
-
+    /**
+     * 物料清单显示
+     * */
     @ResponseBody
     @RequestMapping(value ="data")
     public Map<String, Object> data(ShowList showList,String item, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -134,7 +136,7 @@ public class ShowListController extends BaseController {
     }
 
     /**
-     * 模块
+     * 模块清单显示页面
      * */
     @ResponseBody
     @RequestMapping(value ="mkData")

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

@@ -69,14 +69,15 @@
 						<form:hidden path="act.procInsId"/>
 						<form:hidden path="act.procDefId"/>
 						<form:hidden id="flag" path="act.flag" />
+						<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
 						<table class="table table-bordered">
 							<tbody>
 							<tr>
+<%--
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>配网运行人员：</label></td>
 								<td class="width-35">
-									<sys:userselect roleName="配网运行人员"  id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
-													cssClass="form-control required"/>
 								</td>
+--%>
 
 <%--								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>申请人：</label></td>
 								<td class="width-35">

src/main/webapp/webpage/modules/sg/picking/activiti/pickIng.js

@@ -153,6 +153,18 @@ $(document).ready(function() {
 		},
 		columns: [
 			{
+				field: 'mdBigClass',
+				title: '模块大类',
+			},
+			{
+				field: 'mdTheClass',
+				title: '模块中类',
+			},
+			{
+				field: 'mdName',
+				title: '模块名称',
+			},
+			{
 				field: 'materialCode',
 				title: '物料编码',
 			},{