From 93e64bf6d483a06462c6000dfc5b1f7efac9014c Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 7 Apr 2023 17:26:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/stat/rest/InBillQueryController.java | 9 +++ .../wms/stat/rest/OutBillQueryController.java | 9 +++ .../wms/stat/service/InBillQueryService.java | 3 + .../wms/stat/service/OutBillQueryService.java | 3 + .../service/impl/InBillQueryServiceImpl.java | 55 +++++++++++++++++- .../service/impl/OutBillQueryServiceImpl.java | 57 +++++++++++++++++++ .../src/views/wms/stat/inbillquery/index.vue | 37 +++++++++++- .../src/views/wms/stat/outbillquery/index.vue | 38 ++++++++++++- 8 files changed, 202 insertions(+), 9 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java index 14396ddde..45dc49b4e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java @@ -17,6 +17,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.Map; /** @@ -62,4 +64,11 @@ public class InBillQueryController { inBillQueryService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } + + @Log("导出数据") + @ApiOperation("导出数据") + @GetMapping(value = "/download") + public void download(@RequestParam Map map, HttpServletResponse response) throws IOException { + inBillQueryService.download(map, response); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/OutBillQueryController.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/OutBillQueryController.java index 099163c17..4623002cc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/OutBillQueryController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/OutBillQueryController.java @@ -16,6 +16,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.Map; /** @@ -61,4 +63,11 @@ public class OutBillQueryController { outBillQueryService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } + + @Log("导出数据") + @ApiOperation("导出数据") + @GetMapping(value = "/download") + public void download(@RequestParam Map map, HttpServletResponse response) throws IOException { + outBillQueryService.download(map, response); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java index b19d6ed07..31580988e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java @@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject; import org.nl.wms.sch.service.dto.PointDto; import org.springframework.data.domain.Pageable; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; import java.util.Map; @@ -53,4 +55,5 @@ public interface InBillQueryService { */ void deleteAll(Long[] ids); + void download(Map map, HttpServletResponse response) throws IOException; } \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/OutBillQueryService.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/OutBillQueryService.java index e1fc04dca..242ca1652 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/OutBillQueryService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/OutBillQueryService.java @@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject; import org.nl.wms.sch.service.dto.PointDto; import org.springframework.data.domain.Pageable; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; import java.util.Map; @@ -53,4 +55,5 @@ public interface OutBillQueryService { */ void deleteAll(Long[] ids); + void download(Map map, HttpServletResponse response) throws IOException; } \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java index fabe166eb..e35751ffd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java @@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.FileUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; @@ -24,9 +25,9 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.*; /** * @author Liuxy @@ -95,4 +96,52 @@ public class InBillQueryServiceImpl implements InBillQueryService { wo.update(param); } } + + @Override + public void download(Map map, HttpServletResponse response) throws IOException { + String stor_id = MapUtil.getStr(map, "stor_id"); + String bill_type = MapUtil.getStr(map, "bill_type"); + String with = MapUtil.getStr(map, "with"); // 厚度*幅宽 + String begin_time = MapUtil.getStr(map, "begin_time"); + String end_time = MapUtil.getStr(map, "end_time"); + + JSONObject mapParam = new JSONObject(); + mapParam.put("flag", "1"); + mapParam.put("stor_id",stor_id); + mapParam.put("bill_type",bill_type); + mapParam.put("with",with); + mapParam.put("begin_time",begin_time); + mapParam.put("end_time",end_time); + + JSONArray resultJSONArray = WQL.getWO("ST_IVT_INBILLQUERY").addParamMap(mapParam).process().getResultJSONArray(0); + List> list = new ArrayList<>(); + for (int i = 0; i < resultJSONArray.size(); i++) { + JSONObject json = resultJSONArray.getJSONObject(i); + Map mp = new LinkedHashMap<>(); + + mp.put("仓库", json.getString("stor_name")); + mp.put("库区", json.getString("sect_name")); + mp.put("仓位编码", json.getString("struct_code")); + mp.put("仓位名称", json.getString("struct_name")); + mp.put("木箱号", json.getString("box_no")); + mp.put("物料编码", json.getString("material_code")); + mp.put("物料名称", json.getString("material_name")); + mp.put("子卷号", json.getString("pcsn")); + mp.put("sap批次", json.getString("sap_pcsn")); + mp.put("净重", json.getString("net_weight")); + mp.put("单位", json.getString("qty_unit_name")); + mp.put("客户编码", json.getString("customer_name")); + mp.put("客户名称", json.getString("customer_description")); + mp.put("销售订单", json.getString("sale_order_name")); + mp.put("入库日期", json.getString("input_time")); + mp.put("生产日期", json.getString("date_of_production")); + mp.put("产品规格", json.getString("width")); + mp.put("产品厚度", json.getString("thickness")); + mp.put("单位面积", json.getString("mass_per_unit_area")); + mp.put("制单人", json.getString("input_optname")); + mp.put("备注", json.getString("remark")); + list.add(mp); + } + FileUtil.downloadExcel(list, response); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java index e42b2f1c0..56412a3a3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.utils.FileUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; @@ -18,6 +19,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.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -90,4 +95,56 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { wo.update(param); } } + + @Override + public void download(Map map, HttpServletResponse response) throws IOException { + String stor_id = MapUtil.getStr(map, "stor_id"); + String bill_type = MapUtil.getStr(map, "bill_type"); + String with = MapUtil.getStr(map, "with"); // 厚度*幅宽 + String begin_time = MapUtil.getStr(map, "begin_time"); + String end_time = MapUtil.getStr(map, "end_time"); + String customer_name = MapUtil.getStr(map, "customer_name"); + + JSONObject mapParam = new JSONObject(); + mapParam.put("flag", "1"); + mapParam.put("stor_id",stor_id); + mapParam.put("bill_type",bill_type); + mapParam.put("with",with); + mapParam.put("begin_time",begin_time); + mapParam.put("end_time",end_time); + if (ObjectUtil.isNotEmpty(customer_name)) mapParam.put("customer_name","%"+customer_name+"%"); + + JSONArray resultJSONArray = WQL.getWO("ST_IVT_OUTBILLQUERY").addParamMap(mapParam).process().getResultJSONArray(0); + + List> list = new ArrayList<>(); + for (int i = 0; i < resultJSONArray.size(); i++) { + JSONObject json = resultJSONArray.getJSONObject(i); + Map mp = new LinkedHashMap<>(); + + mp.put("仓库", json.getString("stor_name")); + mp.put("库区", json.getString("sect_name")); + mp.put("交货单号", json.getString("vbeln")); + mp.put("物流公司", json.getString("cust_name")); + mp.put("运费", json.getString("estimated_freight")); + mp.put("木箱号", json.getString("box_no")); + mp.put("物料编码", json.getString("material_code")); + mp.put("物料名称", json.getString("material_name")); + mp.put("子卷号", json.getString("pcsn")); + mp.put("sap批次", json.getString("sap_pcsn")); + mp.put("净重", json.getString("net_weight")); + mp.put("单位", json.getString("qty_unit_name")); + mp.put("客户编码", json.getString("customer_name")); + mp.put("发货客户名称", json.getString("customer_description")); + mp.put("销售订单", json.getString("sale_order_name")); + mp.put("出库日期", json.getString("input_time")); + mp.put("产品规格", json.getString("width")); + mp.put("产品厚度", json.getString("thickness")); + mp.put("单位面积", json.getString("mass_per_unit_area")); + mp.put("制单人", json.getString("input_optname")); + mp.put("备注", json.getString("remark")); + list.add(mp); + } + FileUtil.downloadExcel(list, response); + + } } diff --git a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index.vue b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index.vue index d25975945..8512e82a8 100644 --- a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index.vue +++ b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index.vue @@ -72,7 +72,19 @@ - + + + 导出 + + { + downloadFile(result, '成品入库查询', 'xlsx') + crud.downloadLoading = false + }).catch(() => { + crud.downloadLoading = false + }) + } } } } diff --git a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index.vue b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index.vue index 581b99509..7bbb354b5 100644 --- a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index.vue +++ b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index.vue @@ -81,7 +81,19 @@ - + + + 导出 + + { + downloadFile(result, '成品出库查询', 'xlsx') + crud.downloadLoading = false + }).catch(() => { + crud.downloadLoading = false + }) + } } } }