新建导出模块清单导出实体类,导出物料清单导出实体类，流程中页面添加导出物料清单，导出模块清单

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

@@ -0,0 +1,105 @@
+package com.jeeplus.modules.sg.picking.activiti.entity;
+
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+
+public class ExportBlock {
+    //物料编码
+    private String materialCode;
+    //物料描述
+    private String projectName;
+    //扩展描述
+    private String extensionDescription;
+    //单位
+    private String mdUnits;
+    //总量
+    private String mdTotalAmount;
+    //单重(kg）
+    private String mdSingleWeight;
+    //总重(吨）
+    private String mdTotalWeight;
+    //甲乙供
+    private String mdTheParty;
+    //备注
+    private String mdText;
+
+    @ExcelField(title="物料编码", align=2, sort=1)
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    @ExcelField(title="扩展描述", align=2, sort=2)
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    @ExcelField(title="物料描述", align=2, sort=3)
+    public String getExtensionDescription() {
+        return extensionDescription;
+    }
+
+    public void setExtensionDescription(String extensionDescription) {
+        this.extensionDescription = extensionDescription;
+    }
+
+    @ExcelField(title="单位", align=2, sort=4)
+    public String getMdUnits() {
+        return mdUnits;
+    }
+
+    public void setMdUnits(String mdUnits) {
+        this.mdUnits = mdUnits;
+    }
+
+    @ExcelField(title="总量", align=2, sort=5)
+    public String getMdTotalAmount() {
+        return mdTotalAmount;
+    }
+
+    public void setMdTotalAmount(String mdTotalAmount) {
+        this.mdTotalAmount = mdTotalAmount;
+    }
+
+    @ExcelField(title="单重(kg）", align=2, sort=6)
+    public String getMdSingleWeight() {
+        return mdSingleWeight;
+    }
+
+    public void setMdSingleWeight(String mdSingleWeight) {
+        this.mdSingleWeight = mdSingleWeight;
+    }
+
+    @ExcelField(title="总重(吨）", align=2, sort=7)
+    public String getMdTotalWeight() {
+        return mdTotalWeight;
+    }
+
+    public void setMdTotalWeight(String mdTotalWeight) {
+        this.mdTotalWeight = mdTotalWeight;
+    }
+
+    @ExcelField(title="甲乙供", align=2, sort=8)
+    public String getMdTheParty() {
+        return mdTheParty;
+    }
+
+    public void setMdTheParty(String mdTheParty) {
+        this.mdTheParty = mdTheParty;
+    }
+
+    @ExcelField(title="备注", align=2, sort=9)
+    public String getMdText() {
+        return mdText;
+    }
+
+    public void setMdText(String mdText) {
+        this.mdText = mdText;
+    }
+}

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

@@ -0,0 +1,158 @@
+package com.jeeplus.modules.sg.picking.activiti.entity;
+
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+
+public class ExportListing {
+    //模块大类
+    private String mdBigClass;
+    //模块中类
+    private String mdTheClass;
+    //模块名称
+    private String mdName;
+    //物料编码
+    private String materialCode;
+    //物料名称
+    private String materialDescription;
+    //扩展描述
+    private String extensionDescription;
+    //单位
+    private String mdUnits;
+    //总量
+    private String mdTotalAmount;
+    //单重/kg
+    private String mdSingleWeight;
+    //总重/吨
+    private String mdTotalWeight;
+    //甲乙供
+    private String mdTheParty;
+    //备注
+    private String mdText;
+    //
+    private String mdCount;
+
+    private String blockId;
+
+    @ExcelField(title="模块大类", align=2, sort=1)
+    public String getMdBigClass() {
+        return mdBigClass;
+    }
+
+    public void setMdBigClass(String mdBigClass) {
+        this.mdBigClass = mdBigClass;
+    }
+
+    @ExcelField(title="模块中类", align=2, sort=2)
+    public String getMdTheClass() {
+        return mdTheClass;
+    }
+
+    public void setMdTheClass(String mdTheClass) {
+        this.mdTheClass = mdTheClass;
+    }
+
+    @ExcelField(title="模块名称", align=2, sort=3)
+    public String getMdName() {
+        return mdName;
+    }
+
+    public void setMdName(String mdName) {
+        this.mdName = mdName;
+    }
+
+    @ExcelField(title="物料编码", align=2, sort=4)
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    @ExcelField(title="物料名称", align=2, sort=5)
+    public String getMaterialDescription() {
+        return materialDescription;
+    }
+
+    public void setMaterialDescription(String materialDescription) {
+        this.materialDescription = materialDescription;
+    }
+
+    @ExcelField(title="扩展描述", align=2, sort=6)
+    public String getExtensionDescription() {
+        return extensionDescription;
+    }
+
+    public void setExtensionDescription(String extensionDescription) {
+        this.extensionDescription = extensionDescription;
+    }
+
+    @ExcelField(title="单位", align=2, sort=7)
+    public String getMdUnits() {
+        return mdUnits;
+    }
+
+    public void setMdUnits(String mdUnits) {
+        this.mdUnits = mdUnits;
+    }
+
+    @ExcelField(title="总量", align=2, sort=8)
+    public String getMdTotalAmount() {
+        return mdTotalAmount;
+    }
+
+    public void setMdTotalAmount(String mdTotalAmount) {
+        this.mdTotalAmount = mdTotalAmount;
+    }
+
+    @ExcelField(title="单重/kg", align=2, sort=9)
+    public String getMdSingleWeight() {
+        return mdSingleWeight;
+    }
+
+    public void setMdSingleWeight(String mdSingleWeight) {
+        this.mdSingleWeight = mdSingleWeight;
+    }
+
+    @ExcelField(title="总重/吨", align=2, sort=10)
+    public String getMdTotalWeight() {
+        return mdTotalWeight;
+    }
+
+    public void setMdTotalWeight(String mdTotalWeight) {
+        this.mdTotalWeight = mdTotalWeight;
+    }
+
+    @ExcelField(title="甲乙供", align=2, sort=11)
+    public String getMdTheParty() {
+        return mdTheParty;
+    }
+
+    public void setMdTheParty(String mdTheParty) {
+        this.mdTheParty = mdTheParty;
+    }
+
+    @ExcelField(title="备注", align=2, sort=12)
+    public String getMdText() {
+        return mdText;
+    }
+
+    public void setMdText(String mdText) {
+        this.mdText = mdText;
+    }
+
+    public String getMdCount() {
+        return mdCount;
+    }
+
+    public void setMdCount(String mdCount) {
+        this.mdCount = mdCount;
+    }
+
+    public String getBlockId() {
+        return blockId;
+    }
+
+    public void setBlockId(String blockId) {
+        this.blockId = blockId;
+    }
+}

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

@@ -47,4 +47,6 @@ public interface PickIngMapper extends BaseMapper<PickIng> {
     List<CapitalExport> exportList(@Param("list") List<Acquisition> list,@Param("projectId") String projectId);
 
     void updateErpAfter(List<Acquisition> list);
+
+    List<ExportBlock> findExportBlock(String procInsId);
 }

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

@@ -6,10 +6,7 @@ package com.jeeplus.modules.sg.picking.activiti.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory;
-import com.jeeplus.modules.sg.picking.activiti.entity.Acquisition;
-import com.jeeplus.modules.sg.picking.activiti.entity.PickApplication;
-import com.jeeplus.modules.sg.picking.activiti.entity.PickIng;
-import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
+import com.jeeplus.modules.sg.picking.activiti.entity.*;
 import org.activiti.engine.task.Task;
 import org.apache.ibatis.annotations.Param;
 
@@ -57,7 +54,7 @@ public interface ShowListMapper extends BaseMapper<ShowList> {
     ShowList findOneList(ShowList showList);
 
     /**
-     * 通过流程定义号查询，这个流程使用的模块版本号
+     * 通过流程定义号查询，这个流程选择了的模块
      * */
     String itemQuery(String procInsId);
 
@@ -105,4 +102,6 @@ public interface ShowListMapper extends BaseMapper<ShowList> {
      * 查询是否已经发起过领料
      * */
     String findAcqStatus(ShowList showList);
+
+    List<ExportListing> exportListing(List<String> list);
 }

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

@@ -207,4 +207,20 @@
 		</foreach>
 		);
 	</update>
+
+	<select id="findExportBlock" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ExportBlock">
+		select
+		materialCode,
+	 	materialDescription as projectName,
+		extensionDescription,
+		mdUnits,
+		mdTotalAmount,
+		mdSingleWeight,
+		mdTotalWeight,
+		mdTheParty,
+		mdText
+		from md_process_list
+		where procInsId = #{procInsId}
+		order by materialCode,materialDescription;
+	</select>
 </mapper>

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

@@ -280,4 +280,28 @@
 	<select id="findAcqStatus" resultType="java.lang.String">
 		select acquisition_status from xm_project_details where id = #{projectId};
 	</select>
+
+	<select id="exportListing" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ExportListing">
+		select
+		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",
+		a.md_units AS "mdUnits",
+		a.md_count AS "mdCount",
+		a.md_single_weight AS "mdSingleWeight",
+		a.md_total_weight AS "mdTotalWeight",
+		a.md_the_party AS "mdTheParty",
+		a.md_text AS "mdText",
+		a.md_total_amount AS "mdTotalAmount",
+		a.block_id AS "blockId"
+		from md_module_listing as a
+		where block_id in
+		<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+		order by material_code
+	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/picking/activiti/service/PickIngService.java

@@ -252,4 +252,8 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 	public void updateErpAfter(List<Acquisition> list) {
 		pickIngMapper.updateErpAfter(list);
 	}
+
+	public List<ExportBlock> findExportBlock(String procInsId) {
+		return pickIngMapper.findExportBlock(procInsId);
+	}
 }

src/main/java/com/jeeplus/modules/sg/picking/activiti/service/ShowListService.java

@@ -41,14 +41,14 @@ public class ShowListService extends CrudService<ShowListMapper, ShowList> {
 		return page;
 	}
 
-	public Page<Acquisition> acquisitionList(Page<Acquisition> page,Acquisition acquisition){
+	public Page<Acquisition> acquisitionList(Page<Acquisition> page, Acquisition acquisition) {
 		dataRuleFilter(acquisition);
 		acquisition.setPage(page);
 		page.setList(mapper.acquisitionList(acquisition));
 		return page;
 	}
 
-	public Page<ShowList> inventoryComparisonData(Page<ShowList> page, ShowList showList,List<String> searchList) {
+	public Page<ShowList> inventoryComparisonData(Page<ShowList> page, ShowList showList, List<String> searchList) {
 		dataRuleFilter(showList);
 		showList.setPage(page);
 		page.setList(mapper.inventoryComparisonData(searchList));
@@ -57,8 +57,8 @@ public class ShowListService extends CrudService<ShowListMapper, ShowList> {
 
 	/**
 	 * 根据id查询领料清单中的需要修改的那条信息
-	 * */
-	public ShowList findOneList(ShowList showList){
+	 */
+	public ShowList findOneList(ShowList showList) {
 		return showListMapper.findOneList(showList);
 	}
 
@@ -76,51 +76,57 @@ public class ShowListService extends CrudService<ShowListMapper, ShowList> {
 	}
 
 	/**
-	 *保存项目提前领料流程信息
+	 * 保存项目提前领料流程信息
 	 */
 	@Transactional(readOnly = false)
-	public void newSave(PickApplication pickApplication){
+	public void newSave(PickApplication pickApplication) {
 		pickApplication.preInsert();
 		showListMapper.newSave(pickApplication);
-	};
+	}
+
+	;
 
 	/**
-	 *修改总量
-	 * */
+	 * 修改总量
+	 */
 	@Transactional(readOnly = false)
-	public void updateAmount(ShowList showList){
+	public void updateAmount(ShowList showList) {
 		showListMapper.updateAmount(showList);
 	}
 
 	/**
-	 *修改项目信息状态
-	 * */
+	 * 修改项目信息状态
+	 */
 	@Transactional(readOnly = false)
-	public void projectUpdate(PickApplication pickApplication){
+	public void projectUpdate(PickApplication pickApplication) {
 		showListMapper.projectUpdate(pickApplication);
-	};
+	}
+
+	;
 
-	public String selectProjectId(String id){
+	public String selectProjectId(String id) {
 		return showListMapper.selectProjectId(id);
-	};
+	}
+
+	;
 
 	public String itemQuery(String procInsId) {
 		return showListMapper.itemQuery(procInsId);
 	}
 
 	@Transactional(readOnly = false)
-	public void deleteData(String id){
+	public void deleteData(String id) {
 		showListMapper.deleteData(id);
 	}
 
 	/**
 	 * 查询流程中物料的可用库存数量
-	 * */
-	public List<MaterialInventory> inventoryQuery(List<ShowList> showLists){
+	 */
+	public List<MaterialInventory> inventoryQuery(List<ShowList> showLists) {
 		return showListMapper.inventoryQuery(showLists);
 	}
 
-	public  List<ShowList> processListQuery(List<String> list){
+	public List<ShowList> processListQuery(List<String> list) {
 		return showListMapper.processListQuery(list);
 	}
 
@@ -140,4 +146,9 @@ public class ShowListService extends CrudService<ShowListMapper, ShowList> {
 	public String findAcqStatus(ShowList showList) {
 		return showListMapper.findAcqStatus(showList);
 	}
+
+	public List<ExportListing> exportListing(List<String> list) {
+		return showListMapper.exportListing(list);
+	}
+
 }

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

@@ -12,6 +12,7 @@ import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.sg.audit.information.entity.Information;
 import com.jeeplus.modules.sg.audit.information.entity.OutInformation;
+import com.jeeplus.modules.sg.audit.material.entity.Material;
 import com.jeeplus.modules.sg.financial.erpcredit.util.ExportUtil;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.FindTask;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
@@ -269,6 +270,7 @@ public class PickIngController extends BaseController {
             }
         }
         }
+        Collections.sort(list);
         return getBootstrapData(page);
     }
 
@@ -599,5 +601,108 @@ public class PickIngController extends BaseController {
         //需改导出状态及导出时间
         return j;
     }
+
+    /**
+     * 导出领料清单
+     * */
+    @ResponseBody
+    @RequestMapping(value = "exportBlock")
+    public AjaxJson exportBlock(String procInsId, HttpServletRequest request, HttpServletResponse response) {
+        AjaxJson j = new AjaxJson();
+        try {
+            procInsId = URLDecoder.decode(procInsId,"UTF-8");
+            String fileName = "导出领料清单" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+            List<ExportBlock> exportBlock = pickIngService.findExportBlock(procInsId);
+            new ExportExcel("导出领料清单", ExportBlock.class).setDataList(exportBlock).write(response, fileName).dispose();
+            j.setSuccess(true);
+            j.setMsg("导出成功！");
+        } catch (IOException e) {
+            j.setSuccess(false);
+            j.setMsg("导出有误！");
+            e.printStackTrace();
+        }
+        return j;
+    }
+
+    /**
+     * 导出模块清单
+     * */
+    @ResponseBody
+    @RequestMapping(value = "exportListing")
+    public AjaxJson exportListing(String procInsId, HttpServletRequest request, HttpServletResponse response) {
+        AjaxJson j = new AjaxJson();
+        try {
+            procInsId = URLDecoder.decode(procInsId,"UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        ArrayList<String> objects = new ArrayList<>();
+        ArrayList<String> findList = new ArrayList<>();
+        String item = showListService.itemQuery(procInsId);
+        //返回给页面的list
+        List<ShowList> myList = new ArrayList<>();
+        if (item != null&&!"".equals(item)) {
+            String[] split = item.split(";");
+            //回显list
+            List<ExportListing> returnList = new ArrayList<>();
+            for (int i = 0; i < split.length; i++) {
+                objects.add(split[i]);
+            }
+            for (String s : objects) {
+                String[] split1 = s.split(":");
+                ShowList myShow = new ShowList();
+                myShow.setId(split1[0]);
+                String s1 = split1[1];
+                myShow.setNumber(Double.parseDouble(s1));
+                findList.add(split1[0]);
+                myList.add(myShow);
+            }
+            List<ExportListing> exportListings = showListService.exportListing(findList);
+            for (ShowList my : myList) {
+                //循环遍历
+                for (ExportListing showList1 : exportListings) {
+                    //选择的模块与查出来的一致
+                    if (my.getId().equals(showList1.getBlockId())) {
+                        Double mdSingleWeight = Double.valueOf(showList1.getMdSingleWeight());
+                        Double number = my.getNumber();
+                        Double mdCount = Double.valueOf(showList1.getMdCount());
+                        Double i = mdSingleWeight * number;
+                        BigDecimal b1 = new BigDecimal(Double.toString(number));
+                        BigDecimal b2 = new BigDecimal(Double.toString(mdCount));
+                        String s = b1.multiply(b2).toString();
+                        ExportListing newShowList = new ExportListing();
+                        newShowList.setMdBigClass(showList1.getMdBigClass());
+                        newShowList.setMdTheClass(showList1.getMdTheClass());
+                        newShowList.setMdName(showList1.getMdName());
+                        newShowList.setMaterialCode(showList1.getMaterialCode());
+                        newShowList.setMaterialDescription(showList1.getMaterialDescription());
+                        newShowList.setExtensionDescription(showList1.getExtensionDescription());
+                        newShowList.setMdUnits(showList1.getMdUnits());
+                        newShowList.setMdTheParty(showList1.getMdTheParty());
+                        newShowList.setMdText(showList1.getMdText());
+                        newShowList.setMdTotalAmount(s);
+                        newShowList.setMdSingleWeight(showList1.getMdSingleWeight());
+                        BigDecimal b = new BigDecimal(i);
+                        BigDecimal a = new BigDecimal(1000);
+                        BigDecimal divide = b.divide(a, 4, BigDecimal.ROUND_HALF_UP);
+                        newShowList.setMdTotalWeight(divide.toString());
+                        returnList.add(newShowList);
+                    }
+                }
+            }
+            try {
+                String fileName = "导出模块清单" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+                new ExportExcel("导出模块清单", ExportListing.class).setDataList(returnList).write(response, fileName).dispose();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        j.setSuccess(true);
+        j.setMsg("导出成功！");
+        return j;
+    }
+
 }
 
+

src/main/webapp/webpage/modules/sg/financial/expense/expenseList.jsp

@@ -54,6 +54,9 @@
 		<button id="add" class="btn btn-primary" onclick="add()">
 			<i class="glyphicon glyphicon-plus"></i> 新建
 		</button>
+		<button id="edit" class="btn btn-primary" onclick="edit()">
+			<i class="glyphicon glyphicon-plus"></i> 修改
+		</button>
 		<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
 			<i class="glyphicon glyphicon-remove"></i> 删除
 		</button>

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

@@ -249,6 +249,8 @@ $(document).ready(function() {
 			})
 		})
 
+
+
 		//驳回
 		$("#no").click(function () {
 			jp.prompt("驳回, 审批意见", function (message) {
@@ -270,6 +272,18 @@ $(document).ready(function() {
 					})
 			})
 		})
+
+		//领料清单
+		$("#exportBlock").click(function () {
+			var procInsId = encodeURI(encodeURI($("#procInsId").val()));
+			jp.downloadFile('${ctx}/picking/activiti/exportBlock?procInsId='+procInsId);
+		});
+
+		//模块清单
+		$("#exportListing").click(function () {
+			var procInsId = encodeURI(encodeURI($("#procInsId").val()));
+			jp.downloadFile('${ctx}/picking/activiti/exportListing?procInsId='+procInsId);
+		});
 	});
 
 

src/main/webapp/webpage/modules/sg/picking/activiti/constructionLeader.jsp

@@ -18,6 +18,14 @@
 		<form:form id="inputForm" modelAttribute="showList" class="form-horizontal">
 			<input type="hidden" id="procInsId" name="procInsId" value="${showList.act.procInsId}"/>
 		</form:form>
+		<div id="">
+			<button id="exportBlock" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导出领料清单
+			</button>
+			<button id="exportListing" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导出模块清单
+			</button>
+		</div>
 		<div class="panel-body">
 			<div>
 				<ul class="nav nav-tabs">
@@ -25,6 +33,7 @@
 					<li role="presentation" id="click3" ><a id="mkqd" href="javascript:void(0)">查看模块清单</a></li>
 				</ul>
 			</div>
+
 			<div id="div2" style="display: block">
 				<table id="informationTable"   data-toolbar="#toolbar" class="table"></table>
 			</div>

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

@@ -270,7 +270,19 @@ $(document).ready(function() {
 				})
 		})
 	})
+
+	//领料清单
+	$("#exportBlock").click(function () {
+		var procInsId = encodeURI(encodeURI($("#procInsId").val()));
+		jp.downloadFile('${ctx}/picking/activiti/exportBlock?procInsId='+procInsId);
+	});
+
+	//模块清单
+	$("#exportListing").click(function () {
+		var procInsId = encodeURI(encodeURI($("#procInsId").val()));
+		jp.downloadFile('${ctx}/picking/activiti/exportListing?procInsId='+procInsId);
 	});
+});
 
   function getIdSelections() {
         return $.map($("#informationTable").bootstrapTable('getSelections'), function (row) {

src/main/webapp/webpage/modules/sg/picking/activiti/fullExamine.jsp

@@ -18,6 +18,14 @@
         <form:form id="inputForm" modelAttribute="showList" class="form-horizontal">
             <input type="hidden" id="procInsId" name="procInsId" value="${showList.act.procInsId}"/>
         </form:form>
+        <div id="">
+            <button id="exportBlock" class="btn btn-info">
+                <i class="fa fa-folder-open-o"></i> 导出领料清单
+            </button>
+            <button id="exportListing" class="btn btn-info">
+                <i class="fa fa-folder-open-o"></i> 导出模块清单
+            </button>
+        </div>
         <div class="panel-body">
             <div>
                 <ul class="nav nav-tabs">

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

@@ -270,6 +270,18 @@ $(document).ready(function() {
 					})
 			})
 		})
+
+		//领料清单
+		$("#exportBlock").click(function () {
+			var procInsId = encodeURI(encodeURI($("#procInsId").val()));
+			jp.downloadFile('${ctx}/picking/activiti/exportBlock?procInsId='+procInsId);
+		});
+
+		//模块清单
+		$("#exportListing").click(function () {
+			var procInsId = encodeURI(encodeURI($("#procInsId").val()));
+			jp.downloadFile('${ctx}/picking/activiti/exportListing?procInsId='+procInsId);
+		});
 	});
 
   function getIdSelections() {

src/main/webapp/webpage/modules/sg/picking/activiti/leaderExamine.jsp

@@ -18,6 +18,14 @@
 		<form:form id="inputForm" modelAttribute="showList" class="form-horizontal">
 			<input type="hidden" id="procInsId" name="procInsId" value="${showList.act.procInsId}"/>
 		</form:form>
+		<div id="">
+			<button id="exportBlock" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导出领料清单
+			</button>
+			<button id="exportListing" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导出模块清单
+			</button>
+		</div>
 		<div class="panel-body">
 			<div>
 				<ul class="nav nav-tabs">

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

@@ -270,7 +270,19 @@ $(document).ready(function() {
 					})
 			})
 		})
+
+	//领料清单
+	$("#exportBlock").click(function () {
+		var procInsId = encodeURI(encodeURI($("#procInsId").val()));
+		jp.downloadFile('${ctx}/picking/activiti/exportBlock?procInsId='+procInsId);
+	});
+
+	//模块清单
+	$("#exportListing").click(function () {
+		var procInsId = encodeURI(encodeURI($("#procInsId").val()));
+		jp.downloadFile('${ctx}/picking/activiti/exportListing?procInsId='+procInsId);
 	});
+});
 
   function getIdSelections() {
         return $.map($("#informationTable").bootstrapTable('getSelections'), function (row) {

src/main/webapp/webpage/modules/sg/picking/activiti/managerAudit.jsp

@@ -18,6 +18,14 @@
 		<form:form id="inputForm" modelAttribute="showList" class="form-horizontal">
 			<input type="hidden" id="procInsId" name="procInsId" value="${showList.act.procInsId}"/>
 		</form:form>
+		<div id="">
+			<button id="exportBlock" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导出领料清单
+			</button>
+			<button id="exportListing" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导出模块清单
+			</button>
+		</div>
 		<div class="panel-body">
 			<div>
 				<ul class="nav nav-tabs">

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

@@ -314,7 +314,17 @@ $(document).ready(function() {
 		})
 		})
 	})
+	//领料清单
+	$("#exportBlock").click(function () {
+		var procInsId = encodeURI(encodeURI($("#procInsId").val()));
+		jp.downloadFile('${ctx}/picking/activiti/exportBlock?procInsId='+procInsId);
+	});
 
+	//模块清单
+	$("#exportListing").click(function () {
+		var procInsId = encodeURI(encodeURI($("#procInsId").val()));
+		jp.downloadFile('${ctx}/picking/activiti/exportListing?procInsId='+procInsId);
+	});
 });
 
 	function getIdSelections() {

src/main/webapp/webpage/modules/sg/picking/activiti/netExamine.jsp

@@ -29,6 +29,14 @@
 		<form:form id="inputForm" modelAttribute="showList" class="form-horizontal">
 			<input type="hidden" id="procInsId" name="procInsId" value="${showList.act.procInsId}"/>
 		</form:form>
+		<div id="">
+			<button id="exportBlock" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导出领料清单
+			</button>
+			<button id="exportListing" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导出模块清单
+			</button>
+		</div>
 		<div class="panel-body">
 			<h3>项目：${projectNumber.requireName}&nbsp;发起第${projectNumber.theNumber}次开具领料清单</h3>
 			<div>