diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/rest/PerformancemstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/rest/PerformancemstController.java index f734fe66..0e439381 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/rest/PerformancemstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/rest/PerformancemstController.java @@ -16,9 +16,13 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.*; + +import java.io.IOException; import java.util.Map; import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletResponse; + /** * @author Liuxy * @date 2021-12-28 @@ -48,6 +52,12 @@ public class PerformancemstController { return new ResponseEntity<>(performancemstService.workLoadStatQuery(whereJson,page),HttpStatus.OK); } + @ApiOperation("导出数据") + @GetMapping(value = "/workloadstat/download") + public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { + performancemstService.download(whereJson, response); + } + @PostMapping @Log("新增工作量汇报") @ApiOperation("新增工作量汇报") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/PerformancemstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/PerformancemstService.java index 1282931c..13d0bb22 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/PerformancemstService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/PerformancemstService.java @@ -94,4 +94,11 @@ public interface PerformancemstService { * 获取工作量统计表表头 */ JSONArray getHeader(); + + /** + * 导出数据 + * + * @param whereJson / + */ + void download(Map whereJson, HttpServletResponse response) throws IOException; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/PerformancemstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/PerformancemstServiceImpl.java index 68dc79a9..255095e5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/PerformancemstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/PerformancemstServiceImpl.java @@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.exception.BadRequestException; import org.nl.modules.security.service.dto.JwtUserDto; import org.nl.modules.system.util.CodeUtil; +import org.nl.utils.FileUtil; import org.nl.utils.SecurityUtils; import org.nl.wms.pa.Enum.TestStatusEnum; import org.nl.wms.pa.service.PerformancemstService; @@ -27,7 +28,10 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -317,4 +321,11 @@ public class PerformancemstServiceImpl implements PerformancemstService { return jsonArrResult; } + @Override + @Transactional(rollbackFor = Exception.class) + public void download(Map whereJson, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + FileUtil.downloadExcel(list, response); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/rest/PowderOrderQueryController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/rest/PowderOrderQueryController.java index a4ab2184..d4cef9a3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/rest/PowderOrderQueryController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/rest/PowderOrderQueryController.java @@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.Map; /** @@ -41,4 +43,10 @@ public class PowderOrderQueryController { public ResponseEntity getHeader() { return new ResponseEntity<>(powderOrderQueryService.getHeader(), HttpStatus.OK); } + + @ApiOperation("导出数据") + @GetMapping(value = "/download") + public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { + powderOrderQueryService.download(whereJson, response); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/PowderOrderQueryService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/PowderOrderQueryService.java index 0af66ea5..b92aa09d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/PowderOrderQueryService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/PowderOrderQueryService.java @@ -3,6 +3,8 @@ package org.nl.wms.statistics.service; import com.alibaba.fastjson.JSONArray; import org.springframework.data.domain.Pageable; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.Map; public interface PowderOrderQueryService { @@ -19,4 +21,11 @@ public interface PowderOrderQueryService { * 获取表头 */ JSONArray getHeader(); + + /** + * 导出数据 + * + * @param whereJson / + */ + void download(Map whereJson, HttpServletResponse response) throws IOException; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PowderOrderQueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PowderOrderQueryServiceImpl.java index 37840653..9b0a50d0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PowderOrderQueryServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PowderOrderQueryServiceImpl.java @@ -1,12 +1,16 @@ package org.nl.wms.statistics.service.impl; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import org.nl.utils.FileUtil; import org.nl.wms.basedata.master.constant.MaterOptTypeEnum; import org.nl.wms.basedata.master.service.ClassstandardService; import org.nl.wms.statistics.service.PowderOrderQueryService; @@ -15,9 +19,11 @@ import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; -import java.util.HashMap; -import java.util.Map; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.*; @Service @RequiredArgsConstructor @@ -112,10 +118,6 @@ public class PowderOrderQueryServiceImpl implements PowderOrderQueryService { jsonResult4.put("prop",json.getString("material_id")); jsonResult4.put("label","物料" + NumberUtil.add(String.valueOf(i), "1") + ""); jsonResultArr.add(jsonResult4); -// JSONObject jsonResult5 = new JSONObject(); -// jsonResult5.put("prop",json.getString("material_code")+""); -// jsonResult5.put("label","物料编码"); -// jsonResultArr.add(jsonResult5); JSONObject jsonResult6 = new JSONObject(); jsonResult6.put("prop",json.getString("material_id")+"pcsn"); jsonResult6.put("label","批次"); @@ -149,4 +151,11 @@ public class PowderOrderQueryServiceImpl implements PowderOrderQueryService { return jsonResultArr; } + + @Override + @Transactional(rollbackFor = Exception.class) + public void download(Map whereJson, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + FileUtil.downloadExcel(list, response); + } } diff --git a/mes/qd/src/views/wms/pa/workloadstat/index.vue b/mes/qd/src/views/wms/pa/workloadstat/index.vue index 67149739..13b12f9f 100644 --- a/mes/qd/src/views/wms/pa/workloadstat/index.vue +++ b/mes/qd/src/views/wms/pa/workloadstat/index.vue @@ -84,7 +84,7 @@ export default { add: false, edit: false, del: false, - download: false, + download: true, reset: true } }) diff --git a/mes/qd/src/views/wms/pdm/produce/mouthtask/index.vue b/mes/qd/src/views/wms/pdm/produce/mouthtask/index.vue index d9885cc2..049816aa 100644 --- a/mes/qd/src/views/wms/pdm/produce/mouthtask/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/mouthtask/index.vue @@ -160,7 +160,7 @@ - + diff --git a/mes/qd/src/views/wms/pdm/produce/producetask/index.vue b/mes/qd/src/views/wms/pdm/produce/producetask/index.vue index 15971861..aa48dbae 100644 --- a/mes/qd/src/views/wms/pdm/produce/producetask/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/producetask/index.vue @@ -174,7 +174,7 @@ - + diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue index 57fbcefa..8df515c2 100644 --- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue @@ -226,6 +226,7 @@ size="mini" :data="crud.data" style="width: 100%;" + :max-height="590" :highlight-current-row="true" @selection-change="mySelectionChange" > @@ -308,7 +309,12 @@ export default { name: 'workorder', components: { ChangeDialog, ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination }, cruds() { - return CRUD({ title: '工令', idField: 'workorder_id', url: 'api/workorder', crudMethod: { ...workorder }, + return CRUD({ title: '工令', + props: { + // 每页数据条数 + size: 20 + }, + idField: 'workorder_id', url: 'api/workorder', crudMethod: { ...workorder }, optShow: { add: true, edit: false, diff --git a/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue b/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue index be3a2fa9..6501ee15 100644 --- a/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue @@ -118,7 +118,7 @@ export default { add: false, edit: false, del: false, - download: false, + download: true, reset: true } })