sunxianglong 1 неделя назад
Родитель
Сommit
183332a4dd

+ 1 - 0
src/main/java/com/jeesite/modules/erp/web/MesProductOrderController.java

@@ -80,6 +80,7 @@ public class MesProductOrderController extends BaseController {
 	@RequiresPermissions("erp:mesProductOrder:view")
 	@RequiresPermissions("erp:mesProductOrder:view")
 	@RequestMapping(value = "exportData")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesProductOrder mesProductOrder, HttpServletResponse response) {
 	public void exportData(MesProductOrder mesProductOrder, HttpServletResponse response) {
+		mesProductOrder.setPage(null);
 		List<MesProductOrder> list = mesProductOrderService.findList(mesProductOrder);
 		List<MesProductOrder> list = mesProductOrderService.findList(mesProductOrder);
 		String fileName = "生产订单" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		String fileName = "生产订单" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try (ExcelExport ee = new ExcelExport("生产订单", MesProductOrder.class)) {
 		try (ExcelExport ee = new ExcelExport("生产订单", MesProductOrder.class)) {

+ 1 - 0
src/main/java/com/jeesite/modules/mes/web/MesHeatProcessController.java

@@ -152,6 +152,7 @@ public class MesHeatProcessController extends BaseController {
 	@RequiresPermissions("mes:mesHeatProcess:view")
 	@RequiresPermissions("mes:mesHeatProcess:view")
 	@RequestMapping(value = "exportData")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesHeatProcess e, HttpServletResponse response) {
 	public void exportData(MesHeatProcess e, HttpServletResponse response) {
+		e.setPage(null);
 		List<MesHeatProcess> list = mesHeatProcessService.findList(e);
 		List<MesHeatProcess> list = mesHeatProcessService.findList(e);
 		String fileName = "热加工数据" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		String fileName = "热加工数据" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try (ExcelExport ee = new ExcelExport("热加工数据", MesHeatProcess.class)) {
 		try (ExcelExport ee = new ExcelExport("热加工数据", MesHeatProcess.class)) {

+ 1 - 0
src/main/java/com/jeesite/modules/mes/web/MesMaterialLlController.java

@@ -73,6 +73,7 @@ public class MesMaterialLlController extends BaseController {
 	@RequiresPermissions("mes:mesMaterialLl:view")
 	@RequiresPermissions("mes:mesMaterialLl:view")
 	@RequestMapping(value = "exportData")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesMaterialLl mesMaterialLl, HttpServletResponse response) {
 	public void exportData(MesMaterialLl mesMaterialLl, HttpServletResponse response) {
+		mesMaterialLl.setPage(null);
 		List<MesMaterialLl> list = mesMaterialLlService.findList(mesMaterialLl);
 		List<MesMaterialLl> list = mesMaterialLlService.findList(mesMaterialLl);
 		String fileName = "生产领料单" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		String fileName = "生产领料单" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try (ExcelExport ee = new ExcelExport("生产领料单", MesMaterialLl.class)) {
 		try (ExcelExport ee = new ExcelExport("生产领料单", MesMaterialLl.class)) {

+ 1 - 0
src/main/java/com/jeesite/modules/mes/web/MesOrderSnController.java

@@ -106,6 +106,7 @@ public class MesOrderSnController extends BaseController {
 	@RequiresPermissions("mes:mesOrderSn:view")
 	@RequiresPermissions("mes:mesOrderSn:view")
 	@RequestMapping(value = "exportData")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesOrderSn mesOrderSn, HttpServletResponse response) {
 	public void exportData(MesOrderSn mesOrderSn, HttpServletResponse response) {
+		mesOrderSn.setPage(null);
 		List<MesOrderSn> list = mesOrderSnService.findList(mesOrderSn);
 		List<MesOrderSn> list = mesOrderSnService.findList(mesOrderSn);
 		String fileName = "生产订单工件表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		String fileName = "生产订单工件表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try (ExcelExport ee = new ExcelExport("生产订单工件表", MesOrderSn.class)) {
 		try (ExcelExport ee = new ExcelExport("生产订单工件表", MesOrderSn.class)) {

+ 1 - 0
src/main/java/com/jeesite/modules/mes/web/MesOrderSnJjController.java

@@ -96,6 +96,7 @@ public class MesOrderSnJjController extends BaseController {
 	@RequiresPermissions("mes:mesOrderSnJj:view")
 	@RequiresPermissions("mes:mesOrderSnJj:view")
 	@RequestMapping(value = "exportData")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesOrderSnJj mesOrderSnJj, HttpServletResponse response) {
 	public void exportData(MesOrderSnJj mesOrderSnJj, HttpServletResponse response) {
+		mesOrderSnJj.setPage(null);
 		List<MesOrderSnJj> list = mesOrderSnJjService.findList(mesOrderSnJj);
 		List<MesOrderSnJj> list = mesOrderSnJjService.findList(mesOrderSnJj);
 		String fileName = "机加订单工件绑定" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		String fileName = "机加订单工件绑定" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try (ExcelExport ee = new ExcelExport("机加订单工件绑定", MesOrderSnJj.class)) {
 		try (ExcelExport ee = new ExcelExport("机加订单工件绑定", MesOrderSnJj.class)) {

+ 1 - 0
src/main/java/com/jeesite/modules/mes/web/MesProductCncLifeController.java

@@ -98,6 +98,7 @@ public class MesProductCncLifeController extends BaseController {
 	@RequiresPermissions("mes:mesProductCncLife:view")
 	@RequiresPermissions("mes:mesProductCncLife:view")
 	@RequestMapping(value = "exportData")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesProductCncLife mesProductCncLife, HttpServletResponse response) {
 	public void exportData(MesProductCncLife mesProductCncLife, HttpServletResponse response) {
+		mesProductCncLife.setPage(null);
 		List<MesProductCncLife> list = mesProductCncLifeService.findList(mesProductCncLife);
 		List<MesProductCncLife> list = mesProductCncLifeService.findList(mesProductCncLife);
 		String fileName = "CNC刀具寿命" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		String fileName = "CNC刀具寿命" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try(ExcelExport ee = new ExcelExport("CNC刀具寿命", MesProductCncLife.class)){
 		try(ExcelExport ee = new ExcelExport("CNC刀具寿命", MesProductCncLife.class)){

+ 1 - 0
src/main/java/com/jeesite/modules/mes/web/MesProductFswController.java

@@ -71,6 +71,7 @@ public class MesProductFswController extends BaseController {
 	@RequiresPermissions("mes:mesProductFsw:view")
 	@RequiresPermissions("mes:mesProductFsw:view")
 	@RequestMapping(value = "exportData")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesProductFsw mesProductFsw, HttpServletResponse response) {
 	public void exportData(MesProductFsw mesProductFsw, HttpServletResponse response) {
+		mesProductFsw.setPage(null);
 		List<MesProductFsw> list = mesProductFswService.findList(mesProductFsw);
 		List<MesProductFsw> list = mesProductFswService.findList(mesProductFsw);
 		String fileName = "FSW过程参数" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		String fileName = "FSW过程参数" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try (ExcelExport ee = new ExcelExport("FSW过程参数", MesProductFsw.class)) {
 		try (ExcelExport ee = new ExcelExport("FSW过程参数", MesProductFsw.class)) {

+ 1 - 0
src/main/java/com/jeesite/modules/mes/web/MesProductQmController.java

@@ -107,6 +107,7 @@ public class MesProductQmController extends BaseController {
 	@RequiresPermissions("mes:mesProductQm:view")
 	@RequiresPermissions("mes:mesProductQm:view")
 	@RequestMapping(value = "exportData")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesProductQm mesProductQm, HttpServletResponse response) {
 	public void exportData(MesProductQm mesProductQm, HttpServletResponse response) {
+		mesProductQm.setPage(null);
 		List<MesProductQm> list = mesProductQmService.findList(mesProductQm);
 		List<MesProductQm> list = mesProductQmService.findList(mesProductQm);
 		String fileName = "气密检测记录" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		String fileName = "气密检测记录" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try(ExcelExport ee = new ExcelExport("气密检测记录", MesProductQm.class)){
 		try(ExcelExport ee = new ExcelExport("气密检测记录", MesProductQm.class)){

+ 1 - 0
src/main/java/com/jeesite/modules/mes/web/MesProductRecordController.java

@@ -952,6 +952,7 @@ public class MesProductRecordController extends BaseController {
 	@RequestMapping(value = "exportData")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesProductRecord mesProductRecord, HttpServletResponse response) {
 	public void exportData(MesProductRecord mesProductRecord, HttpServletResponse response) {
 		String sn = mesProductRecord.getSn();
 		String sn = mesProductRecord.getSn();
+		mesProductRecord.setPage(null);
 		mesProductRecord.getSqlMap().getOrder().setOrderBy("a.id DESC");
 		mesProductRecord.getSqlMap().getOrder().setOrderBy("a.id DESC");
 		// 如果查询状态的值为 1, 表示用户选择查询 已加工
 		// 如果查询状态的值为 1, 表示用户选择查询 已加工
 		if("1".equals(mesProductRecord.getProcessState()) && "".equals(mesProductRecord.getContent()))
 		if("1".equals(mesProductRecord.getProcessState()) && "".equals(mesProductRecord.getContent()))

+ 1 - 0
src/main/java/com/jeesite/modules/mes/web/MesProductReportController.java

@@ -89,6 +89,7 @@ public class MesProductReportController extends BaseController {
 	@RequiresPermissions("mes:mesProductReport:view")
 	@RequiresPermissions("mes:mesProductReport:view")
 	@RequestMapping(value = "exportData")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesProductReport mesProductReport, HttpServletResponse response) {
 	public void exportData(MesProductReport mesProductReport, HttpServletResponse response) {
+		mesProductReport.setPage(null);
 		List<MesProductReport> list = mesProductReportService.findList(mesProductReport);
 		List<MesProductReport> list = mesProductReportService.findList(mesProductReport);
 		String fileName = "完工报告" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		String fileName = "完工报告" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try (ExcelExport ee = new ExcelExport("完工报告", MesProductReport.class)) {
 		try (ExcelExport ee = new ExcelExport("完工报告", MesProductReport.class)) {

+ 1 - 0
src/main/java/com/jeesite/modules/mes/web/MesProductTjController.java

@@ -71,6 +71,7 @@ public class MesProductTjController extends BaseController {
 	@RequiresPermissions("mes:mesProductTj:view")
 	@RequiresPermissions("mes:mesProductTj:view")
 	@RequestMapping(value = "exportData")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesProductTj mesProductTj, HttpServletResponse response) {
 	public void exportData(MesProductTj mesProductTj, HttpServletResponse response) {
+		mesProductTj.setPage(null);
 		List<MesProductTj> list = mesProductTjService.findList(mesProductTj);
 		List<MesProductTj> list = mesProductTjService.findList(mesProductTj);
 		String fileName = "涂胶数据" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		String fileName = "涂胶数据" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try (ExcelExport ee = new ExcelExport("涂胶数据", MesProductTj.class)) {
 		try (ExcelExport ee = new ExcelExport("涂胶数据", MesProductTj.class)) {

+ 1 - 0
src/main/java/com/jeesite/modules/mes/web/MesProductVoltageController.java

@@ -74,6 +74,7 @@ public class MesProductVoltageController extends BaseController {
 	@RequiresPermissions("mes:mesProductVoltage:view")
 	@RequiresPermissions("mes:mesProductVoltage:view")
 	@RequestMapping(value = "exportData")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesProductVoltage mesProductVoltage, HttpServletResponse response) {
 	public void exportData(MesProductVoltage mesProductVoltage, HttpServletResponse response) {
+		mesProductVoltage.setPage(null);
 		List<MesProductVoltage> list = mesProductVoltageService.findList(mesProductVoltage);
 		List<MesProductVoltage> list = mesProductVoltageService.findList(mesProductVoltage);
 		String fileName = "绝缘电压数据表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		String fileName = "绝缘电压数据表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try (ExcelExport ee = new ExcelExport("绝缘电压数据表", MesProductVoltage.class)) {
 		try (ExcelExport ee = new ExcelExport("绝缘电压数据表", MesProductVoltage.class)) {